Merge pull request #4 from ShortStomp/master

Updated code.
bjadamson · May 17, 2013 · 9e8bfa2 · 9e8bfa2
2 parents 35fb8cc + fad9081
commit 9e8bfa2
Show file tree

Hide file tree

Showing 15 changed files with 94 additions and 152 deletions.
diff --git a/props/(compiler)-boost-headers.props b/props/(compiler)-boost-headers.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <IncludePath>C:\boost;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup />
+  <ItemGroup />
+</Project>
diff --git a/props/(linker)-boost-log-binay.props b/props/(linker)-boost-log-binay.props
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LibraryPath>C:\boost\stage64\lib\;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <AdditionalDependencies>libboost_log_setup-vc110-mt-gd-1_53.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>C:\boost\stage64\lib\</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
diff --git a/props/(linker)-sfml-binaries(release).props b/props/(linker)-sfml-binaries(release).props
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LibraryPath>C:\sfml-2.0\lib\;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <AdditionalDependencies>sfml-audio.lib;sfml-graphics.lib;sfml-main.lib;sfml-network.lib;sfml-system.lib;sfml-window.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
diff --git a/src/Tetris/Tetris.vcxproj b/src/Tetris/Tetris.vcxproj
@@ -57,6 +57,7 @@
     <Import Project="..\..\props\(compiler)-output-directory.props" />
     <Import Project="..\..\props\(compiler)-sfml-headers.props" />
     <Import Project="..\..\props\(linker)-sfml-binaries(debug).props" />
+    <Import Project="..\..\props\(linker)-boost-log-binay.props" />
     <Import Project="..\..\props\(linker)-ec-binaries.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
@@ -65,6 +66,7 @@
     <Import Project="..\..\props\(compiler)-sfml-headers.props" />
     <Import Project="..\..\props\(linker)-sfml-binaries(debug).props" />
     <Import Project="..\..\props\(linker)-ec-binaries.props" />
+    <Import Project="..\..\props\(linker)-boost-log-binay.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />

