Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 330 vs 331 for /trunk/Source Code/GUI/Headers/GUI.h

Diff revisions: vs.
  @@ -68,12 +68,27 @@
68 68 /// Main update call
69 69 void update(const U64 deltaTime);
70 70 /// Add a text label
71 - GUIText* addText(const stringImpl& id,const vec2<I32>& position, const stringImpl& font,const vec3<F32>& color, char* format, ...);
71 + GUIText* addText(const stringImpl& id,
72 + const vec2<I32>& position,
73 + const stringImpl& font,
74 + const vec3<F32>& color,
75 + char* format, ...);
72 76 /// Modify a text label
73 77 GUIText* modifyText(const stringImpl& id, char* format, ...);
74 - GUIMessageBox* addMsgBox(const stringImpl& id, const stringImpl& title, const stringImpl& message, const vec2<I32>& offsetFromCentre = vec2<I32>(0));
75 - /// Add a button with a specific callback. The root of the window positioning system is bottom left, so 100,60 will place the button 100 pixels to the right and 60 up from the bottom
76 - GUIButton* addButton(const stringImpl& id,const stringImpl& text,const vec2<I32>& position,const vec2<U32>& dimensions,const vec3<F32>& color,ButtonCallback callback,const stringImpl& rootSheetId = "");
78 + GUIMessageBox* addMsgBox(const stringImpl& id,
79 + const stringImpl& title,
80 + const stringImpl& message,
81 + const vec2<I32>& offsetFromCentre = vec2<I32>(0));
82 + /// Add a button with a specific callback.
83 + /// The root of the window positioning system is bottom left, so 100,60 will place the button 100 pixels to the right and 60 up
84 + /// from the bottom
85 + GUIButton* addButton(const stringImpl& id,
86 + const stringImpl& text,
87 + const vec2<I32>& position,
88 + const vec2<U32>& dimensions,
89 + const vec3<F32>& color,
90 + ButtonCallback callback,
91 + const stringImpl& rootSheetId = "");
77 92 /// Add a flash element -DEPRECATED-
78 93 GUIFlash* addFlash(const stringImpl& id, stringImpl movie, const vec2<U32>& position, const vec2<U32>& extent);
79 94 /// Called on window resize to adjust the dimensions of all the GUI elements