Changeset 483

Timestamp:

Dec 12, 2007, 8:25:40 PM (17 years ago)

Author:

gabrieho

Message:

working but still poor skybox

Location:

code/branches/skybox

Files:

• bin/resources.cfg (modified) (2 diffs)
• src/CMakeLists.txt (modified) (1 diff)
• src/orxonox.cc (modified) (7 diffs)

code/branches/skybox/bin/resources.cfg

@@ -10 +10 @@
 #FileSystem=../Media/materials/programs
 FileSystem=../Media/materials/scripts
-#FileSystem=../Media/materials/textures
+FileSystem=../Media/materials/textures
+FileSystem=../Media/packs/
 #FileSystem=../Media/models
 #FileSystem=../Media/overlays
@@ -21 +22 @@
 #Zip=../Media/packs/fresneldemo.zip
 #Zip=../Media/packs/ogretestmap.zip
-Zip=../Media/packs/skybox.zip
+#Zip=../Media/packs/skybox.zip
+Zip=../Media/packs/mysky.zip

code/branches/skybox/src/CMakeLists.txt

@@ -3 +3 @@
 # create a few variables to simplify life
 
-SET(SRC_FILES orxonox.cc loader/LevelLoader.cc xml/xmlParser.cc skybox/SkyBox.cc)
-SET(INC_FILES loader/LevelLoader.h xml/xmlParser.h skybox/SkyBox.h)
+SET(SRC_FILES orxonox.cc Universe.cpp loader/LevelLoader.cc xml/xmlParser.cc skybox/SkyBox.cc)
+SET(INC_FILES Universe.h loader/LevelLoader.h xml/xmlParser.h skybox/SkyBox.h)
 
 #Creates an executable

code/branches/skybox/src/orxonox.cc

@@ -38 +38 @@
 #include <string>
 #include <iostream>
+#include "Universe.h"
 
 #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
 #include <CoreFoundation/CoreFoundation.h>
 #include "windows.h"
-
 
 
@@ -73 +73 @@
       Ogre::RenderWindow * mWindow;
       Ogre::SceneManager *mgr;
-      int stopper = 1;
-
+      int stopper = 0;
 
   class OrxApplication
@@ -88 +87 @@
         createScene();
         setupScene();
+        createUniverse();
         setupInputSystem();
         setupCEGUI();
@@ -172 +172 @@
       void setupScene()
       {
-        mgr = mRoot->createSceneManager(Ogre::ST_GENERIC, "Default SceneManager");
-        cam = mgr->createCamera("Camera");
-        cam->setPosition(Ogre::Vector3(0,0,0));
-        //cam->lookAt(Ogre::Vector3(0,0,0));
-        cam->setFOVy(Ogre::Degree(90));
-        Ogre::Viewport *vp = mRoot->getAutoCreatedWindow()->addViewport(cam);
-        mgr->setSkyBox(true, "Examples/SpaceSkyBox");
-
-        // camera pitch here works
+                mgr = mRoot->createSceneManager(Ogre::ST_GENERIC, "Default SceneManager");
+                cam = mgr->createCamera("Camera");
+                cam->setPosition(Ogre::Vector3(0,0,0));
+                cam->lookAt(Ogre::Vector3(0,0,0));
+                //cam->setFOVy(Ogre::Degree(90));
+                Ogre::Viewport *vp = mRoot->getAutoCreatedWindow()->addViewport(cam);
+
+                Ogre::ColourValue fadeColour(0.0, 0.0, 0.0);
+                vp->setBackgroundColour(fadeColour);
+                mgr->setFog(Ogre::FOG_EXP, fadeColour, 0.0, 10000, 38000);
+        
+                
+                //mgr->setSkyBox(true, "Examples/SpaceSkybox");
+                //mgr->setSkyBox(true, "MySky");
+                
+                mgr->setAmbientLight(Ogre::ColourValue(0.1, 1.0, 0.1));
+                /*Ogre::Light *light = mgrtemp->createLight(lightnames);
+                light->setType(Ogre::Light::LT_POINT);
+                light->setPosition(Ogre::Vector3(0, 0, 0));
+
+                light->setDiffuseColour(1.0, 0.0, 0.0);
+                light->setSpecularColour(1.0, 0.0, 0.0);
+                */
 
         
@@ -217 +231 @@
       {
 
-        Ogre::Radian x1 = Ogre::Radian(x);
-
-        unsigned int indice = 1;
+        /*unsigned int indice = 1;
         char filename[30];
         char fn[1];
         // generate new names...
-        sprintf(filename, "SkyBox%d.png", stopper);
         //sprintf(filename, "screenshot_%d.png", ++indice);
         //sprintf(filename, fn, ++indice);
+        */
         
-
-        Ogre::Radian x2 = Ogre::Radian((3.141592653589/2.0)*(stopper+1));
-
-
         if(stopper == 1){
-                        cam->yaw(Ogre::Degree(90));
-        sprintf(filename, "SkyBox%d.png", stopper+1035);
-        mWindow->writeContentsToFile(filename);
-        
+        //sprintf(filename, "stevecube_FR.bmp");
+        mWindow->writeContentsToFile("MySky_FR.bmp");   
         }
         else if(stopper == 2){
-                        cam->yaw(Ogre::Degree(180));
-        mWindow->writeContentsToFile(filename);
-        
+        //sprintf(filename, "stevecube_LF.bmp");
+        cam->pitch(Ogre::Degree(90));
+        mWindow->writeContentsToFile("MySky_LF.bmp");
         }
         else if(stopper == 3){
-                        cam->yaw(Ogre::Degree(270));    
-        mWindow->writeContentsToFile(filename);
-
+        //sprintf(filename, "stevecube_BK.bmp");
+        cam->pitch(Ogre::Degree(90));
+        mWindow->writeContentsToFile("MySky_BK.bmp");
         }
         else if(stopper == 4){
-                        cam->yaw(Ogre::Degree(0));      
-        mWindow->writeContentsToFile(filename);
-
-        }
-
+        //sprintf(filename, "stevecube_RT.bmp");
+        cam->pitch(Ogre::Degree(90));
+        mWindow->writeContentsToFile("MySky_RT.bmp");
+        }
         else if(stopper == 5){
-
-                        cam->yaw(Ogre::Degree(0));      
-        mWindow->writeContentsToFile(filename);
-
+        //sprintf(filename, "stevecube_UP.bmp");
+        cam->yaw(Ogre::Degree(90));
+        mWindow->writeContentsToFile("MySky_UP.bmp");
         }
         else if(stopper == 6){
-                        cam->yaw(Ogre::Degree(180));    
-        mWindow->writeContentsToFile(filename);
-
-        }
-
-        /*else if(stopper == 6){
-                        cam->roll(Ogre::Degree(270));   
-        }*/
-
-        //cam->pitch(Ogre::Degree(90)*stopper);
+        cam->yaw(Ogre::Degree(-90));
+        mWindow->writeContentsToFile("MySky_DN.bmp");
+        }
 
         stopper+=1;
@@ -275 +272 @@
         stopper = 1;
       }
+
+
+
+
+        void createUniverse()
+        {
+
+                // UNIVERSE-CLASS
+std::cout << "1_1\n";
+                Universe::Universe myUni = Universe(77000);
+std::cout << "1_2\n";
+                myUni.createCoordinates();
+std::cout << "1_3\n";
+                myUni.createBillboards(mgr, cam, mRoot);
+std::cout << "1_4\n";
+                
+
+        }
+
+
+
 
   class OrxExitListener : public Ogre::FrameListener
@@ -344 +362 @@
 #endif
 {
+      srand(time(NULL));
   try
   {