Changeset 8529 in orxonox.OLD

Timestamp:

Jun 16, 2006, 2:51:44 PM (18 years ago)

Author:

bensch

Message:

valgrind-sweep

Location:

branches/gui/src/lib

Files:

• graphics/effects/lense_flare.cc (modified) (1 diff)
• graphics/effects/lense_flare.h (modified) (2 diffs)
• gui/gl/glgui_inputline.cc (modified) (5 diffs)

branches/gui/src/lib/graphics/effects/lense_flare.cc

@@ -47 +47 @@
     this->setClassID(CL_LENSE_FLARE, "LenseFlare");
 
-    this->flareMatrix = new float[14];
     /*          length                      image scale */
     this->flareMatrix[0] = 1.0f;

branches/gui/src/lib/graphics/effects/lense_flare.h

@@ -51 +51 @@
     bool                     bVisible;          //!< Checks visibility
     Light*                   lightSource;        //!< reference to the sun (or primary light source)
-    std::vector<ImagePlane*>  flares;             //!< the flares array
+    std::vector<ImagePlane*> flares;             //!< the flares array
 
     Vector2D                 flareVector;        //!< the axis to draw the flares on
@@ -57 +57 @@
     Vector2D                 screenCenter;       //!< the vector marking the center of the screen
 
-    float*                   flareMatrix;
+    float                    flareMatrix[14];
     Plane                    frustumPlane;       //!< plane that marks the view frustum
 };

branches/gui/src/lib/gui/gl/glgui_inputline.cc

@@ -57 +57 @@
 
     this->delayNext = 0.0;
+    this->pressedKey = SDLK_FIRST;
+    this->pressedKeyName = SDLK_FIRST;
 
   }
@@ -202 +204 @@
     this->setSize2D( this->_text.getSize2D() + Vector2D(borderLeft() + borderRight(), borderTop() + borderBottom()));
     GLGuiWidget::resize();
-/*    this->frontRect().setTopLeft(borderLeft(), borderTop());
-    this->frontRect().setSize(this->getSize2D() - Vector2D(borderLeft() + borderRight(), borderTop() + borderBottom()));*/
+    /*    this->frontRect().setTopLeft(borderLeft(), borderTop());
+        this->frontRect().setSize(this->getSize2D() - Vector2D(borderLeft() + borderRight(), borderTop() + borderBottom()));*/
   }
 
@@ -230 +232 @@
     if (this->delayNext > 0.0)
       this->delayNext -= dt;
-        else if (this->pressedKey != SDLK_FIRST )
+    else if (this->pressedKey != SDLK_FIRST )
     {
       this->delayNext = GLGuiInputLine::repeatRate;
@@ -239 +241 @@
           break;
         default:
-        {
-          if (likely(this->pressedKey < 127))
-            this->appendCharacter(this->pressedKeyName);
-        }
+          {
+            if (likely(this->pressedKey < 127))
+              this->appendCharacter(this->pressedKeyName);
+          }
       }
     }
@@ -257 +259 @@
     GLGuiWidget::draw();
 
-//     this->frontMaterial().select();
-//     GLGuiWidget::drawRect(this->frontRect());
+    //     this->frontMaterial().select();
+    //     GLGuiWidget::drawRect(this->frontRect());
 
     this->endDraw();