Changeset 2388 for GTP/trunk/App/Demos/Illum/Ogre/src/Moria

Timestamp:

05/21/07 12:35:33 (18 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/App/Demos/Illum/Ogre/src/Moria

Files:

• include/Moria.h (modified) (3 diffs)
• scripts/Moria.7.10.vcproj (modified) (4 diffs)

GTP/trunk/App/Demos/Illum/Ogre/src/Moria/include/Moria.h

@@ -24 +24 @@
 #include "ExampleApplication.h"
 #include "OgreIlluminationManager.h"
+#include "NXOgre.h"
 #include "SceneSerializer.h"
 
 AnimationState* mAnimState;
 bool cullCamera = true;
+Body *throwSphere = 0;
+Scene* NXScene = 0;
 
 // Listener class for frame updates
@@ -72 +75 @@
         bool processUnbufferedKeyInput(const FrameEvent& evt)
     {
-                /*if (mInputDevice->isKeyDown(KC_C)&& mTimeUntilNextToggle <= 0)
-        {
-                        cullCamera = ! cullCamera;
-                        Root::getSingleton()._getCurrentSceneManager()->setOption("CullCamera", &cullCamera);
-                        mTimeUntilNextToggle = 1;
-                }*/
+                
+                if (mInputDevice->isKeyDown(KC_SPACE)) {
+                                                
+                        if(throwSphere == 0)
+                        {
+                                throwSphere = NXScene->createBody("throwSphere",
+                                                                                                        "sphere.mesh",
+                                                                                                        new SphereShape(0.5f),
+                                                                                                        Vector3(0,0,0),
+                                                                                                        "mass: 10");
+                                throwSphere->getNode()->setScale(0.005,0.005,0.005);
+                        }
+                        //myCube->
+                        throwSphere->setGlobalPosition(mCamera->getPosition());
+                        throwSphere->addForce(mCamera->getDirection()*200);
+        
+                }
                 return ExampleFrameListener::processUnbufferedKeyInput(evt);
         }
@@ -170 +184 @@
                 DataStreamPtr inputStream;                              
                 inputStream = ResourceGroupManager::getSingleton().openResource("moria.level"); //towers2.level 
+                World* NXWorld = new World("FrameListener: yes, log: html");
+                NXScene = NXWorld->createScene("Main", mSceneMgr, "gravity: yes, floor: yes"); 
+                s.setScene(NXScene);
+                s.setWorld(NXWorld);
                 s.parseScript(inputStream, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
                 s.parseEntryPoints("prmEntryPoints.text");
+/*
+                Body* b = NXScene->createBody("ize",
+                                                        "sphere.mesh",
+                                                        new SphereShape(0.5f),
+                                                        Vector3(5,0,5),
+                                                        "mass: 10");
+                b->getNode()->setScale(0.005,0.005,0.005);
+                b->setGlobalPosition(Vector3(5,10,5));*/
+
 /*
            ParticleSystem* pSys1 = mSceneMgr->createParticleSystem("psys1", "GTP/Moria/Smoke_Large");

GTP/trunk/App/Demos/Illum/Ogre/src/Moria/scripts/Moria.7.10.vcproj

@@ -21 +21 @@
                                 Optimization="0"
                                 ImproveFloatingPointConsistency="TRUE"
-                                AdditionalIncludeDirectories="..\include;"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\OgreMain\include";..\..\..\..\..\..\..\Lib\Illum\IllumModule\OgreIllumModule\include;..\..\..\..\..\..\..\Lib\Illum\IllumModule\OgreIllumModule\include\RenderTechniques;..\..\..\..\..\..\..\Lib\Illum\IllumModule\OgreIllumModule\include\RenderingRuns;..\..\..\..\..\..\..\Lib\Illum\IllumModule\IllumModule\include\RenderTechniques;..\..\..\..\..\..\..\Lib\Illum\IllumModule\IllumModule\include;..\..\..\..\..\..\..\Lib\Illum\IllumModule\IllumModule\include\RenderingRuns;..\..\Common\include"
-                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;GAMETOOLS_ILLUMINATION_MODULE;GTP_VISIBILITY_MODIFIED_OGRE"
+                                AdditionalIncludeDirectories="..\include;"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\OgreMain\include";..\..\..\..\..\..\..\Lib\Illum\IllumModule\OgreIllumModule\include;..\..\..\..\..\..\..\Lib\Illum\IllumModule\OgreIllumModule\include\RenderTechniques;..\..\..\..\..\..\..\Lib\Illum\IllumModule\OgreIllumModule\include\RenderingRuns;..\..\..\..\..\..\..\Lib\Illum\IllumModule\IllumModule\include\RenderTechniques;..\..\..\..\..\..\..\Lib\Illum\IllumModule\IllumModule\include;..\..\..\..\..\..\..\Lib\Illum\IllumModule\IllumModule\include\RenderingRuns;..\..\Common\include;"$(NXOGRE_PATH)\include";"$(PHYSX_DIR)\SDKs\Physics\include";"$(PHYSX_DIR)\SDKs\Foundation\include";"$(PHYSX_DIR)\SDKs\Cooking\include";"$(PHYSX_DIR)\SDKs\NxCharacter\include";"$(PHYSX_DIR)\SDKs\PhysXLoader\include""
+                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;GAMETOOLS_ILLUMINATION_MODULE;GTP_VISIBILITY_MODIFIED_OGRE;NXOGRE"
                                 MinimalRebuild="TRUE"
                                 BasicRuntimeChecks="3"
@@ -35 +35 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="OgreMain_d.lib IllumModule_Ogre.lib IllumModule.lib"
+                                AdditionalDependencies="OgreMain_d.lib IllumModule_Ogre.lib IllumModule.lib NxOgre_d.lib"
                                 OutputFile="$(OutDir)/Moria.exe"
                                 LinkIncremental="2"
-                                AdditionalLibraryDirectories="..\..\..\..\..\..\..\Lib\Illum\IllumModule\OgreIllumModule\bin\Debug;&quot;$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)&quot;;..\..\..\..\..\..\..\Lib\Illum\IllumModule\IllumModule\bin\Debug"
+                                AdditionalLibraryDirectories="..\..\..\..\..\..\..\Lib\Illum\IllumModule\OgreIllumModule\bin\Debug;&quot;$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)&quot;;..\..\..\..\..\..\..\Lib\Illum\IllumModule\IllumModule\bin\Debug;&quot;$(NXOGRE_PATH)/lib&quot;"
                                 IgnoreDefaultLibraryNames=""
                                 GenerateDebugInformation="TRUE"
@@ -86 +86 @@
                                 OptimizeForProcessor="2"
                                 OptimizeForWindowsApplication="TRUE"
-                                AdditionalIncludeDirectories="..\include;&quot;$(OGRE_PATH)\Samples\Common\include&quot;;&quot;$(OGRE_PATH)\OgreMain\include&quot;;..\..\..\..\..\..\..\Lib\Illum\IllumModule\OgreIllumModule\include;..\..\..\..\..\..\..\Lib\Illum\IllumModule\OgreIllumModule\include\RenderTechniques;..\..\..\..\..\..\..\Lib\Illum\IllumModule\OgreIllumModule\include\RenderingRuns;..\..\..\..\..\..\..\Lib\Illum\IllumModule\IllumModule\include\RenderTechniques;..\..\..\..\..\..\..\Lib\Illum\IllumModule\IllumModule\include;..\..\..\..\..\..\..\Lib\Illum\IllumModule\IllumModule\include\RenderingRuns;..\..\Common\include"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;GAMETOOLS_ILLUMINATION_MODULE;GTP_VISIBILITY_MODIFIED_OGRE"
+                                AdditionalIncludeDirectories="..\include;&quot;$(OGRE_PATH)\Samples\Common\include&quot;;&quot;$(OGRE_PATH)\OgreMain\include&quot;;..\..\..\..\..\..\..\Lib\Illum\IllumModule\OgreIllumModule\include;..\..\..\..\..\..\..\Lib\Illum\IllumModule\OgreIllumModule\include\RenderTechniques;..\..\..\..\..\..\..\Lib\Illum\IllumModule\OgreIllumModule\include\RenderingRuns;..\..\..\..\..\..\..\Lib\Illum\IllumModule\IllumModule\include\RenderTechniques;..\..\..\..\..\..\..\Lib\Illum\IllumModule\IllumModule\include;..\..\..\..\..\..\..\Lib\Illum\IllumModule\IllumModule\include\RenderingRuns;..\..\Common\include;&quot;$(NXOGRE_PATH)\include&quot;;&quot;$(PHYSX_DIR)\SDKs\Physics\include&quot;;&quot;$(PHYSX_DIR)\SDKs\Foundation\include&quot;;&quot;$(PHYSX_DIR)\SDKs\Cooking\include&quot;;&quot;$(PHYSX_DIR)\SDKs\NxCharacter\include&quot;;&quot;$(PHYSX_DIR)\SDKs\PhysXLoader\include&quot;"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;GAMETOOLS_ILLUMINATION_MODULE;GTP_VISIBILITY_MODIFIED_OGRE;NXOGRE"
                                 StringPooling="TRUE"
                                 MinimalRebuild="TRUE"
@@ -101 +101 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="OgreMain.lib IllumModule_Ogre.lib IllumModule.lib"
+                                AdditionalDependencies="OgreMain.lib IllumModule_Ogre.lib IllumModule.lib NxOgre.lib"
                                 OutputFile="$(OutDir)/Moria.exe"
                                 LinkIncremental="1"
-                                AdditionalLibraryDirectories="..\..\..\..\..\..\..\Lib\Illum\IllumModule\OgreIllumModule\bin\Release;&quot;$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)&quot;;..\..\..\..\..\..\..\Lib\Illum\IllumModule\IllumModule\bin\Release"
+                                AdditionalLibraryDirectories="..\..\..\..\..\..\..\Lib\Illum\IllumModule\OgreIllumModule\bin\Release;&quot;$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)&quot;;..\..\..\..\..\..\..\Lib\Illum\IllumModule\IllumModule\bin\Release;&quot;$(NXOGRE_PATH)\lib&quot;"
                                 GenerateDebugInformation="FALSE"
                                 SubSystem="2"