Changeset 3501

Timestamp:

03/15/10 06:23:12 (5 months ago)

Author:

trichards

Message:

More work on getting Tutorial 4 scene creation in script. See #199

Location:

tutorials/branches/0185_GEN_PHYSICS_REFACTOR_2/Tutorial4

Files:

• Tutorial4/src/GameClient.cpp (modified) (3 diffs)
• scripts/client/GameClient.lua (modified) (3 diffs)
• scripts/client/init.lua (modified) (2 diffs)
• scripts/core/Environment.lua (modified) (2 diffs)
• scripts/core/debugHelp.lua (modified) (2 diffs)

tutorials/branches/0185_GEN_PHYSICS_REFACTOR_2/Tutorial4/Tutorial4/src/GameClient.cpp

@@ -38 +38 @@
 #include <Zen/Core/Math/Quaternion4.hpp>
 
-#include <Zen/Core/Scripting/I_ScriptEngine.hpp>
-#include <Zen/Core/Scripting/I_ScriptModule.hpp>
-#include <Zen/Core/Scripting/I_ScriptType.hpp>
-#include <Zen/Core/Scripting/ObjectReference.hpp>
+#include <Zen/Core/Scripting.hpp>
+//#include <Zen/Core/Scripting/I_ScriptEngine.hpp>
+//#include <Zen/Core/Scripting/I_ScriptModule.hpp>
+//#include <Zen/Core/Scripting/I_ScriptType.hpp>
+//#include <Zen/Core/Scripting/ObjectReference.hpp>
 
 #include <Zen/Engine/Core/I_GameGroup.hpp>
@@ -225 +226 @@
 GameClient::initPhysics()
 {
-    m_baseGame.initPhysicsService("ZNewton");
+    m_baseGame.initPhysicsService("ZODE");
     setupPhysicsMaterials();
-    m_baseGame.initPhysicsResourceService("ZNewton");
+    m_baseGame.initPhysicsResourceService("ZODE");
 }
 
@@ -305 +306 @@
 {
     // TODO Register additional script types here
+
+    Zen::Scripting::script_type<GameClient>(base().getGameClientScriptType())
+            .addMethod("init", &GameClient::init)
+    ;
 
     // Tell m_base we're done.  After the modules are activated then you cannot

tutorials/branches/0185_GEN_PHYSICS_REFACTOR_2/Tutorial4/scripts/client/GameClient.lua

@@ +1 @@
+print("=============\nLoading GameClient scripts...\n============")
 
 
@@ -24 +25 @@
 -- ~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-
 function GameClient:initialize()
+    self:init();
+    
         rootGroup = self:getRootGroup()
 
@@ -42 +45 @@
 function GameClient:getActionMap(actionMapName)
     -- This is in Game now, not GameClient
-    return self:getActionMap(actionMapName)
+    return self:getGame():getActionMap(actionMapName)
 end
 

tutorials/branches/0185_GEN_PHYSICS_REFACTOR_2/Tutorial4/scripts/client/init.lua

@@ -1 @@
-package.path=package.path..";scripts\\?.lua"
+package.path=package.path..";scripts/?.lua"
 
-require "core.Environment"
-require "client.GameClient"
+print("=============\nLoading Tutorial4 initialization scripts...\n============");
+
+print("Loading core.Environment");
+require("core.Environment");
+
+print("Loading client.GameClient");
+require("client.GameClient");
 
 -- Debug
--- require "core.debugHelp";
-                                     
+require "core.debugHelp";
+
+-- Turn on tracing
+DebugInfo.trace = true;
+
 -- ~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-
 -- Create a game client of the specified type
@@ -15 +23 @@
 -- ~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-
 -- Initialize the main taBBall Game
-print("=============\nInitializing taBBall Client...\n============")
+print("=============\nInitializing Tutorial 4 Client...\n============")
 gameClient:initialize()

tutorials/branches/0185_GEN_PHYSICS_REFACTOR_2/Tutorial4/scripts/core/Environment.lua

@@ +1 @@
+print("Loaded Environment.lua");
 --[[
 
@@ -7 +8 @@
 
 ]]
+
+print("=============\nLoading Environment scripts...\n============")
                         
 -- Get the environment

tutorials/branches/0185_GEN_PHYSICS_REFACTOR_2/Tutorial4/scripts/core/debugHelp.lua

@@ -1 +1 @@
 
-local DebugInfo = 
+print("=============\nLoading Debug scripts...\n============")
+
+DebugInfo = 
 {
     nextIndex = 1;
+    trace = false;
 }
 
@@ -21 +24 @@
         DebugInfo.nextIndex = DebugInfo.nextIndex + 1;
 
-        --local s = info.short_src
-        --print(s .. ":" .. line)
+        if (DebugInfo.trace) then
+            local s = info.short_src
+            print(s .. ":" .. line)
+        end
     end