Began Newton Dynamics Physics integration and modified build script

README.md

@@ -155,6 +155,7 @@
 
 - ## TODO
 
+	- Complete Newton integration
 	- Add fallback shader
 	- Implement Game States
 	- Store Materials in new format supported by parser

build/genie.lua

@@ -11,6 +11,12 @@ solution "Symmetry"
 	configuration {"windows", "vs2017"}	
 		defines {"_CRT_SECURE_NO_WARNINGS"}
 		flags {"NoIncrementalLink", "NoEditAndContinue"}
+		local windowsPlatform = string.gsub(os.getenv("WindowsSDKVersion") or "10.0.16299.0", "\\", "")
+		local action = premake.action.current()
+		if(action ~= nil) then
+			action.vstudio.windowsTargetPlatformVersion    = windowsPlatform
+			action.vstudio.windowsTargetPlatformMinVersion = windowsPlatform
+		end
 	
    configuration "Debug"
 	    if (_ACTION ~= nil and _ACTION ~= "postbuild_copy") then
@@ -28,6 +34,27 @@ solution "Symmetry"
 		defines { "NDEBUG", "ExtraWarnings" }
 		flags { "OptimizeSpeed"}
 		
+	newaction {
+	   trigger = "postbuild_copy",
+	   description = "Action to copy relevant dlls to executable directory after build",
+	   execute = function ()
+		  -- local copy_dest_dir = ""
+		  -- local symlink_dest_dir = ""
+		  
+		  -- if(_ARGS[1] == "vs2017") then
+			 -- copy_dest_dir = "vs2017"
+			 -- symlink_dest_dir = "..\\..\\..\\assets"
+			 -- printf("Copying DLLs to visual studio build directory...\n")
+		  -- end
+
+		  -- -- Create sym links
+		  -- local output = os.outputof("mklink /D vs2017\\debug\\assets ..\\..\\..\\assets" .. path.translate(copy_dest_dir, "\\")  .. "\\debug\\assets " .. symlink_dest_dir)
+		  -- printf("MKlink debug output : %s", output)
+		  -- output = os.outputof("mklink /D " .. path.translate(copy_dest_dir, "\\")  .. "\\release\\assets " ..symlink_dest_dir)
+		  -- printf("MKlink release output : %s", output)
+	   end
+	}
+
 	-------------------------
 	-- Game
 	-------------------------
@@ -44,74 +71,41 @@ solution "Symmetry"
 			links {"SDL2", "m"}
 
 		configuration {"windows", "vs2017"}
-			   includedirs	{"../include/windows/sdl2/", "../include/common/soloud/"}
-			   libdirs {"../lib/windows/sdl2/", "../lib/windows/soloud/"}
+		   includedirs	{"../include/windows/sdl2/", "../include/common/soloud/", "../include/common/newton/"}
+		   libdirs {"../lib/windows/sdl2/", "../lib/windows/soloud/", "../lib/windows/newton/"}
 		   links {"SDL2"}
 			
 		configuration "Debug"
-				links {"soloud_x64_d"}
+			links {"soloud_x64_d", "newton_d"}
 		
 		configuration "Release"
-				links {"soloud_x64"}
+			links {"soloud_x64", "newton"}
 			
 		configuration {"windows", "Release", "vs2017"}
