Commit cc157881 authored by Libor Moravčík's avatar Libor Moravčík
Browse files

Fixed compilation errors

parent 1c5bc6aa

phx/include/phx/coll/collider.hpp

+1 −2
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ struct Collider : com::File, utils::StoredItem 
	com::Folder *body_root() const;

	std::size_t collision_layer() const;

	void set_collision_layer(std::size_t layer);

	Layer *layer() const;

	

	// Setters

	void set_dirty();

phx/include/phx/coll/collision_system.hpp

+0 −2
Original line number Diff line number Diff line 
#ifndef PHX_COLL_COLLISION_SYSTEM_HPP_INCLUDED

#define PHX_COLL_COLLISION_SYSTEM_HPP_INCLUDED



#include <optional>

#include <com/system.hpp>



#include <phx/coll/broad/broad_detector.hpp>

#include <phx/coll/collider.hpp>

#include <phx/coll/layer.hpp>

#include <phx/coll/narrow/narrow_detector.hpp>

#include <phx/coll/collisions_file.hpp>

#include <utils/cache.hpp>

phx/src/coll/collision_system.cpp

+3 −2
Original line number Diff line number Diff line 
#include "phx/coll/broad/broad_detector.hpp"

#include <phx/coll/collision_system.hpp>

#include <ranges>
@@ -19,6 +18,8 @@ 
#include <phx/index.hpp>

#include <utils/context_utils.hpp>

#include <utils/timeprof.hpp>

#include <phx/coll/broad/broad_detector.hpp>

#include <phx/index.hpp>





namespace phx::coll
@@ -134,7 +135,7 @@ bool CollisionSystem::detect_collisions(com::Folder *world, bool clear_cache, 


	auto filtered =

	    collisions | std::views::filter([](const CollidersPair &pair)

					    { return collision_matrix()->should_collide(pair.first, pair.second); });

					    { return phx::layer_system()->should_collide(pair.first, pair.second); });



	// Clear the collisions file

	auto collisions_file = world->find<CollisionsFile>(CollisionsFile::self_file_name());

phx/src/dyn/constraints_solver.cpp

+3 −3
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
#include <phx/dyn/rigid_body_part.hpp>

#include <phx/index.hpp>

#include <utils/context_utils.hpp>



#include "phx/body_system.hpp"

#include "phx/math.hpp"

#include <phx/coll/contact.hpp>

#include <phx/body_system.hpp>

#include <phx/math.hpp>



namespace phx::dyn

{