gauthiier/CRITICAL-INFRASTRUCTURE
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Text fields added

Browse Source 
- With UI sliders to adjust various visual elements
- Text is hardcoded currently
This commit is contained in:
James Alliban 2014-01-08 17:31:33 +00:00
parent 33298f7bcb
commit e2523e0b72
23 changed files with 307 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
of/Active Tripod/Active_Tripod.vcxproj
View File

@ -58,15 +58,15 @@
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;src\data;src\gui;src\visual;src\visual\graph;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\;..\..\..\addons\ofxLibwebsockets\libs\openssl\openssl;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port\win32helpers;..\..\..\addons\ofxSpacebrew\src;..\..\..\addons\ofxUI\src;..\..\..\addons\ofxXmlSettings\libs;..\..\..\addons\ofxXmlSettings\src</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;src\data;src\gui;src\visual;src\visual\graph;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\;..\..\..\addons\ofxLibwebsockets\libs\openssl\openssl;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port\win32helpers;..\..\..\addons\ofxSpacebrew\src;..\..\..\addons\ofxUI\src;..\..\..\addons\ofxXmlSettings\libs;..\..\..\addons\ofxXmlSettings\src;..\..\..\addons\ofxFTGL\src;..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL;..\..\..\addons\ofxFTGL\libs\FTGL\include;..\..\..\addons\ofxFTGL\libs\FTGL</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<AdditionalDependencies>%(AdditionalDependencies);websockets_static.lib;ZLIB.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\lib\win32\Release</AdditionalLibraryDirectories>
<AdditionalDependencies>%(AdditionalDependencies);websockets_static.lib;ZLIB.lib;ftgl_static.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);..\..\..\addons\ofxFTGL\libs\FTGL\lib\vs2012;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\lib\win32\Release</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -75,7 +75,7 @@
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;src\data;src\gui;src\visual;src\visual\graph;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\;..\..\..\addons\ofxLibwebsockets\libs\openssl\openssl;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port\win32helpers;..\..\..\addons\ofxSpacebrew\src;..\..\..\addons\ofxUI\src;..\..\..\addons\ofxXmlSettings\libs;..\..\..\addons\ofxXmlSettings\src</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;src\data;src\gui;src\visual;src\visual\graph;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp;..\..\..\addons\ofxLibwebsockets\libs\jsoncpp\json;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\;..\..\..\addons\ofxLibwebsockets\libs\openssl\openssl;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\include\ofxLibwebsockets;..\..\..\addons\ofxLibwebsockets\libs\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\src;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\include\win32port\win32helpers;..\..\..\addons\ofxSpacebrew\src;..\..\..\addons\ofxUI\src;..\..\..\addons\ofxXmlSettings\libs;..\..\..\addons\ofxXmlSettings\src;..\..\..\addons\ofxFTGL\src;..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL;..\..\..\addons\ofxFTGL\libs\FTGL\include;..\..\..\addons\ofxFTGL\libs\FTGL</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
@ -85,11 +85,13 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<AdditionalDependencies>%(AdditionalDependencies);websockets_static.lib;ZLIB.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\lib\win32\Release</AdditionalLibraryDirectories>
<AdditionalDependencies>%(AdditionalDependencies);websockets_static.lib;ZLIB.lib;ftgl_static.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);..\..\..\addons\ofxFTGL\libs\FTGL\lib\vs2012;..\..\..\addons\ofxLibwebsockets\libs\libwebsockets\lib\win32\Release</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\addons\ofxFTGL\src\ofxFTGLFont.cpp" />
<ClCompile Include="..\..\..\addons\ofxFTGL\src\ofxFTGLSimpleLayout.cpp" />
<ClCompile Include="..\..\..\addons\ofxXmlSettings\libs\tinyxml.cpp" />
<ClCompile Include="..\..\..\addons\ofxXmlSettings\libs\tinyxmlerror.cpp" />
<ClCompile Include="..\..\..\addons\ofxXmlSettings\libs\tinyxmlparser.cpp" />
@ -112,6 +114,31 @@
<ClCompile Include="src\visual\Scene.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTBBox.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTBitmapGlyph.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTBuffer.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTBufferFont.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTBufferGlyph.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTExtrdGlyph.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTFont.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\ftgl.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTGLBitmapFont.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTGLExtrdFont.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTGLOutlineFont.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTGLPixmapFont.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTGLPolygonFont.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTGLTextureFont.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTGlyph.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTLayout.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTOutlineGlyph.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTPixmapGlyph.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTPoint.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTPolyGlyph.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTSimpleLayout.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTTextureGlyph.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\src\ofxFTGL.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\src\ofxFTGLFont.h" />
<ClInclude Include="..\..\..\addons\ofxFTGL\src\ofxFTGLSimpleLayout.h" />
<ClInclude Include="..\..\..\addons\ofxUI\src\ofxUI.h" />
<ClInclude Include="..\..\..\addons\ofxUI\src\ofxUI2DPad.h" />
<ClInclude Include="..\..\..\addons\ofxUI\src\ofxUIBiLabelSlider.h" />