-				postbuildcommands {
+			postbuildcommands 
+			{
+				"copy ..\\..\\lib\\windows\\sdl2\\SDL2.dll release\\ /Y",
+				"copy ..\\..\\lib\\windows\\soloud\\soloud_x64.dll release\\ /Y",
+				"copy ..\\..\\lib\\windows\\newton\\newton.dll release\\ /Y",
 				"xcopy ..\\..\\assets ..\\..\\bin\\assets /s /e /h /i /y /d",
 				"copy release\\Symmetry.exe ..\\..\\bin\\ /Y",
 				"copy release\\libSymmetry.dll ..\\..\\bin\\ /Y",
 				"copy release\\SDL2.dll ..\\..\\bin\\ /Y",
 				"copy release\\soloud_x64.dll ..\\..\\bin\\ /Y",
+				"copy release\\newton.dll ..\\..\\bin\\ /Y",
+				"rmdir release\\assets",
+				"mklink /D release\\assets ..\\..\\..\\assets"
 			}
 			
-				newaction {
-				   trigger = "postbuild_copy",
-				   description = "Action to copy relevant dlls to executable directory after build",
-				   execute = function ()
-					  local copy_dest_dir = ""
-					  local symlink_dest_dir = ""
-					  
-					  if(_ARGS[1] == "vs2017") then
-						 copy_dest_dir = "vs2017"
-						 symlink_dest_dir = "..\\..\\..\\assets"
-						 printf("Copying DLLs to visual studio build directory...\n")
-					  else
-						 copy_dest_dir = "projects/qbs"
-						 symlink_dest_dir = "..\\..\\..\\..\\assets"
-						 printf("Copying DLLs to qbs build directory...\n")
-					  end
-
-					  local success = false
-					  success = os.copyfile("../libs/windows/sdl2/SDL2.dll", copy_dest_dir .. "/debug/SDL2.dll")
-					  success = os.copyfile("../libs/windows/sdl2/SDL2.dll", copy_dest_dir .. "/release/SDL2.dll")
-					  success = os.copyfile("../libs/windows/soloud_x64_d.dll", copy_dest_dir .. "/debug/soloud_x64_d.dll")
-					  success = os.copyfile("../libs/windows/soloud_x64.dll", copy_dest_dir .. "/release/soloud_x64.dll")
-					  
-
-					  if success ~= true then
-						 printf("Copying one or more dlls failed.")
-					  else
-						 printf("Copying dlls successful.")
-					  end
-
-					  -- Create sym links
-					  local output = os.outputof("mklink /D " .. path.translate(copy_dest_dir, "\\")  .. "\\debug\\assets " .. symlink_dest_dir)
-					  printf("MKlink debug output : %s", output)
-					  output = os.outputof("mklink /D " .. path.translate(copy_dest_dir, "\\")  .. "\\release\\assets " ..symlink_dest_dir)
-					  printf("MKlink release output : %s", output)
-				   end
-				}
-				
-				if(_ACTION == "vs2017") then 
-					postbuildcommands
-					{
-					   _PREMAKE_COMMAND .. " postbuild_copy vs2017"
-					}
-				else
+		configuration {"windows", "Debug", "vs2017"}
 			postbuildcommands 
 			{
-					   _PREMAKE_COMMAND .. " postbuild_copy qbs"
+				"copy ..\\..\\lib\\windows\\sdl2\\SDL2.dll debug\\ /Y",
+				"copy ..\\..\\lib\\windows\\soloud\\soloud_x64_d.dll debug\\ /Y",
+				"copy ..\\..\\lib\\windows\\newton\\newton_d.dll debug\\ /Y",
+				"rmdir debug\\assets",
+				"mklink /D debug\\assets ..\\..\\..\\assets"
 			}
-				end
 	-------------------------
 	-- libSymmetry
 	-------------------------

src/common/array_str.h

@@ -4,7 +4,7 @@
 // String type based on array that is conveniently resizable and
 // converatble to/from other types.
 
-char*  str_new(const char* str);
-size_t str_len(const char* str);
+//char*  str_new(const char* str);
+//size_t str_len(const char* str);
 
 #endif

src/common/common.h

@@ -47,6 +47,12 @@ enum Sound_Attenuation_Type
 	SA_EXPONENTIAL // Exponential distance attenuation model
 };
 
+struct Physics_Api
+{
+	void(*init)(void);
+	void(*cleanup)(void);
+};
+
 struct Sound_Api
 {
 	void (*update_3d)(void);
@@ -147,6 +153,7 @@ struct Platform_Api
     struct File_Api    file;
     struct Config_Api  config;
     struct Log_Api     log;
+	struct Physics_Api physics;
 };
 
 struct Game_Api

src/game/main.c

@@ -4,6 +4,7 @@
 #include "../common/log.h"
 #include "sound.h"
 #include "platform.h"
