Changeset 10154 in orxonox.OLD

Timestamp:

Jan 1, 2007, 3:32:36 AM (17 years ago)

Author:

marcscha

Message:

Wobblegrid addition for alienweapons

Location:

branches/playability/src

Files:

• lib/graphics/importer/vertex_array_model.cc (modified) (1 diff)
• world_entities/Makefile.am (modified) (2 diffs)
• world_entities/effects/wobblegrid.cc (added)
• world_entities/effects/wobblegrid.h (added)
• world_entities/space_ships/space_ship.cc (modified) (2 diffs)

branches/playability/src/lib/graphics/importer/vertex_array_model.cc

@@ -260 +260 @@
                             ((float)j - (float)resolutionY/2.0)/(float)resolutionY * sizeY);
           this->addNormal(0.0, 1, 0.0);
-          this->addTexCoor((float)i/(float)resolutionX, (float)j/(float)resolutionY);
+          this->addTexCoor((float)i/(float)(resolutionY-1), (float)j/(float)(resolutionX-1));
           this->addColor(1.0, 1.0, 1.0);
         }

branches/playability/src/world_entities/Makefile.am

@@ -10 +10 @@
                                 weapons/weapon.cc               weapons/ammo_container.cc               projectiles/projectile.cc \
                                                 extendable.cc           power_ups/power_up.cc           power_ups/param_power_up.cc \
-                                power_ups/weapon_power_up.cc                            spawning_point.cc                                               effects/explosion.cc            effects/billboard.cc \
+                                power_ups/weapon_power_up.cc                            spawning_point.cc                                               effects/explosion.cc            effects/billboard.cc            effects/wobblegrid.cc\
                                 effects/trail.cc                                elements/glgui_energywidget.cc elements/glgui_energywidgetvertical.cc
 
@@ -18 +18 @@
                                 weapons/weapon.h                weapons/ammo_container.h                projectiles/projectile.h \
                                                 power_ups/power_up.h            power_ups/param_power_up.h              power_ups/weapon_power_up.h \
-                                                spawning_point.h                                                effects/explosion.h             effects/billboard.h             effects/trail.h \
+                                                spawning_point.h                                                effects/explosion.h             effects/billboard.h             effects/trail.h                 effects/wobblegrid.h\
                                                                                 elements/glgui_energywidget.h elements/glgui_energywidgetvertical.h
 

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -37 +37 @@
 #include "particles/sprite_particles.h"
 #include "effects/trail.h"
+
+#include "effects/wobblegrid.h"
 
 #include "util/loading/factory.h"
@@ -370 +372 @@
 
   this->toList(OM_GROUP_00);
+
+  Wobblegrid* test  = new Wobblegrid(5);
+  test->setTexture("maps/fichte_ast6.tga");
+  
+  test->setAbsCoor( this->getAbsCoor() + Vector(0, 2, 0));
+  test->setParent( this);
+  
 }