99
of/Active Tripod/Active_Tripod.vcxproj.filters
View File

@ -67,6 +67,12 @@
<ClCompile Include="src\data\DataManager.cpp">
<Filter>src\data</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxFTGL\src\ofxFTGLSimpleLayout.cpp">
<Filter>addons\ofxFTGL\src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxFTGL\src\ofxFTGLFont.cpp">
<Filter>addons\ofxFTGL\src</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="src">
@ -114,6 +120,24 @@
<Filter Include="src\visual\graph">
<UniqueIdentifier>{93208e3d-c398-4400-8666-06931df26fe1}</UniqueIdentifier>
</Filter>
<Filter Include="addons\ofxFTGL">
<UniqueIdentifier>{dd615fe5-22cf-4bb9-bf59-f34ad36495c0}</UniqueIdentifier>
</Filter>
<Filter Include="addons\ofxFTGL\src">
<UniqueIdentifier>{c9f5eae9-5ed3-4d24-a1c9-476fbad9949e}</UniqueIdentifier>
</Filter>
<Filter Include="addons\ofxFTGL\libs">
<UniqueIdentifier>{a3c99ccb-c276-4148-a49d-dd4bf17a53fc}</UniqueIdentifier>
</Filter>
<Filter Include="addons\ofxFTGL\libs\FTGL">
<UniqueIdentifier>{2d8bfa80-59ad-45f3-9d0b-7fcec05fb366}</UniqueIdentifier>
</Filter>
<Filter Include="addons\ofxFTGL\libs\FTGL\include">
<UniqueIdentifier>{2cc0c40f-3510-4cf0-9591-327e59f16c45}</UniqueIdentifier>
</Filter>
<Filter Include="addons\ofxFTGL\libs\FTGL\include\FTGL">
<UniqueIdentifier>{c8f02691-0523-43c1-b471-e9e043b64209}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\testApp.h">
@ -269,6 +293,81 @@
<ClInclude Include="src\data\DataManager.h">
<Filter>src\data</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\src\ofxFTGLSimpleLayout.h">
<Filter>addons\ofxFTGL\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\src\ofxFTGL.h">
<Filter>addons\ofxFTGL\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\src\ofxFTGLFont.h">
<Filter>addons\ofxFTGL\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTBufferFont.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTBufferGlyph.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTExtrdGlyph.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTFont.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\ftgl.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTGLBitmapFont.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTGLExtrdFont.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTGLOutlineFont.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTGLPixmapFont.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTGLPolygonFont.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTGLTextureFont.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTGlyph.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTLayout.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTOutlineGlyph.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTPixmapGlyph.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTPoint.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTPolyGlyph.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTSimpleLayout.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTTextureGlyph.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTBBox.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTBitmapGlyph.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxFTGL\libs\FTGL\include\FTGL\FTBuffer.h">
<Filter>addons\ofxFTGL\libs\FTGL\include\FTGL</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="icon.rc">

BIN
of/Active Tripod/bin/Active_Tripod.lib
View File

Binary file not shown.

50
of/Active Tripod/bin/data/GUI/HUD TEXTguiPagesettings.xml Normal file
View File

@ -0,0 +1,50 @@
<Widget>
<Kind>4</Kind>
<Name>X Margin</Name>
<Value>90.460525513</Value>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>Y Margin</Name>
<Value>87.171058655</Value>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>Y Margin Bottom Offset</Name>
<Value>92.763160706</Value>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>Line Length</Name>
<Value>380.098693848</Value>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>Line Spacing</Name>
<Value>0.986842155</Value>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>Text Size</Name>
<Value>27.763158798</Value>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>Red</Name>
<Value>255.000000000</Value>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>Green</Name>
<Value>255.000000000</Value>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>Blue</Name>
<Value>255.000000000</Value>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>Alpha</Name>
<Value>222.286193848</Value>
</Widget>

BIN
of/Active Tripod/bin/data/fonts/Helvetica.dfont Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 MiB

BIN
of/Active Tripod/bin/data/fonts/cour.ttf Normal file
View File

Binary file not shown.

BIN
of/Active Tripod/bin/data/fonts/courbd.ttf Normal file
View File

Binary file not shown.

BIN
of/Active Tripod/bin/data/fonts/courbi.ttf Normal file
View File

Binary file not shown.

BIN
of/Active Tripod/bin/data/fonts/couri.ttf Normal file
View File

Binary file not shown.

BIN
of/Active Tripod/bin/data/fonts/georgia.ttf Normal file
View File

Binary file not shown.

BIN
of/Active Tripod/bin/data/fonts/georgiab.ttf Normal file
View File

Binary file not shown.

BIN
of/Active Tripod/bin/data/fonts/georgiai.ttf Normal file
View File

Binary file not shown.

BIN
of/Active Tripod/bin/data/fonts/georgiaz.ttf Normal file
View File

Binary file not shown.

BIN
of/Active Tripod/bin/data/fonts/mplus-1c-regular.ttf Normal file
View File

Binary file not shown.

BIN
of/Active Tripod/bin/data/fonts/verdana.ttf Normal file
View File

Binary file not shown.

BIN
of/Active Tripod/bin/data/fonts/verdanab.ttf Normal file
View File

Binary file not shown.

BIN
of/Active Tripod/bin/data/fonts/verdanai.ttf Normal file
View File

Binary file not shown.

BIN
of/Active Tripod/bin/data/fonts/verdanaz.ttf Normal file
View File

Binary file not shown.

25
of/Active Tripod/src/gui/GUI.cpp
View File

@ -21,6 +21,7 @@ void GUI::setup()
addBarGraphDesignGUI();
addGraphSimulationGUI();
addBackgroundGUI();
addHUDTextGUI();
addVariousGUI();
setGUIColour();
@ -106,7 +107,7 @@ void GUI::addBackgroundGUI()
gui->addSlider("Blue", 0, 2, &app->scene.blue, length, dim);
gui->addSlider("Alpha", 0, 2, &app->scene.alpha, length, dim);
gui->addSpacer(length, 1);
gui->addLabel("HUD SETTINGS");
gui->addLabel("HUD BACKGROUND SETTINGS");
gui->addSlider("Red .", 0, 255, &app->scene.hudColour[0], length, dim);
gui->addSlider("Green .", 0, 255, &app->scene.hudColour[1], length, dim);
gui->addSlider("Blue .", 0, 255, &app->scene.hudColour[2], length, dim);
@ -120,6 +121,28 @@ void GUI::addBackgroundGUI()
}
void GUI::addHUDTextGUI()
{
string title = "HUD TEXT";
ofxUICanvas* gui = getNewGUI(title);
gui->addSlider("X Margin", 0, 500, &app->scene.xMargin, length, dim);
gui->addSlider("Y Margin", 0, 500, &app->scene.yMargin, length, dim);
gui->addSlider("Y Margin Bottom Offset", 0, 300, &app->scene.yMarginBottomOffset, length, dim);
gui->addSlider("Line Length", 50, 500, &app->scene.lineLength, length, dim);
gui->addSlider("Line Spacing", 0, 10, &app->scene.lineSpacing, length, dim);
gui->addSlider("Text Size", 10, 100, &app->scene.textSize, length, dim);
gui->addSpacer(length, 1);
gui->addSlider("Red", 0, 255, &app->scene.textColour[0], length, dim);
gui->addSlider("Green", 0, 255, &app->scene.textColour[1], length, dim);
gui->addSlider("Blue", 0, 255, &app->scene.textColour[2], length, dim);
gui->addSlider("Alpha", 0, 255, &app->scene.textColour[3], length, dim);
ofAddListener(gui->newGUIEvent, this, &GUI::variousGUIEvent);
finaliseCanvas(gui, true);
}
void GUI::addVariousGUI()
{
string title = "VARIOUS";

1
of/Active Tripod/src/gui/GUI.h
View File

@ -24,6 +24,7 @@ public:
void addBarGraphDesignGUI();
void addGraphSimulationGUI();
void addBackgroundGUI();
void addHUDTextGUI();
void addVariousGUI();
void variousGUIEvent(ofxUIEventArgs &e);

3
of/Active Tripod/src/testApp.cpp
View File

@ -32,6 +32,7 @@ void testApp::setup()
ofSetWindowPosition(0, 100);
ofEnableSmoothing();
ofSeedRandom(ofRandom(23243));
ofSetFullscreen(true);
dataManager.setup();
scene.setup();
@ -70,6 +71,8 @@ void testApp::keyPressed(int key)
isPaused = !isPaused;
else if (key == 'f')
ofToggleFullscreen();
scene.keyPressed(key);
}