+#include "physics.h"
 #include "file_io.h"
 #include "config_vars.h"
 #include "../common/hashmap.h"
@@ -118,8 +119,14 @@ int main(int argc, char** args)
             .log =
             {
                 .file_handle_get = &log_file_handle_get
+            },
+			.physics = 
+			{
+				.init    = &physics_init,
+				.cleanup = &physics_cleanup
 			}
         };
+
         if(!game_lib_load())
             log_error("main", "Failed to load  game library");
         else
@@ -221,7 +228,7 @@ bool init(void)
     return true;
 }
 
-void cleanup()
+void cleanup(void)
 {
 	if(game.cleanup) game.cleanup();
 	if(game_lib_handle) platform_unload_library(game_lib_handle);

src/game/physics.c

@@ -0,0 +1,27 @@
+#include "physics.h"
+#include "../common/log.h"
+
+#include <Newton.h>
+
+static NewtonWorld* newton_world = 0;
+
+void physics_init(void)
+{
+	newton_world = NewtonCreate();
+	if(!newton_world)
+	{
+		log_error("physics:init", "Physics world created!");
+	}
+	else
+	{
+		log_message("Physics world created");
+	}
+}
+
+void physics_cleanup(void)
+{
+	if(newton_world)
+	{
+		NewtonDestroy(newton_world);
+	}
+}

src/game/physics.h

@@ -0,0 +1,7 @@
+#ifndef PHYSICS_H
+#define PHYSICS_H
+
+void physics_init(void);
+void physics_cleanup(void);
+
+#endif

src/libsymmetry/game.c

@@ -25,6 +25,7 @@
 #include "gui.h"
 #include "editor.h"
 #include "sprite.h"
+#include "../common/string_utils.h"
 #include "../common/parser.h"
 #include "../common/hashmap.h"
 #include "../common/variant.h"
@@ -96,6 +97,7 @@ bool game_init(struct Window* window, struct Platform_Api* platform_api)
 	light_init();
 	material_init();
 	entity_init();
+	platform->physics.init();
 	scene_init();
 	
 	/* Debug scene setup */
@@ -207,10 +209,6 @@ void scene_setup(void)
 	/////* struct Entity* light_ent = entity_find("Ground"); */
 	/////* entity_save(light_ent, "ground.ent", DT_INSTALL); */
 
-//	//scene_save("test.symtres", DIRT_INSTALL);
-
-//	//struct Entity* light = entity_load("light.ent", DT_INSTALL);
-
  //   struct Entity* suz = entity_find("Suzanne");
  //   struct Entity* sound_ent = scene_add_as_child("Sound_Ent", ET_SOUND_SOURCE, suz->id);
  //   struct Sound_Source* sound_source = &sound_ent->sound_source;
@@ -229,9 +227,9 @@ void scene_setup(void)
 
  //   entity_apply_sound_params(sound_ent);
 
-//    scene_save("parser_write.symtres", DIRT_INSTALL);
+ //   scene_save("test_scene.symtres", DIRT_INSTALL);
 
-    if(scene_load("parser_write.symtres", DIRT_INSTALL))
+    if(scene_load("test_scene.symtres", DIRT_INSTALL))
     {
         log_message("Scene loaded!");
         struct Entity* player = entity_find("player");
@@ -1678,7 +1676,11 @@ void game_cleanup(void)
 		game_state = NULL;
 	}
 
-    if(platform) free(platform);
+	if(platform)
+	{
+		platform->physics.cleanup();
+		free(platform);
+	}
 }
 
 struct Game_State* game_state_get(void)

src/libsymmetry/scene.c

@@ -14,8 +14,8 @@ static int root_node = -1;
 void scene_init(void)
 {
 	/* Add root node to scene */
-	/* struct Entity* root = entity_create("ROOT", ET_ROOT, -1); */
-	/* root_node = root->id; */
+	 /*struct Entity* root = entity_create("ROOT", ET_ROOT, -1);
+	 root_node = root->id; */
 }
 
 struct Entity* scene_add_new(const char* name, const int type)