Fixed swimming in soil, added missing material types

REGoth-project · Jan 11, 2017 · fd85e3c · fd85e3c
1 parent 572aba2
commit fd85e3c
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -56,5 +56,3 @@ Data/
 # CScope, Ctags
 cscope.files
 tags
-
-
diff --git a/lib/SFML b/lib/SFML
diff --git a/lib/bullet3 b/lib/bullet3
diff --git a/lib/glfw b/lib/glfw
diff --git a/lib/glm b/lib/glm
diff --git a/src/content/Materials.h b/src/content/Materials.h
@@ -8,13 +8,12 @@ namespace Materials
     /**
      * Enums defining material group
      */
-    // FIXME names below need to be changed most likely
     enum MaterialGroup
     {
        UNDEFINED,
-       PLACEHOLDER1,
-       PLACEHOLDER2,
-       PLACEHOLDER3,
+       METAL,
+       STONE,
+       WOOD,
        GROUND,
        WATER
     };

diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp
@@ -829,10 +829,16 @@ void PlayerController::onUpdateByInput(float deltaTime)
             {
                 model->setAnimation(waterAniType);
             }
-            else if (getSurfaceMaterial() == Materials::MaterialGroup::GROUND)
+            else if (getSurfaceMaterial() != Materials::MaterialGroup::UNDEFINED)
             {
                 model->setAnimation(groundAniType);
             }
+            else
+            {
+                // This happens when NPC enters area that should not be accessible
+                LogError() << "Encountered undefined material type under NPC's feet";
+                model->setAnimation(groundAniType); // Ground animation is the default, we don't want the NPCs to start swimming in soil
+            }
             lastMovementAni = getModelVisual()->getAnimationHandler().getActiveAnimationPtr()->getModelAniHeader().aniName;
             m_NoAniRootPosHack = true;
         };

diff --git a/src/target/REGoth.cpp b/src/target/REGoth.cpp
@@ -867,12 +867,12 @@ class ExampleCubes : public /*entry::AppI*/ PLATFORM_CLASS
         return true;
 	}
 
-	Engine::GameEngine* m_pEngine;
-	uint32_t m_debug;
-	uint32_t m_reset;
+    Engine::GameEngine* m_pEngine;
+    uint32_t m_debug;
+    uint32_t m_reset;
     int m_Width, m_Height;
-	int64_t m_timeOffset;
-	float axis;
+    int64_t m_timeOffset;
+    float axis;
     int32_t m_scrollArea;
     Utils::StopWatch m_stopWatch;
     bool m_NoHUD;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -56,5 +56,3 @@ Data/
		# CScope, Ctags
		cscope.files
		tags
+14 −21		src/SFML/Audio/SoundFileReaderFlac.cpp
+3 −2		src/SFML/Audio/SoundFileReaderFlac.hpp
+6 −0		build3/vs2010_bullet2gpu.bat
+ −		docs/pybullet_quickstartguide.pdf
+9 −12		examples/ExampleBrowser/GwenGUISupport/GwenProfileWindow.cpp
+0 −3		examples/ExampleBrowser/InProcessExampleBrowser.cpp
+14 −40		examples/ExampleBrowser/OpenGLExampleBrowser.cpp
+1 −1		examples/Importers/ImportMJCFDemo/BulletMJCFImporter.cpp
+5 −6		examples/Importers/ImportURDFDemo/URDFImporterInterface.h
+0 −15		examples/OpenGLWindow/SimpleCamera.cpp
+0 −2		examples/OpenGLWindow/SimpleCamera.h
+0 −51		examples/SharedMemory/PhysicsClientC_API.cpp
+0 −6		examples/SharedMemory/PhysicsClientC_API.h
+7 −34		examples/SharedMemory/PhysicsServerCommandProcessor.cpp
+59 −56		examples/SharedMemory/PhysicsServerExample.cpp
+137 −129		examples/SharedMemory/PhysicsServerSharedMemory.cpp
+18 −77		examples/SharedMemory/PosixSharedMemory.cpp
+5 −23		examples/SharedMemory/SharedMemoryCommands.h
+0 −2		examples/SharedMemory/SharedMemoryPublic.h
+23 −77		examples/SharedMemory/Win32SharedMemory.cpp
+4 −8		examples/Utils/b3Clock.cpp
+10 −66		examples/pybullet/pybullet.c
+1 −1		examples/pybullet/robotcontrol.py
+6 −9		src/LinearMath/btAlignedObjectArray.h
+17 −66		src/LinearMath/btQuickprof.cpp
+0 −7		src/LinearMath/btQuickprof.h
+17 −0		src/LinearMath/btThreads.cpp
+2 −0		src/LinearMath/btThreads.h
+1 −6		README.md
+0 −4		docs/build.dox
+0 −6		docs/window.dox
+0 −11		include/GLFW/glfw3.h
+2 −2		src/CMakeLists.txt
+0 −1		src/cocoa_init.m
+52 −63		src/cocoa_monitor.m
+3 −6		src/cocoa_platform.h
+3 −9		src/cocoa_window.m
+1 −1		src/egl_context.c
+0 −4		src/egl_context.h
+1 −0		src/init.c
+16 −7		src/internal.h
+0 −1		src/mir_init.c
+26 −20		src/mir_monitor.c
+60 −26		src/monitor.c
+12 −0		src/osmesa_monitor.c
+0 −1		src/win32_init.c
+75 −106		src/win32_monitor.c
+0 −1		src/win32_platform.h
+1 −1		src/win32_window.c
+0 −3		src/window.c
+3 −0		src/wl_init.c
+109 −25		src/wl_monitor.c
+13 −2		src/wl_platform.h
+0 −1		src/x11_init.c
+113 −124		src/x11_monitor.c
+0 −1		src/x11_platform.h
+1 −1		src/x11_window.c