Re-added 3D debug grid to render example

Author: jonjondev

examples/game/src/entities/Player.cpp

@@ -18,11 +18,6 @@
 // Static member initialisation
 const Siege::String Player::ENTITY_NAME("Player");
 
-void Player::OnStart()
-{
-    // Register the entity with systems
-}
-
 void Player::OnUpdate()
 {
     // Get move axes as vector
@@ -49,11 +44,6 @@ void Player::OnUpdate()
     velocity = velocity * 0.9f;
 }
 
-void Player::OnDestroy()
-{
-    // Deregister the entity from systems before freeing it
-}
-
 Siege::BoundedBox Player::GetBoundingBox() const
 {
     Siege::Vec3 position = transform.GetPosition();

examples/game/src/entities/Player.h

@@ -40,12 +40,8 @@ class Player : public Siege::Entity
 
     // Protected overrides
 
-    void OnStart() override;
-
     void OnUpdate() override;
 
-    void OnDestroy() override;
-
 private:
 
     // Private fields

examples/render/src/main.cpp

@@ -124,6 +124,8 @@ int main()
                                    window.GetHeight());
     OrthoCamera camera2D = OrthoCamera({0.f, -1.f, -2.5f}, {0.f, -1.f, 1.f});
 
+    Siege::Renderer3D::SetGridEnabled(true);
+
     auto currentTime = std::chrono::high_resolution_clock::now();
 
     bool inputEnabled = true;

make/Platform.mk

@@ -18,10 +18,10 @@ ifeq ($(OS), Windows_NT)
 	COPY = powershell -executionpolicy bypass $(scriptsDir)/copy.ps1 $1 $2 $3
 	VALIDATION_LAYERS_INSTALL_DIR := explicit_layer.d
 	BUILD_FLAGS_SCRIPT = powershell -executionpolicy bypass $(scriptsDir)/buildflags.ps1 --Target $1 --CXXFlags $2 --Dirs $3
+	BUILD_LIB = powershell -executionpolicy bypass $(scriptsDir)/combinelibs.ps1 --src_objs $1 --output_dir $2 --output_name $3
 	COMBINE_LIBS = powershell -executionpolicy bypass $(scriptsDir)/combinelibs.ps1 --src_libs $1 --src_objs $2 --output_dir $3 --output_name $4
 	PACKAGE_SCRIPT = powershell -executionpolicy bypass $(scriptsDir)/package.ps1 --pkg-name $1 --exe-name $2 --output-dir $3 --build-dir $4 $5
 else
-	COMBINE_LIBS = $(scriptsDir)/combinelibs.sh --src_libs $1 --src_objs $2 --output_dir $3 --output_name $4
 	# Check for MacOS/Linux
 	UNAMEOS := $(shell uname)
 	ifeq ($(UNAMEOS), Linux)
@@ -46,5 +46,7 @@ else
 	COPY_DIR = $(call COPY,$1,$2,$3)
 	VALIDATION_LAYERS_INSTALL_DIR := lib/explicit_layer.d
 	BUILD_FLAGS_SCRIPT = $(scriptsDir)/buildflags.sh $1 "$2" "$3"
+	BUILD_LIB = $(scriptsDir)/combinelibs.sh --src_objs $1 --output_dir $2 --output_name $3
+	COMBINE_LIBS = $(scriptsDir)/combinelibs.sh --src_libs $1 --src_objs $2 --output_dir $3 --output_name $4
 	PACKAGE_SCRIPT = $(scriptsDir)/package.sh $1 $2 $3 $4 $5
 endif

tests/core/test_SceneFile.cpp

@@ -241,10 +241,13 @@ UTEST_F(test_SceneFile, DeserialiseSingleEntity)
     // It should retain its standard field values
     ASSERT_STREQ("TestEntity1", entities[0]->GetName().Str());
     Vec3 pos(entities[0]->GetPosition());
+    Vec3 rot(entities[0]->GetRotation());
     ASSERT_EQ(1.f, pos.x);
     ASSERT_EQ(2.f, pos.y);
     ASSERT_EQ(3.f, pos.z);
-    ASSERT_EQ(25.f, entities[0]->GetRotation().y);
+    ASSERT_EQ(0.f, rot.x);
+    ASSERT_EQ(25.f, rot.y);
+    ASSERT_EQ(0.f, rot.z);
     ASSERT_EQ(-3, entities[0]->GetZIndex());
 
     // It should retain its custom data