Changeset 8529 in orxonox.OLD for branches/gui/src/lib
- Timestamp:
- Jun 16, 2006, 2:51:44 PM (18 years ago)
- Location:
- branches/gui/src/lib
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/gui/src/lib/graphics/effects/lense_flare.cc
r8495 r8529 47 47 this->setClassID(CL_LENSE_FLARE, "LenseFlare"); 48 48 49 this->flareMatrix = new float[14];50 49 /* length image scale */ 51 50 this->flareMatrix[0] = 1.0f; -
branches/gui/src/lib/graphics/effects/lense_flare.h
r8495 r8529 51 51 bool bVisible; //!< Checks visibility 52 52 Light* lightSource; //!< reference to the sun (or primary light source) 53 std::vector<ImagePlane*> 53 std::vector<ImagePlane*> flares; //!< the flares array 54 54 55 55 Vector2D flareVector; //!< the axis to draw the flares on … … 57 57 Vector2D screenCenter; //!< the vector marking the center of the screen 58 58 59 float * flareMatrix;59 float flareMatrix[14]; 60 60 Plane frustumPlane; //!< plane that marks the view frustum 61 61 }; -
branches/gui/src/lib/gui/gl/glgui_inputline.cc
r8528 r8529 57 57 58 58 this->delayNext = 0.0; 59 this->pressedKey = SDLK_FIRST; 60 this->pressedKeyName = SDLK_FIRST; 59 61 60 62 } … … 202 204 this->setSize2D( this->_text.getSize2D() + Vector2D(borderLeft() + borderRight(), borderTop() + borderBottom())); 203 205 GLGuiWidget::resize(); 204 /* this->frontRect().setTopLeft(borderLeft(), borderTop());205 this->frontRect().setSize(this->getSize2D() - Vector2D(borderLeft() + borderRight(), borderTop() + borderBottom()));*/206 /* this->frontRect().setTopLeft(borderLeft(), borderTop()); 207 this->frontRect().setSize(this->getSize2D() - Vector2D(borderLeft() + borderRight(), borderTop() + borderBottom()));*/ 206 208 } 207 209 … … 230 232 if (this->delayNext > 0.0) 231 233 this->delayNext -= dt; 232 234 else if (this->pressedKey != SDLK_FIRST ) 233 235 { 234 236 this->delayNext = GLGuiInputLine::repeatRate; … … 239 241 break; 240 242 default: 241 {242 if (likely(this->pressedKey < 127))243 this->appendCharacter(this->pressedKeyName);244 }243 { 244 if (likely(this->pressedKey < 127)) 245 this->appendCharacter(this->pressedKeyName); 246 } 245 247 } 246 248 } … … 257 259 GLGuiWidget::draw(); 258 260 259 // this->frontMaterial().select();260 // GLGuiWidget::drawRect(this->frontRect());261 // this->frontMaterial().select(); 262 // GLGuiWidget::drawRect(this->frontRect()); 261 263 262 264 this->endDraw();
Note: See TracChangeset
for help on using the changeset viewer.