Finished : Compiling and linking error on Mac OS X

https://trello.com/c/xR1ybmof Environment dependency is still vulnerable.
zhangdoa · Sep 8, 2018 · f2d8aad · f2d8aad
1 parent 64238b0
commit f2d8aad
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/source/engine/system/AssetSystem.cpp b/source/engine/system/AssetSystem.cpp
@@ -249,14 +249,18 @@ void AssetSystem::loadAssetsForComponents()
 
 void AssetSystem::assignUnitMesh(meshShapeType meshType, VisibleComponent & visibleComponent)
 {
-	meshID l_UnitMeshTemplate;
-	switch (meshType)
-	{
-	case meshShapeType::QUAD: l_UnitMeshTemplate = m_AssetSystemSingletonComponent->m_UnitQuadTemplate; break;
-	case meshShapeType::CUBE: l_UnitMeshTemplate = m_AssetSystemSingletonComponent->m_UnitCubeTemplate; break;
-	case meshShapeType::SPHERE: l_UnitMeshTemplate = m_AssetSystemSingletonComponent->m_UnitSphereTemplate; break;
-	}
-	g_pGameSystem->addMeshData(&visibleComponent, l_UnitMeshTemplate);
+    meshID l_UnitMeshTemplate;
+    switch (meshType)
+    {
+            case meshShapeType::LINE:
+            l_UnitMeshTemplate = m_AssetSystemSingletonComponent->m_UnitLineTemplate; break;
+            case meshShapeType::QUAD: l_UnitMeshTemplate = m_AssetSystemSingletonComponent->m_UnitQuadTemplate; break;
+            case meshShapeType::CUBE: l_UnitMeshTemplate = m_AssetSystemSingletonComponent->m_UnitCubeTemplate; break;
+            case meshShapeType::SPHERE: l_UnitMeshTemplate = m_AssetSystemSingletonComponent->m_UnitSphereTemplate; break;
+            case meshShapeType::CUSTOM:
+            break;
+    }
+    g_pGameSystem->addMeshData(&visibleComponent, l_UnitMeshTemplate);
 }
 
 void AssetSystem::assignLoadedTexture(textureAssignType textureAssignType, const texturePair& loadedtexturePair, VisibleComponent & visibleComponent)

diff --git a/source/engine/system/BaseWindowSystem.h b/source/engine/system/BaseWindowSystem.h
@@ -31,7 +31,4 @@ class BaseWindowSystem : public IWindowSystem
 	void framebufferSizeCallback(int width, int height);
 	void mousePositionCallback(double mouseXPos, double mouseYPos);
 	void scrollCallback(double xoffset, double yoffset);
-
-private:
-	objectStatus m_objectStatus = objectStatus::SHUTDOWN;
-};
+};
diff --git a/source/engine/system/GLRenderer/GLGuiSystem.cpp b/source/engine/system/GLRenderer/GLGuiSystem.cpp
@@ -167,4 +167,4 @@ void GLGuiSystem::shutdown()
 const objectStatus & GLGuiSystem::getStatus() const
 {
 	return m_objectStatus;
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -167,4 +167,4 @@ void GLGuiSystem::shutdown() @@
     const objectStatus & GLGuiSystem::getStatus() const
     {
     	return m_objectStatus;
-    }
+    }