diff --git a/src/Tetris/game.cpp b/src/Tetris/game.cpp
@@ -55,12 +55,11 @@ add_test_L_block_to_engine(ec::engine &engine, ec::entity *parent_entity_ptr, co
 
   const entity_factory ef;
   const auto e0 = ef.get();
+  e0->Parent = parent_entity_ptr;
 
   const component_factory<sprite_component> sprite_cfactory;
 
   auto spritecomponent_ptr = sprite_cfactory.get();
-
-
   const auto load_result = spritecomponent_ptr->Texture.loadFromFile("../../assets/tetris-block.png");
   if(load_result == false) {
     // file failed to load
@@ -70,19 +69,10 @@ add_test_L_block_to_engine(ec::engine &engine, ec::entity *parent_entity_ptr, co
   spritecomponent_ptr->Sprite.setTexture(spritecomponent_ptr->Texture);
   e0->add_component(spritecomponent_ptr);
 
-  // the two entities are sharing the transform component
-  //const auto shared_transform_component_ptr = entity_helpers::get_transform_component(parent_entity_ptr);
   const component_factory<transform_component> transform_cfactory;
-  const auto shared_transform_component_ptr = transform_cfactory.get();
-  shared_transform_component_ptr->move(offset);
-  e0->add_component(shared_transform_component_ptr);
-
-  const component_factory<parent_component> parent_cfactory;
-  const auto parent_component_ptr = parent_cfactory.get();
-
-  parent_component_ptr->Offset = offset;
-  parent_component_ptr->parent_entity_ptr = parent_entity_ptr;
-  e0->add_component(parent_component_ptr);
+  const auto transform_component_ptr = transform_cfactory.get();
+  transform_component_ptr->move(offset);
+  e0->add_component(transform_component_ptr);
 
   engine.Entities.emplace_back(e0);
 }
@@ -151,11 +141,12 @@ tet::game::game_loop(
   setup_window(engine);
   setup_test_code(engine);
 
-  add_test_L_block_to_engine(engine, engine.Entities.front(), sf::Vector2f(-15.0f, -15.0f));
-  add_test_L_block_to_engine(engine, engine.Entities.front(), sf::Vector2f(-15.0f, 0.0f));
-  add_test_L_block_to_engine(engine, engine.Entities.front(), sf::Vector2f(-15.0f, 15.0f));
-  add_test_L_block_to_engine(engine, engine.Entities.front(), sf::Vector2f(0.0f, 15.0f));
-  add_test_L_block_to_engine(engine, engine.Entities.front(), sf::Vector2f(15.0f, 15.0f));
+  const auto parent_entity = engine.Entities.front();
+  add_test_L_block_to_engine(engine, parent_entity, sf::Vector2f(-15.0f, -15.0f));
+  add_test_L_block_to_engine(engine, parent_entity, sf::Vector2f(-15.0f, 0.0f));
+  add_test_L_block_to_engine(engine, parent_entity, sf::Vector2f(-15.0f, 15.0f));
+  add_test_L_block_to_engine(engine, parent_entity, sf::Vector2f(0.0f, 15.0f));
+  add_test_L_block_to_engine(engine, parent_entity, sf::Vector2f(15.0f, 15.0f));
 
   add_border_to_engine(engine);
 

diff --git a/src/entity-component/component/component_factory.inc b/src/entity-component/component/component_factory.inc
@@ -2,7 +2,6 @@
 #include "sprite_component.hpp"
 #include "movement_component.hpp"
 #include "gravity_component.hpp"
-#include "parent_component.hpp"
 
 //===----------------------------------------------------------------------===//
 //

diff --git a/src/entity-component/component/parent_component.hpp b/src/entity-component/component/parent_component.hpp
diff --git a/src/entity-component/component/scenegraph_component.hpp b/src/entity-component/component/scenegraph_component.hpp
diff --git a/src/entity-component/entity-component.vcxproj b/src/entity-component/entity-component.vcxproj
@@ -43,7 +43,7 @@
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v110</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -59,11 +59,19 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="..\..\props\(linker)-sfml-binaries(debug).props" />
+    <Import Project="..\..\props\(linker)-boost-log-binay.props" />
     <Import Project="..\..\props\(compiler)-sfml-headers.props" />
     <Import Project="..\..\props\(compiler)-output-directory.props" />
+    <Import Project="..\..\props\(compiler)-boost-headers.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets" />
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="..\..\props\(linker)-sfml-binaries(release).props" />
+    <Import Project="..\..\props\(linker)-boost-log-binay.props" />
+    <Import Project="..\..\props\(compiler)-sfml-headers.props" />
+    <Import Project="..\..\props\(compiler)-output-directory.props" />
+    <Import Project="..\..\props\(compiler)-boost-headers.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -136,7 +144,6 @@
     <ClInclude Include="component\icomponent.hpp" />
     <ClInclude Include="component\input_component.hpp" />
     <ClInclude Include="component\movement_component.hpp" />
-    <ClInclude Include="component\parent_component.hpp" />
     <ClInclude Include="component\sprite_component.hpp" />
     <ClInclude Include="component\transform_component.hpp" />
     <ClInclude Include="engine.hpp" />

diff --git a/src/entity-component/entity-component.vcxproj.filters b/src/entity-component/entity-component.vcxproj.filters
@@ -100,9 +100,6 @@
     <ClInclude Include="component\transform_component.hpp">
       <Filter>component</Filter>
     </ClInclude>
-    <ClInclude Include="component\parent_component.hpp">
-      <Filter>component</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="component">

diff --git a/src/entity-component/entity/entity.cpp b/src/entity-component/entity/entity.cpp
@@ -9,6 +9,7 @@
 //===----------------------------------------------------------------------===//
 ec::entity::entity(const ec::entity_id id)
   : _id(id),
+  Parent(nullptr),
   _components(COMPONENT_TYPE_MAX, nullptr)
 {
 }

diff --git a/src/entity-component/entity/entity.hpp b/src/entity-component/entity/entity.hpp
@@ -45,11 +45,12 @@ namespace ec
   public:
 
     // members
+    entity              *Parent;
 	  std::queue<message> Message_Queue;
 
 	  // methods
     void add_component(icomponent *const component_ptr);
-    void remove_component(const int component_type); // TODO: determine how this should work.
+    void remove_component(const int component_type);
   };
 }
 #endif // _ENTITY_HPP_ definition
diff --git a/src/entity-component/entity/entity_helpers.hpp b/src/entity-component/entity/entity_helpers.hpp
@@ -22,7 +22,6 @@ namespace ec
   struct movement_component;
   struct sprite_component;
   struct transform_component;
-  struct parent_component;
 
 namespace entity_helpers
 {
@@ -31,7 +30,6 @@ namespace entity_helpers
   input_component*      get_input_component(entity *const entity_ptr);
   movement_component*   get_movement_component(entity *const entity_ptr);
   sprite_component*     get_sprite_component(entity *const entity_ptr);
-  parent_component*     get_parent_component(entity *const entity_ptr);
 
   // templated function declarations
   template<typename T>

diff --git a/src/entity-component/entity/entity_helpers.inc b/src/entity-component/entity/entity_helpers.inc
@@ -3,7 +3,6 @@
 #include "../component/input_component.hpp"
 #include "../component/movement_component.hpp"
 #include "../component/sprite_component.hpp"
-#include "../component/parent_component.hpp"
 
 
 //===----------------------------------------------------------------------===//
@@ -72,16 +71,4 @@ inline ec::sprite_component*
 ec::entity_helpers::get_sprite_component(entity *const entity_ptr)
 {
   return get_component<sprite_component>(entity_ptr);
-}
-
-
-//===----------------------------------------------------------------------===//
-//
-// Wrapper for getting the parent_component from an entity.
-//
-//===----------------------------------------------------------------------===//
-inline ec::parent_component*
-ec::entity_helpers::get_parent_component(entity *const entity_ptr)
-{
-  return get_component<parent_component>(entity_ptr);
 }