Changeset 6514 in orxonox.OLD for branches/network

Timestamp:

Jan 17, 2006, 10:44:34 PM (19 years ago)

Author:

patrick

Message:

network: added the ImageEntity WorldEntity class which will soon display an image

Location:

branches/network/src

Files:

• defs/class_id.h (modified) (1 diff)
• world_entities/Makefile.am (modified) (2 diffs)
• world_entities/image_entity.cc (added)
• world_entities/image_entity.h (added)
• world_entities/skybox.cc (modified) (1 diff)

branches/network/src/defs/class_id.h

@@ -99 +99 @@
   CL_PLAYER                     =    0x00202000,
   CL_NPC                        =    0x00204000,
+  CL_IMAGE_ENTITY               =    0x00206000,
   CL_PROJECTILE                 =    0x00208000,
   CL_WEAPON                     =    0x00210000,

branches/network/src/world_entities/Makefile.am

@@ -22 +22 @@
                   world_entities/character_attributes.cc \
                   world_entities/test_entity.cc \
+                  world_entities/image_entity.cc \
                   \
                   world_entities/weapons/weapon_manager.cc \
@@ -70 +71 @@
                  world_entities/character_attributes.h \
                  world_entities/test_entity.h \
+                 world_entities/image_entity.h \
                  \
                  world_entities/weapons/weapon_manager.h \

branches/network/src/world_entities/skybox.cc

@@ -210 +210 @@
 void SkyBox::draw()
 {
-  glPushAttrib(GL_LIGHTING_BIT);
+  glPushAttrib(GL_ENABLE_BIT);
+//   glPushAttrib(GL_LIGHTING_BIT);
   glDisable(GL_LIGHTING);
+
   WorldEntity::draw();
-//   glEnable(GL_LIGHTING);
+
   glPopAttrib();