Changeset 6524 in orxonox.OLD

Timestamp:

Jan 18, 2006, 3:27:12 AM (18 years ago)

Author:

patrick

Message:

network: added the planet to the menu

Location:

branches/network/src

Files:

• defs/class_id.h (modified) (1 diff)
• story_entities/simple_game_menu.cc (modified) (5 diffs)
• world_entities/Makefile.am (modified) (2 diffs)
• world_entities/planet.cc (added)
• world_entities/planet.h (added)
• world_entities/skybox.cc (modified) (1 diff)

branches/network/src/defs/class_id.h

@@ -100 +100 @@
   CL_NPC                        =    0x00204000,
   CL_IMAGE_ENTITY               =    0x00206000,
+  CL_PLANET                     =    0x00207000,
   CL_PROJECTILE                 =    0x00208000,
   CL_WEAPON                     =    0x00210000,

branches/network/src/story_entities/simple_game_menu.cc

@@ -33 +33 @@
 
 #include "event_handler.h"
+#include "graphics_engine.h"
 
 #include "cd_engine.h"
@@ -104 +105 @@
 
   this->dataTank->localCamera->setRelCoor(this->cameraVector);
-}
-
-
+
+  GraphicsEngine::getInstance()->displayFPS(false);
+}
+
+
+/**
+ * load the data
+ */
 ErrorMessage SimpleGameMenu::loadData()
 {
@@ -148 +154 @@
 
 
+/**
+ * start the menu
+ */
 bool SimpleGameMenu::start()
 {
@@ -158 +167 @@
 
 
+/**
+ * stop the menu
+ */
 bool SimpleGameMenu::stop()
 {
@@ -192 +204 @@
 void SimpleGameMenu::animateScene(float dt)
 {
-  Quaternion q(0.00005*dt, Vector(0.0, 1.0, 0.0));
+  Quaternion q(/*0.00005*/ 0.0001* dt, Vector(0.0, 1.0, 0.0));
   this->cameraVector = q.apply(this->cameraVector);
   this->dataTank->localCamera->setRelCoor(this->cameraVector);

branches/network/src/world_entities/Makefile.am

@@ -23 +23 @@
                   world_entities/test_entity.cc \
                   world_entities/image_entity.cc \
+                  world_entities/planet.cc \
                   \
                   world_entities/weapons/weapon_manager.cc \
@@ -72 +73 @@
                  world_entities/test_entity.h \
                  world_entities/image_entity.h \
+                 world_entities/planet.h \
                  \
                  world_entities/weapons/weapon_manager.h \

branches/network/src/world_entities/skybox.cc

@@ -71 +71 @@
   this->setClassID(CL_SKYBOX, "SkyBox");
   this->toList(OM_ENVIRON_NOTICK);
-  this->size = 100.0;
+  //this->size = 100.0;
   this->textureSize = 1024.0f;