Changeset 8144 in orxonox.OLD for branches/gui/src/lib
- Timestamp:
- Jun 4, 2006, 7:55:55 PM (19 years ago)
- Location:
- branches/gui/src/lib
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/gui/src/lib/collision_reaction/cr_engine.h
r7927 r8144 51 51 52 52 /** @returns an instance to a collision object. instead of creating new object this ones can be resycled */ 53 inline Collision* getCollisionObject() { /* return the first element of the cache list*/ }53 inline Collision* getCollisionObject() { /* return the first element of the cache list*/ } 54 54 /** @param collision: returns the Collision object back to the cache list */ 55 55 inline void putCollisionObject(Collision* collision) { this->cachedCollisions.push_back(collision); } -
branches/gui/src/lib/graphics/importer/primitive_model.cc
r7729 r8144 104 104 105 105 // defining the binding Faces. 106 unsignedint v1, v2, v3, v4;106 int v1, v2, v3, v4; 107 107 for (int i = 0; i <= detail * 2 -1; i++) 108 108 { … … 235 235 } 236 236 //defining Faces 237 unsignedint v1, v2, v3, v4;237 int v1, v2, v3, v4; 238 238 for (int i = 0; i < detail-1; i++) 239 239 for (int j = 0; j < detail-1; j++) -
branches/gui/src/lib/graphics/importer/texture.cc
r7790 r8144 218 218 this->setTexture(Texture::loadTexToGL(this->data->getStoredImage())); 219 219 } 220 return true; 220 221 } 221 222 -
branches/gui/src/lib/graphics/importer/texture.h
r7790 r8144 34 34 bool setSurface(SDL_Surface* newSurface); 35 35 /** @returns true if the Surface has an Alpha Value. */ 36 bool setAlpha(bool hasAlpha) { this->bAlpha = hasAlpha; };36 bool setAlpha(bool hasAlpha) { this->bAlpha = hasAlpha; return this->bAlpha; }; 37 37 bool setTexture(GLuint texture); 38 38 -
branches/gui/src/lib/gui/gl/glgui_style.h
r8143 r8144 1 1 /*! 2 2 * @file glgui_style.h 3 * @brief Definition of ...3 * @brief Definition of the OpenGL-GUI Style of a Class. 4 4 */ 5 5 … … 19 19 { 20 20 public: 21 //! An enumerator that defines the different states Widgets may be in.22 typedef enum {23 Normal, //!< Normal state of the GUI's Widgets.24 Active, //!< If the widget is Active.25 Selected, //!< If the Widget is Selected.26 Insensitive //!< If the Widget is insensitive.27 } State;28 21 29 22 //! Where a Certain feature will be positioned at. … … 35 28 } FeaturePosition; 36 29 30 31 37 32 public: 38 33 GLGuiStyle(); … … 41 36 42 37 private: 43 44 38 float _borderLeft; //!< The Distance to the left Border of the widget, before any internal Element starts. 45 39 float _borderRight; //!< The Distance to the right Border of the widget, before any internal Element starts. -
branches/gui/src/lib/gui/gl/glgui_widget.h
r8140 r8144 35 35 */ 36 36 class GLGuiWidget : public Element2D 37 { 37 { 38 public: 39 //! An enumerator that defines the different states Widgets may be in. 40 typedef enum { 41 Normal, //!< Normal state of the GUI's Widgets. 42 Active, //!< If the widget is Active. 43 Selected, //!< If the Widget is Selected. 44 Insensitive //!< If the Widget is insensitive. 45 } State; 46 47 48 38 49 public: 39 50 GLGuiWidget(GLGuiWidget* parent = NULL); -
branches/gui/src/lib/gui/qt/gui_general.cc
r7855 r8144 41 41 */ 42 42 GuiGeneral::GuiGeneral(OrxGui::Gui* gui) 43 : Element(CONFIG_SECTION_GENERAL, gui), QGroupBox()43 : QGroupBox(), Element(CONFIG_SECTION_GENERAL, gui) 44 44 { 45 45 QGridLayout* layout = new QGridLayout(this); -
branches/gui/src/lib/lang/base_object.cc
r7954 r8144 154 154 if (classID != CL_NULL) 155 155 return this->isA(classID); 156 else 157 return false; 156 158 } 157 159 -
branches/gui/src/lib/lang/class_list.cc
r7429 r8144 335 335 PRINT(0)("| knows %d Classes\n|\n", ClassList::classList->size()); 336 336 char niceString[100]; 337 unsignedint lenCount = 0;337 int lenCount = 0; 338 338 339 339 list<ClassList>::iterator cl; -
branches/gui/src/lib/math/vector.h
r8035 r8144 79 79 inline const Vector& operator= (const Vector& v) { this->x = v.x; this->y = v.y; this->z = v.z; return *this; }; 80 80 /** copy constructor* @param v the sVec3D to assign to this vector. @returns the vector v */ 81 inline const Vector& operator= (const sVec3D& v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; }82 inline const Vector& operator= (const float* v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; }81 inline const Vector& operator= (const sVec3D& v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; return *this; } 82 inline const Vector& operator= (const float* v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; return *this; } 83 83 /** @param v: the other vector \return the dot product of the vectors */ 84 84 float dot (const Vector& v) const { return x*v.x+y*v.y+z*v.z; }; -
branches/gui/src/lib/shell/shell_buffer.cc
r8123 r8144 64 64 * @param line the Line as in the first argument in printf 65 65 */ 66 boolShellBuffer::addBufferLineStatic(const char* line, ...)66 void ShellBuffer::addBufferLineStatic(const char* line, ...) 67 67 { 68 68 static OrxThread::Mutex ShellBuffer__bufferMutex; … … 85 85 #endif 86 86 ShellBuffer::singletonRef->addBufferLine(ShellBuffer::bufferArray); 87 return true;88 87 } 89 88 -
branches/gui/src/lib/shell/shell_buffer.h
r8123 r8144 32 32 inline static bool isInstanciated() { return (ShellBuffer::singletonRef == NULL)?false:true; }; 33 33 34 static booladdBufferLineStatic(const char* line, ...);34 static void addBufferLineStatic(const char* line, ...); 35 35 void addBufferLine(const char* line); 36 36 -
branches/gui/src/lib/shell/shell_command.h
r7742 r8144 34 34 * $ ClassName [ObjectName] commandNameInShell [parameters] 35 35 */ 36 //#define SHELL_COMMAND(command, class, function) \37 // ShellCommand* shell_command_##class##_##command = ShellCommand<class>::registerCommand(#command, #class, &class::function)38 36 #define SHELL_COMMAND(command, class, function) \ 39 37 OrxShell::ShellCommand* shell_command_##class##_##command = OrxShell::ShellCommand::registerCommand(#command, #class, createExecutor<class>(&class::function)) -
branches/gui/src/lib/util/count_pointer.h
r6669 r8144 11 11 explicit CountPointer(X* p = 0) // allocate a new counter 12 12 : itsCounter(0) { if (p) itsCounter = new counter(p); } 13 ~CountPointer() { release(); }13 virtual ~CountPointer() { release(); } 14 14 CountPointer(const CountPointer& r) { acquire(r.itsCounter); } 15 15 CountPointer& operator=(const CountPointer& r)
Note: See TracChangeset
for help on using the changeset viewer.