Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 721 vs 745 for /trunk/Source Code/GUI/GUIInterface.cpp

Diff revisions: vs.
  @@ -89,13 +89,13 @@
89 89 }
90 90
91 91
92 - GUIButton* GUIInterface::addButton(ULL ID,
92 + GUIButton* GUIInterface::addButton(ULL guiID,
93 93 const stringImpl& text,
94 94 const vec2<I32>& position,
95 95 const vec2<U32>& dimensions,
96 96 ButtonCallback callback,
97 97 const stringImpl& rootSheetID) {
98 - assert(getGUIElement(ID) == nullptr);
98 + assert(getGUIElement(guiID) == nullptr);
99 99
100 100 const vec2<U16>& resolution = getDisplayResolution();
101 101
  @@ -114,34 +114,34 @@
114 114 parent = GUI::instance().rootSheet();
115 115 }
116 116
117 - GUIButton* btn = MemoryManager_NEW GUIButton(ID, text, GUI::instance().guiScheme(), relOffset, relDim, parent, callback);
117 + GUIButton* btn = MemoryManager_NEW GUIButton(guiID, text, GUI::instance().guiScheme(), relOffset, relDim, parent, callback);
118 118
119 - addElement(ID, btn);
119 + addElement(guiID, btn);
120 120
121 121 return btn;
122 122 }
123 123
124 - GUIMessageBox* GUIInterface::addMsgBox(ULL ID,
124 + GUIMessageBox* GUIInterface::addMsgBox(ULL guiID,
125 125 const stringImpl& title,
126 126 const stringImpl& message,
127 127 const vec2<I32>& offsetFromCentre) {
128 - assert(getGUIElement(ID) == nullptr);
128 + assert(getGUIElement(guiID) == nullptr);
129 129
130 - GUIMessageBox* box = MemoryManager_NEW GUIMessageBox(ID, title, message, offsetFromCentre, GUI::instance().rootSheet());
131 - addElement(ID, box);
130 + GUIMessageBox* box = MemoryManager_NEW GUIMessageBox(guiID, title, message, offsetFromCentre, GUI::instance().rootSheet());
131 + addElement(guiID, box);
132 132
133 133 return box;
134 134 }
135 135
136 - GUIText* GUIInterface::addText(ULL ID,
136 + GUIText* GUIInterface::addText(ULL guiID,
137 137 const vec2<I32>& position,
138 138 const stringImpl& font,
139 139 const vec4<U8>& colour,
140 140 const stringImpl& text,
141 141 U32 fontSize) {
142 - assert(getGUIElement(ID) == nullptr);
142 + assert(getGUIElement(guiID) == nullptr);
143 143
144 - GUIText* t = MemoryManager_NEW GUIText(ID,
144 + GUIText* t = MemoryManager_NEW GUIText(guiID,
145 145 text,
146 146 vec2<F32>(position.width,
147 147 position.height),
  @@ -150,25 +150,25 @@
150 150 GUI::instance().rootSheet(),
151 151 fontSize);
152 152 t->initialHeightCache(to_float(getDisplayResolution().height));
153 - addElement(ID, t);
153 + addElement(guiID, t);
154 154
155 155 return t;
156 156 }
157 157
158 - GUIFlash* GUIInterface::addFlash(ULL ID,
158 + GUIFlash* GUIInterface::addFlash(ULL guiID,
159 159 stringImpl movie,
160 160 const vec2<U32>& position,
161 161 const vec2<U32>& extent) {
162 - assert(getGUIElement(ID) == nullptr);
162 + assert(getGUIElement(guiID) == nullptr);
163 163
164 - GUIFlash* flash = MemoryManager_NEW GUIFlash(ID, GUI::instance().rootSheet());
165 - addElement(ID, flash);
164 + GUIFlash* flash = MemoryManager_NEW GUIFlash(guiID, GUI::instance().rootSheet());
165 + addElement(guiID, flash);
166 166
167 167 return flash;
168 168 }
169 169
170 - GUIText* GUIInterface::modifyText(ULL ID, const stringImpl& text) {
171 - GUIMap::iterator it = _guiElements.find(ID);
170 + GUIText* GUIInterface::modifyText(ULL guiID, const stringImpl& text) {
171 + GUIMap::iterator it = _guiElements.find(guiID);
172 172
173 173 if (it == std::cend(_guiElements)) {
174 174 return nullptr;