-

Author: codenamecpp

.gitignore

@@ -30,6 +30,7 @@ bld/
 [Oo]bj/
 [Ll]og/
 [Ll]ogs/
+build/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/

src/GameDefs.h

@@ -148,9 +148,9 @@ decl_enum_strings(eTileFace);
 
 //
 //   NW   N   NE
-//      \ | /
+//        |  
 //  W <--- ---> E
-//      / | \ 
+//        |   
 //   SW   S   SE
 //
 

src/GameObject.h

@@ -52,7 +52,7 @@ class GameObject: public cxx::noncopyable
         }
         if (componentWithType)
         {
-            DeleteComponent(currComponent);
+            DeleteComponent(componentWithType);
         }
     }
 

src/GrimLandsKeeper.vcxproj.filters

@@ -450,9 +450,6 @@
     <ClInclude Include="GuiTestScreen.h">
       <Filter>Game\GameScreens</Filter>
     </ClInclude>
-    <ClInclude Include="GodmodeCameraController.h">
-      <Filter>Game\Scene\CameraControllers</Filter>
-    </ClInclude>
     <ClInclude Include="GameplayGameScreen.h">
       <Filter>Game\GameScreens</Filter>
     </ClInclude>
@@ -513,6 +510,9 @@
     <ClInclude Include="TerrainTilesCursor.h">
       <Filter>Game\World</Filter>
     </ClInclude>
+    <ClInclude Include="GodmodeCameraController.h">
+      <Filter>Game\Scene\CameraControllers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp">
@@ -754,9 +754,6 @@
     <ClCompile Include="GuiTestScreen.cpp">
       <Filter>Game\GameScreens</Filter>
     </ClCompile>
-    <ClCompile Include="GodmodeCameraController.cpp">
-      <Filter>Game\Scene\CameraControllers</Filter>
-    </ClCompile>
     <ClCompile Include="GameplayGameScreen.cpp">
       <Filter>Game\GameScreens</Filter>
     </ClCompile>
@@ -808,6 +805,9 @@
     <ClCompile Include="TerrainTilesCursor.cpp">
       <Filter>Game\World</Filter>
     </ClCompile>
+    <ClCompile Include="GodmodeCameraController.cpp">
+      <Filter>Game\Scene\CameraControllers</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\docs\creatures_anims.txt">

src/GuiAction.cpp

@@ -165,7 +165,7 @@ class GuiWidgetActionSetTexture: public GuiAction
     }
     void HandlePerformAction(GuiWidget* targetWidget) override
     {
-        GuiPictureBox* pictureBox = GuiCastWidgetClass<GuiPictureBox>(targetWidget);
+        GuiPictureBox* pictureBox = targetWidget->CastToWidgetClass<GuiPictureBox>();
         if (pictureBox)
         {
             if (mTextureName.empty())

src/GuiHelpers.h

@@ -16,28 +16,6 @@ bool GuiParseAnchors(cxx::json_document_node node, GuiAnchors& output_anchors);
 // as string example: "00ff00ff" - rgba
 bool GuiParseColor(cxx::json_document_node node, Color32& output_color);
 
-// try to cast base widget pointer to specific widget class
-template<typename TargetWidgetClass>
-inline TargetWidgetClass* GuiCastWidgetClass(GuiWidget* sourceWidget)
-{
-    TargetWidgetClass* resultWidget = nullptr;
-    debug_assert(sourceWidget);
-    if (sourceWidget)
-    {
-        GuiWidgetMetaClass* target_metaclass = &TargetWidgetClass::MetaClass;
-        for (GuiWidgetMetaClass* currMetaclass = sourceWidget->mMetaClass; currMetaclass; 
-            currMetaclass = currMetaclass->mParentClass)
-        {
-            if (target_metaclass == currMetaclass)
-            {
-                resultWidget = (TargetWidgetClass*) sourceWidget;
-                break;
-            }
-        }
-    }
-    return resultWidget;
-}
-
 // get child widget by path
 // example: "first/second/third"
 GuiWidget* GuiGetChildWidgetByPath(GuiWidget* parent_widget, const std::string& child_path);

src/GuiWidget.h

@@ -188,6 +188,24 @@ class GuiWidget: public cxx::handled_object<GuiWidget>
     GuiWidget* Clone();
     GuiWidget* CloneDeep();
 
+    // try to cast base widget to specific widget class
+    template<typename TargetWidgetClass>
+    inline TargetWidgetClass* CastToWidgetClass()
+    {
+        TargetWidgetClass* resultWidget = nullptr;
+        GuiWidgetMetaClass* target_metaclass = &TargetWidgetClass::MetaClass;
+        for (GuiWidgetMetaClass* currMetaclass = mMetaClass; currMetaclass; 
+            currMetaclass = currMetaclass->mParentClass)
+        {
+            if (target_metaclass == currMetaclass)
+            {
+                resultWidget = (TargetWidgetClass*) this;
+                break;
+            }
+        }
+        return resultWidget;
+    }
+
 protected:
     GuiWidget(GuiWidgetMetaClass* widgetClass);
     // copy properties

src/SimpleTriangleMesh.h

@@ -23,18 +23,18 @@ class SimpleTriangleMesh
         int currentCount = (int) mVertices.size();
         if (currentCount < vertexCount)
         {
-            mVertices.resize{vertexCount};
+            mVertices.resize(vertexCount);
         }
     }
 
     // enlarge allocated triangles count to the required size
     // @param triangleCount: Required number of triangles
     inline void EnsureTriangleCount(int triangleCount)
     {
-        int triangleCount = (int) mTriangles.size();
-        if (triangleCount < triangleCount)
+        int currentCount = (int) mTriangles.size();
+        if (currentCount < triangleCount)
         {
-            mTriangles.resize{triangleCount};
+            mTriangles.resize(triangleCount);
         }
     }
 

src/StaticMeshRenderer.cpp

@@ -132,7 +132,7 @@ void StaticMeshRenderer::PrepareRenderdata(StaticMeshComponent* component)
 
     for (StaticMeshComponent::TriMeshPart& currPart: component->mTriMeshParts)
     {
-        RenderableComponent::DrawCall& drawCall = component->mDrawCalls[iCurentPart];
+        StaticMeshComponent::DrawCall& drawCall = component->mDrawCalls[iCurentPart];
         drawCall.mMaterialIndex = iCurentPart;
         drawCall.mTriangleCount = (int) currPart.mTriangles.size();
         drawCall.mVertexCount = (int) currPart.mVertices.size();

src/TerrainMeshRenderer.cpp

@@ -252,7 +252,7 @@ void TerrainMeshRenderer::PrepareRenderdata(TerrainMeshComponent* component)
     {
         component->SetMeshMaterial(imaterial, ebucket.first);
 
-        RenderableComponent::DrawCall& drawCall = component->mDrawCalls[imaterial];
+        TerrainMeshComponent::DrawCall& drawCall = component->mDrawCalls[imaterial];
         drawCall.mMaterialIndex = imaterial;
         drawCall.mTriangleCount = ebucket.second.mTriangleCount;
         drawCall.mVertexCount = ebucket.second.mVertexCount;