Commit 5603019e authored by Thomas Eppers's avatar Thomas Eppers
Browse files

removed unused code in player_item_manager.cpp

parent a3bfe71c
...@@ -73,7 +73,7 @@ namespace gdw { ...@@ -73,7 +73,7 @@ namespace gdw {
auto &emp_coll = placed_item.emplace_back<collision_component>(new sphere(glm::vec3(0.f), 5.f)); auto &emp_coll = placed_item.emplace_back<collision_component>(new sphere(glm::vec3(0.f), 5.f));
placed_item.emplace_back<object_type_component>("EMP"); placed_item.emplace_back<object_type_component>("EMP");
emp_coll.set_trigger([this](unsigned long long self_id, unsigned long long coll_id) { emp_coll.set_trigger([this](unsigned long long, unsigned long long coll_id) {
auto s = coll_id; auto s = coll_id;
auto move = engine_.entity_manager().resolve(s)->component<movement_component>(); auto move = engine_.entity_manager().resolve(s)->component<movement_component>();
auto type_comp = engine_.entity_manager().resolve(s)->component<object_type_component>(); auto type_comp = engine_.entity_manager().resolve(s)->component<object_type_component>();
...@@ -97,7 +97,7 @@ namespace gdw { ...@@ -97,7 +97,7 @@ namespace gdw {
auto& placed_item = engine_.entity_manager().emplace_back(world_pos, glm::angleAxis(glm::radians(0.f), glm::vec3(1,0,0))); auto& placed_item = engine_.entity_manager().emplace_back(world_pos, glm::angleAxis(glm::radians(0.f), glm::vec3(1,0,0)));
//placed_item.emplace_back<staticmesh_component>("mesh/cube.msh"); //placed_item.emplace_back<staticmesh_component>("mesh/cube.msh");
//placed_item.scale(glm::vec3(3.f, .5f, .5f)); //placed_item.scale(glm::vec3(3.f, .5f, .5f));
auto &placed_item_coll = placed_item.emplace_back<collision_component>(new sphere(glm::vec3(0.f), 5.f)); placed_item.emplace_back<collision_component>(new sphere(glm::vec3(0.f), 5.f));
placed_item.emplace_back<object_type_component>("ACCELERATOR"); placed_item.emplace_back<object_type_component>("ACCELERATOR");
auto &left_cube = engine_.entity_manager().emplace_back(world_pos-glm::vec3(2.5f,0,0), glm::angleAxis(glm::radians(0.f), glm::vec3(1,0,0))); auto &left_cube = engine_.entity_manager().emplace_back(world_pos-glm::vec3(2.5f,0,0), glm::angleAxis(glm::radians(0.f), glm::vec3(1,0,0)));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment