Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 978 vs 979 for /trunk/Source Code/Scenes/TenisScene/TenisScene.cpp

Diff revisions: vs.
  @@ -393,39 +393,39 @@
393 393
394 394 GUIElement* btn = _GUI->addButton(
395 395 _ID("Serve"), "Serve",
396 - vec2<I32>(resolution.width - 220, 60),
397 - vec2<U32>(100, 25),
396 + pixelPosition(resolution.width - 220, 60),
397 + pixelScale(100, 25),
398 398 DELEGATE_BIND(&TenisScene::startGame, this, std::placeholders::_1));
399 399 btn->setTooltip("Start a new game!");
400 400
401 401 _GUI->addText(
402 - _ID("Team1Score"), vec2<I32>(to_I32(resolution.width - 250),
402 + _ID("Team1Score"), pixelPosition(to_I32(resolution.width - 250),
403 403 to_I32(resolution.height / 1.3f)),
404 404 Font::DIVIDE_DEFAULT,
405 405 vec4<U8>(0, 192, 192, 255),
406 406 Util::StringFormat("Team 1 Score: %d", 0));
407 407
408 408 _GUI->addText(
409 - _ID("Team2Score"), vec2<I32>(to_I32(resolution.width - 250),
409 + _ID("Team2Score"), pixelPosition(to_I32(resolution.width - 250),
410 410 to_I32(resolution.height / 1.5f)),
411 411 Font::DIVIDE_DEFAULT,
412 412 vec4<U8>(50, 192, 0, 255),
413 413 Util::StringFormat("Team 2 Score: %d", 0));
414 414
415 415 _GUI->addText(_ID("Message"),
416 - vec2<I32>(to_I32(resolution.width - 250),
416 + pixelPosition(to_I32(resolution.width - 250),
417 417 to_I32(resolution.height / 1.7f)),
418 418 Font::DIVIDE_DEFAULT,
419 419 vec4<U8>(0, 255, 0, 255),
420 420 "");
421 421
422 422 _GUI->addText(_ID("fpsDisplay"), // Unique ID
423 - vec2<I32>(60, 60), // Position
423 + pixelPosition(60, 60), // Position
424 424 Font::DIVIDE_DEFAULT, // Font
425 425 vec4<U8>(0, 50, 255, 255),// Colour
426 426 Util::StringFormat("FPS: %d", 0)); // Text and arguments
427 427
428 - _GUI->addText(_ID("RenderBinCount"), vec2<I32>(60, 70), Font::DIVIDE_DEFAULT,
428 + _GUI->addText(_ID("RenderBinCount"), pixelPosition(60, 70), Font::DIVIDE_DEFAULT,
429 429 vec4<U8>(164, 50, 50, 255),
430 430 Util::StringFormat("Number of items in Render Bin: %d", 0));
431 431