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/WarScene/WarScene.cpp

Diff revisions: vs.
  @@ -726,39 +726,39 @@
726 726 const vec2<U16>& resolution = _context.gfx().renderingResolution();
727 727
728 728 _GUI->addButton(_ID("Simulate"), "Simulate",
729 - vec2<I32>(resolution.width - 220, 60),
730 - vec2<U32>(100, 25),
729 + pixelPosition(resolution.width - 220, 60),
730 + pixelScale(100, 25),
731 731 DELEGATE_BIND(&WarScene::startSimulation, this, std::placeholders::_1));
732 732
733 733 _GUI->addButton(_ID("ShaderReload"), "Shader Reload",
734 - vec2<I32>(resolution.width - 220, 30),
735 - vec2<U32>(100, 25),
734 + pixelPosition(resolution.width - 220, 30),
735 + pixelScale(100, 25),
736 736 [this](I64 btnID) { rebuildShaders(); });
737 737
738 738 _GUI->addText(_ID("fpsDisplay"), // Unique ID
739 - vec2<I32>(60, 63), // Position
739 + pixelPosition(60, 63), // Position
740 740 Font::DIVIDE_DEFAULT, // Font
741 741 vec4<U8>(0, 50, 255, 255), // Colour
742 742 Util::StringFormat("FPS: %3.0f. FrameTime: %3.1f", 0.0f, 0.0f)); // Text and arguments
743 743 _GUI->addText(_ID("RenderBinCount"),
744 - vec2<I32>(60, 83),
744 + pixelPosition(60, 83),
745 745 Font::DIVIDE_DEFAULT,
746 746 vec4<U8>(164, 50, 50, 255),
747 747 Util::StringFormat("Number of items in Render Bin: %d", 0));
748 - _GUI->addText(_ID("camPosition"), vec2<I32>(60, 103),
748 + _GUI->addText(_ID("camPosition"), pixelPosition(60, 103),
749 749 Font::DIVIDE_DEFAULT,
750 750 vec4<U8>(50, 192, 50, 255),
751 751 Util::StringFormat("Position [ X: %5.0f | Y: %5.0f | Z: %5.0f ] [Pitch: %5.2f | Yaw: %5.2f]",
752 752 0.0f, 0.0f, 0.0f, 0.0f, 0.0f));
753 753
754 754 _GUI->addText(_ID("scoreDisplay"),
755 - vec2<I32>(60, 123), // Position
755 + pixelPosition(60, 123), // Position
756 756 Font::DIVIDE_DEFAULT, // Font
757 757 vec4<U8>(50, 192, 50, 255),// Colour
758 758 Util::StringFormat("Score: A - %d B - %d", 0, 0)); // Text and arguments
759 759
760 760 _GUI->addText(_ID("entityState"),
761 - vec2<I32>(60, 163),
761 + pixelPosition(60, 163),
762 762 Font::DIVIDE_DEFAULT,
763 763 vec4<U8>(0, 0, 0, 255),
764 764 "");