Context Navigation

Changeset 8144 in orxonox.OLD for branches/gui/src/lib

Timestamp:

Jun 4, 2006, 7:55:55 PM (19 years ago)

Author:

bensch

Message:

gui: better debugging system

Location:

branches/gui/src/lib

Files:

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); }

-                      r7729
+                      r8144
   // defining the binding Faces.
   unsigned int v1, v2, v3, v4;
+  int v1, v2, v3, v4;
   for (int i = 0; i <= detail * 2 -1; i++)
+  {
 …
+    }
   //defining Faces
   unsigned int v1, v2, v3, v4;
+  int v1, v2, v3, v4;
   for (int i = 0; i < detail-1; i++)
     for (int j = 0; j < detail-1; j++)

r7790	r8144
218	218	this->setTexture(Texture::loadTexToGL(this->data->getStoredImage()));
219	219	}
	220	return true;
220	221	}
221	222

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

-                      r8143
+                      r8144
 /*!
  * @file glgui_style.h
  * @brief Definition of ...
+ * @brief Definition of the OpenGL-GUI Style of a Class.
 */
 …
+  {
   public:
-    //! An enumerator that defines the different states Widgets may be in.
-    typedef enum {
-      Normal,           //!< Normal state of the GUI's Widgets.
-      Active,           //!< If the widget is Active.
-      Selected,         //!< If the Widget is Selected.
-      Insensitive       //!< If the Widget is insensitive.
-    } State;
     //! Where a Certain feature will be positioned at.
 …
     } FeaturePosition;
   public:
     GLGuiStyle();
 …
   private:
     float             _borderLeft;           //!< The Distance to the left Border of the widget, before any internal Element starts.
     float             _borderRight;          //!< The Distance to the right Border of the widget, before any internal Element starts.

-                      r8140
+                      r8144
    */
   class GLGuiWidget : public Element2D
+  {
+{
+  public:
+  //! An enumerator that defines the different states Widgets may be in.
+  typedef enum {
+    Normal,           //!< Normal state of the GUI's Widgets.
+    Active,           //!< If the widget is Active.
+    Selected,         //!< If the Widget is Selected.
+    Insensitive       //!< If the Widget is insensitive.
+  } State;
   public:
     GLGuiWidget(GLGuiWidget* parent = NULL);

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);

r7429	r8144
335	335	PRINT(0)("\| knows %d Classes\n\|\n", ClassList::classList->size());
336	336	char niceString[100];
337		~~unsigned~~ int lenCount = 0;
	337	int lenCount = 0;
338	338
339	339	list<ClassList>::iterator cl;

-                      r8035
+                      r8144
   inline const Vector& operator= (const Vector& v) { this->x = v.x; this->y = v.y; this->z = v.z; return *this; };
   /** copy constructor* @param v the sVec3D to assign to this vector. @returns the vector v */
   inline const Vector& operator= (const sVec3D& v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; }
   inline const Vector& operator= (const float* v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; }
+  inline const Vector& operator= (const sVec3D& v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; return *this; }
+  inline const Vector& operator= (const float* v) { this->x = v[0]; this->y = v[1]; this->z = v[2]; return *this; }
   /** @param v: the other vector \return the dot product of the vectors */
   float dot (const Vector& v) const { return x*v.x+y*v.y+z*v.z; };

-                      r8123
+                      r8144
    * @param line the Line as in the first argument in printf
    */
   bool ShellBuffer::addBufferLineStatic(const char* line, ...)
+  void ShellBuffer::addBufferLineStatic(const char* line, ...)
+  {
     static OrxThread::Mutex ShellBuffer__bufferMutex;
 …
 #endif
       ShellBuffer::singletonRef->addBufferLine(ShellBuffer::bufferArray);
-    return true;
+  }

r8123	r8144
32	32	inline static bool isInstanciated() { return (ShellBuffer::singletonRef == NULL)?false:true; };
33	33
34		static ~~bool~~ addBufferLineStatic(const char* line, ...);
	34	static void addBufferLineStatic(const char* line, ...);
35	35	void addBufferLine(const char* line);
36	36

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))

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.