72
of/Active Tripod/src/visual/Scene.cpp
View File

@ -14,12 +14,26 @@ void Scene::setup()
bgImg.loadImage("images/tanks.jpg");
rgbShader.load("shaders/RGBShader");
barGraph.setup();
text.loadFont("fonts/mplus-1c-regular.ttf", 8);
//text.setLineLength(ofGetWidth() - margin * 2);
xMargin = 500;
yMargin = 400;
lineLength = 200;
}
void Scene::update()
{
barGraph.update();
text.setLineLength(lineLength);
text.setLineSpacing(lineSpacing);
text.setSize(textSize);
}
@ -27,7 +41,8 @@ void Scene::draw()
{
drawVideo();
barGraph.draw();
drawHUD();
drawHUDBG();
drawHUDCopy();
}
void Scene::drawVideo()
@ -47,7 +62,7 @@ void Scene::drawVideo()
rgbShader.end();
}
void Scene::drawHUD()
void Scene::drawHUDBG()
{
ofPushStyle();
ofSetColor(hudColour[0], hudColour[1], hudColour[2], hudColour[3]);
@ -71,4 +86,57 @@ void Scene::drawHUD()
ofPopStyle();
ofFill();
}
void Scene::drawHUDCopy()
{
string tlStr = "TOP LEFT\nThis is some text\nthis is some more text\na little more";
drawTextBox(tlStr, "TOP LEFT");
string trStr = "TOP RIGHT\nThis is some text\nthis is some more text\na little more\none more line";
drawTextBox(trStr, "TOP RIGHT");
string blStr = "BOTTOM LEFT\nThis is some text\nthis is some more text";
drawTextBox(blStr, "BOTTOM LEFT");
string brStr = "BOTTOM RIGHT\nThis is some text\nthis is some more text\na little more";
drawTextBox(brStr, "BOTTOM RIGHT");
}
void Scene::drawTextBox(string copy, string align)
{
ofPushStyle();
ofSetColor(textColour[0], textColour[1], textColour[2], textColour[3]);
ofPushMatrix();
if (align == "TOP LEFT")
{
ofTranslate(xMargin, yMargin);
text.setAlignment(FTGL_ALIGN_LEFT);
}
else if (align == "TOP RIGHT")
{
text.setAlignment(FTGL_ALIGN_RIGHT);
ofTranslate(ofGetWidth() - xMargin - lineLength, yMargin);
}
else if (align == "BOTTOM LEFT")
{
ofTranslate(xMargin, ofGetHeight() - yMargin - yMarginBottomOffset);
text.setAlignment(FTGL_ALIGN_LEFT);
}
if (align == "BOTTOM RIGHT")
{
text.setAlignment(FTGL_ALIGN_RIGHT);
ofTranslate(ofGetWidth() - xMargin - lineLength, ofGetHeight() - yMargin - yMarginBottomOffset);
}
text.drawString(copy, 0, 0);
ofPopMatrix();
ofPopStyle();
}
void Scene::keyPressed(int key)
{
}

30
of/Active Tripod/src/visual/Scene.h
View File

@ -10,6 +10,7 @@
#include "ofMain.h"
#include "BarGraph.h"
#include "ofxFTGL.h"
class testApp;
@ -20,16 +21,39 @@ public:
void update();
void draw();
void drawVideo();
void drawHUD();
void drawHUDBG();
void drawHUDCopy();
void drawTextBox(string copy, string align);
void keyPressed(int key);
BarGraph barGraph;
ofShader rgbShader;
ofImage bgImg;
ofxFTGLSimpleLayout text;
// video image vars
float brightness;
float contrast;
float saturation;
float red;
float green;
float blue;
float alpha;
float brightness, contrast, saturation, red, green, blue, alpha;
// HUD background vars
float hudColour[4];
float circlePointSize;
float radiusW;
float radiusH;
// text vars
float xMargin;
float yMargin;
float yMarginBottomOffset;
float lineLength;
float lineSpacing;
float textSize;
float textColour[4];
};