Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 838 vs 839 for /trunk/Source Code/GUI/GUI.cpp

Diff revisions: vs.
  @@ -268,8 +268,12 @@
268 268 immediateModeShader.setThreadedLoading(false);
269 269 _guiShader = CreateResource<ShaderProgram>(cache, immediateModeShader);
270 270 _guiShader->Uniform("dvd_WorldMatrix", mat4<F32>());
271 - context.gfx().add2DRenderFunction(GUID_DELEGATE_CBK(DELEGATE_BIND(&GUI::draw, this, std::ref(context.gfx()))),
271 +
272 + context.gfx().add2DRenderFunction(GUID_DELEGATE_CBK([this, &context]() {
273 + draw(context.gfx());
274 + }),
272 275 std::numeric_limits<U32>::max() - 1);
276 +
273 277 const OIS::MouseState& mouseState = context.input().getKeyboardMousePair(0).second->getMouseState();
274 278
275 279 setCursorPosition(mouseState.X.abs, mouseState.Y.abs);
  @@ -280,9 +284,8 @@
280 284
281 285 g_assertMsgBox = _defaultMsgBox;
282 286
283 - GUIButton::soundCallback(DELEGATE_BIND(&SFXDevice::playSound,
284 - &context.sfx(),
285 - std::placeholders::_1));
287 + GUIButton::soundCallback([&context](const AudioDescriptor_ptr& sound) { context.sfx().playSound(sound); });
288 +
286 289 _init = true;
287 290 return true;
288 291 }