Changeset 107

Timestamp:

Oct 25, 2007, 11:45:51 PM (16 years ago)

Author:

anonymous

Message:

nicolasc: made orxonox.cc work
removed a lot of unused media
fix some corrupted packages

Location:

code

Files:

• branches/tutorial/Tutorial/Media/packs/OgreCore.zip (modified) (previous)
• branches/tutorial/Tutorial/Media/packs/cubemap.zip (deleted)
• branches/tutorial/Tutorial/Media/packs/cubemapsJS.zip (deleted)
• branches/tutorial/Tutorial/Media/packs/dragon.zip (deleted)
• branches/tutorial/Tutorial/Media/packs/fresneldemo.zip (deleted)
• branches/tutorial/Tutorial/Media/packs/ogretestmap.zip (deleted)
• branches/tutorial/Tutorial/Media/packs/skybox.zip (deleted)
• trunk/bin/resources.cfg (modified) (3 diffs)
• trunk/src/orxonox.cc (modified) (3 diffs)

code/trunk/bin/resources.cfg

@@ -6 +6 @@
 # Resource locations to be added to the default path
 [General]
-FileSystem=../Media
-FileSystem=../Media/fonts
+#FileSystem=../Media
+#FileSystem=../Media/fonts
 #FileSystem=../Media/materials/programs
 #FileSystem=../Media/materials/scripts
@@ -14 +14 @@
 #FileSystem=../Media/overlays
 #FileSystem=../Media/particle
-FileSystem=../Media/gui
+#FileSystem=../Media/gui
 #FileSystem=../Media/DeferredShadingMedia
 #Zip=../Media/packs/cubemap.zip
@@ -21 +21 @@
 #Zip=../Media/packs/fresneldemo.zip
 #Zip=../Media/packs/ogretestmap.zip
-Zip=../Media/packs/skybox.zip
+#Zip=../Media/packs/skybox.zip

code/trunk/src/orxonox.cc

@@ -32 +32 @@
 SceneNode *lightNode;
 
-class FrameListener : public ExampleFrameListener
+class OrxFrameListener : public ExampleFrameListener
 {
   public:
-    FrameListener(RenderWindow* win, Camera* cam, SceneManager *sceneMgr)
+    OrxFrameListener(RenderWindow* win, Camera* cam, SceneManager *sceneMgr)
   : ExampleFrameListener(win, cam, false, false)
     {
@@ -83 +83 @@
         // add tutorial code here:
         // ...
-      mSceneMgr->setAmbientLight( ColourValue( 0.3, 0.3, 0.3 ) );
+      //mSceneMgr->setAmbientLight( ColourValue( 0.3, 0.3, 0.3 ) );
       //Entity* head = mSceneMgr->createEntity("head", "ogrehead.mesh");
 
       //Entity* head2 = mSceneMgr->createEntity("head2", "ogrehead.mesh");
 
-      SceneNode *node = mSceneMgr->getRootSceneNode()->createChildSceneNode( "OgreHeadNode", Vector3( 0, 0, 0 ) );
+      //ceneNode *node = mSceneMgr->getRootSceneNode()->createChildSceneNode( "OgreHeadNode", Vector3( 0, 0, 0 ) );
       //node->attachObject( head );
 
-      SceneNode *node2 = mSceneMgr->getRootSceneNode()->createChildSceneNode( "OgreHeadNode2", Vector3( 50, 0, 0 ) );
+      //SceneNode *node2 = mSceneMgr->getRootSceneNode()->createChildSceneNode( "OgreHeadNode2", Vector3( 50, 0, 0 ) );
       //node2->attachObject( head2 );
 
@@ -116 +116 @@
     {
         // create frame listener
-      mFrameListener = new ExampleFrameListener(mWindow, mCamera, mSceneMgr);
+      mFrameListener = new OrxFrameListener(mWindow, mCamera, mSceneMgr);
       mRoot->addFrameListener(mFrameListener);
     }