Changeset 8983 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jul 1, 2006, 4:12:44 PM (19 years ago)

Author:

bensch

Message:

blend-stuff

Location:

trunk/src/world_entities

Files:

• elements/glgui_energywidget.cc (modified) (3 diffs)
• weapons/test_gun.cc (modified) (3 diffs)

trunk/src/world_entities/elements/glgui_energywidget.cc

@@ -26 +26 @@
   {
     //   this->setClassID(CL_PROTO_ID, "GLGuiEnergyWidget");
+
+    this->_bar.setSize2D(100, 30);
     this->pack(&this->_name);
     this->pack(&this->_valueText);
@@ -36 +38 @@
     this->_valueText.setBackgroundTexture("maps/gui_element_background_2.png");
     this->_bar.setBackgroundTexture(Texture());
+    this->_bar.setBackgroundColor(Color(0,0,0,0));
+    this->_bar.setForegroundColor(Color(1, 1, 1, 1));
+    this->_bar.font().setBlendFunc(GL_SRC_ALPHA, GL_DST_ALPHA);
   }
 
@@ -50 +55 @@
   {
     this->_name.setText(name);
+    this->_bar.setWidgetSize(this->_name.getSize2D());
   }
 

trunk/src/world_entities/weapons/test_gun.cc

@@ -32 +32 @@
 
 #include "fast_factory.h"
-
-
-using namespace std;
 
 CREATE_FACTORY(TestGun, CL_TEST_GUN);
@@ -123 +120 @@
   this->setStateDuration(WS_DEACTIVATING, .4);
 
-  this->setEnergyMax(100000);
-  this->increaseEnergy(100000);
+  this->setEnergyMax(10000);
+  this->increaseEnergy(1000);
   //this->minCharge = 2;
 
@@ -133 +130 @@
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
   this->setProjectileType(CL_LASER);
-  this->prepareProjectiles(20);
+  this->prepareProjectiles(100);
 
 }