Skip to content

O
ofxImGui
Commit a9a31eff authored by w4t's avatar w4t
Browse files
Options

ofximguiparameter updated

parent 773570e5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 777 additions and 72 deletions
example-demo-parameter/example-demo-vs15.sln 0 → 100644
View file @ a9a31eff
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27703.2035
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example-demo-vs15", "example-demo-vs15.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.ActiveCfg = Debug|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.Build.0 = Debug|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.ActiveCfg = Debug|x64
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.Build.0 = Debug|x64
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.ActiveCfg = Release|x64
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.Build.0 = Release|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.ActiveCfg = Debug|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.Build.0 = Debug|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.ActiveCfg = Release|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {96BED2B0-8461-46E3-B93E-10C906D17E94}
EndGlobalSection
EndGlobal
example-demo-parameter/example-demo-vs15.vcxproj 0 → 100644
View file @ a9a31eff
This diff is collapsed.
example-demo-parameter/example-demo-vs15.vcxproj.filters 0 → 100644
View file @ a9a31eff
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="src\ofApp.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\main.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxImGui\src\BaseEngine.cpp">
<Filter>addons\ofxImGui\src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxImGui\src\BaseTheme.cpp">
<Filter>addons\ofxImGui\src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxImGui\src\EngineGLFW.cpp">
<Filter>addons\ofxImGui\src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxImGui\src\EngineOpenGLES.cpp">
<Filter>addons\ofxImGui\src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxImGui\src\EngineVk.cpp">
<Filter>addons\ofxImGui\src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxImGui\src\Gui.cpp">
<Filter>addons\ofxImGui\src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxImGui\src\Helpers.cpp">
<Filter>addons\ofxImGui\src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxImGui\src\ofxImGuiLoggerChannel.cpp">
<Filter>addons\ofxImGui\src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxImGui\libs\imgui\src\imgui.cpp">
<Filter>addons\ofxImGui\libs\imgui\src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxImGui\libs\imgui\src\imgui_demo.cpp">
<Filter>addons\ofxImGui\libs\imgui\src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxImGui\libs\imgui\src\imgui_draw.cpp">
<Filter>addons\ofxImGui\libs\imgui\src</Filter>
</ClCompile>
<ClCompile Include="..\src\ofxImGuiParameter.cpp">
<Filter>addons\ofxImGui\src</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="src">
<UniqueIdentifier>{d8376475-7454-4a24-b08a-aac121d3ad6f}</UniqueIdentifier>
</Filter>
<Filter Include="addons">
<UniqueIdentifier>{28ffe0cb-68db-40d6-8329-04737a7affbf}</UniqueIdentifier>
</Filter>
<Filter Include="addons\ofxImGui">
<UniqueIdentifier>{dcc9c4af-bef7-4265-b417-a45ca72fa260}</UniqueIdentifier>
</Filter>
<Filter Include="addons\ofxImGui\src">
<UniqueIdentifier>{675a7735-f61c-4303-9202-fdb961ac7e7d}</UniqueIdentifier>
</Filter>
<Filter Include="addons\ofxImGui\libs">
<UniqueIdentifier>{78d3b44c-5e14-444c-8348-1ae731156e82}</UniqueIdentifier>
</Filter>
<Filter Include="addons\ofxImGui\libs\imgui">
<UniqueIdentifier>{2cbf7f2d-745b-44c0-8011-e1f839e79872}</UniqueIdentifier>
</Filter>
<Filter Include="addons\ofxImGui\libs\imgui\src">
<UniqueIdentifier>{8f90a1fe-50e5-469a-8d64-01e8f2dc99e6}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\ofApp.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxImGui\src\BaseEngine.h">
<Filter>addons\ofxImGui\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxImGui\src\BaseTheme.h">
<Filter>addons\ofxImGui\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxImGui\src\EngineGLFW.h">
<Filter>addons\ofxImGui\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxImGui\src\EngineOpenGLES.h">
<Filter>addons\ofxImGui\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxImGui\src\EngineVk.h">
<Filter>addons\ofxImGui\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxImGui\src\Gui.h">
<Filter>addons\ofxImGui\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxImGui\src\Helpers.h">
<Filter>addons\ofxImGui\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxImGui\src\imconfig.h">
<Filter>addons\ofxImGui\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxImGui\src\ofxImGui.h">
<Filter>addons\ofxImGui\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxImGui\src\ofxImGuiLoggerChannel.h">
<Filter>addons\ofxImGui\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxImGui\src\ThemeTest.h">
<Filter>addons\ofxImGui\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxImGui\libs\imgui\src\imgui.h">
<Filter>addons\ofxImGui\libs\imgui\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxImGui\libs\imgui\src\imgui_internal.h">
<Filter>addons\ofxImGui\libs\imgui\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxImGui\libs\imgui\src\stb_rect_pack.h">
<Filter>addons\ofxImGui\libs\imgui\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxImGui\libs\imgui\src\stb_textedit.h">
<Filter>addons\ofxImGui\libs\imgui\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxImGui\libs\imgui\src\stb_truetype.h">
<Filter>addons\ofxImGui\libs\imgui\src</Filter>
</ClInclude>
<ClInclude Include="..\src\ofxImGuiParameter.h">
<Filter>addons\ofxImGui\src</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="icon.rc" />
</ItemGroup>
</Project>
\ No newline at end of file
example-demo-parameter/example-demo-vs15.vcxproj.user 0 → 100644
View file @ a9a31eff
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LocalDebuggerWorkingDirectory>$(ProjectDir)/bin</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LocalDebuggerWorkingDirectory>$(ProjectDir)/bin</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LocalDebuggerWorkingDirectory>$(ProjectDir)/bin</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LocalDebuggerWorkingDirectory>$(ProjectDir)/bin</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
</Project>
\ No newline at end of file
example-demo-parameter/example-demo.vcxproj
View file @ a9a31eff
...@@ -186,10 +186,6 @@ ...@@ -186,10 +186,6 @@
<ClCompile Include="..\..\..\addons\ofxImGui\src\Gui.cpp" /> <ClCompile Include="..\..\..\addons\ofxImGui\src\Gui.cpp" />
<ClCompile Include="..\..\..\addons\ofxImGui\src\Helpers.cpp" /> <ClCompile Include="..\..\..\addons\ofxImGui\src\Helpers.cpp" />
<ClCompile Include="..\..\..\addons\ofxImGui\src\ofxImGuiLoggerChannel.cpp" /> <ClCompile Include="..\..\..\addons\ofxImGui\src\ofxImGuiLoggerChannel.cpp" />
<ClCompile Include="..\..\..\addons\ofxXmlSettings\libs\tinyxml.cpp" />
<ClCompile Include="..\..\..\addons\ofxXmlSettings\libs\tinyxmlerror.cpp" />
<ClCompile Include="..\..\..\addons\ofxXmlSettings\libs\tinyxmlparser.cpp" />
<ClCompile Include="..\..\..\addons\ofxXmlSettings\src\ofxXmlSettings.cpp" />
<ClCompile Include="..\src\ofxImGuiParameter.cpp" /> <ClCompile Include="..\src\ofxImGuiParameter.cpp" />
<ClCompile Include="src\main.cpp" /> <ClCompile Include="src\main.cpp" />
<ClCompile Include="src\ofApp.cpp" /> <ClCompile Include="src\ofApp.cpp" />
...@@ -211,8 +207,6 @@ ...@@ -211,8 +207,6 @@
<ClInclude Include="..\..\..\addons\ofxImGui\src\ofxImGui.h" /> <ClInclude Include="..\..\..\addons\ofxImGui\src\ofxImGui.h" />
<ClInclude Include="..\..\..\addons\ofxImGui\src\ofxImGuiLoggerChannel.h" /> <ClInclude Include="..\..\..\addons\ofxImGui\src\ofxImGuiLoggerChannel.h" />
<ClInclude Include="..\..\..\addons\ofxImGui\src\ThemeTest.h" /> <ClInclude Include="..\..\..\addons\ofxImGui\src\ThemeTest.h" />
<ClInclude Include="..\..\..\addons\ofxXmlSettings\libs\tinyxml.h" />
<ClInclude Include="..\..\..\addons\ofxXmlSettings\src\ofxXmlSettings.h" />
<ClInclude Include="..\src\ofxImGuiParameter.h" /> <ClInclude Include="..\src\ofxImGuiParameter.h" />
<ClInclude Include="src\ofApp.h" /> <ClInclude Include="src\ofApp.h" />
</ItemGroup> </ItemGroup>
......
example-demo-parameter/example-demo.vcxproj.filters
View file @ a9a31eff
...@@ -40,18 +40,6 @@ ...@@ -40,18 +40,6 @@
<ClCompile Include="..\..\..\addons\ofxImGui\libs\imgui\src\imgui_draw.cpp"> <ClCompile Include="..\..\..\addons\ofxImGui\libs\imgui\src\imgui_draw.cpp">
<Filter>addons\ofxImGui\libs\imgui\src</Filter> <Filter>addons\ofxImGui\libs\imgui\src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\addons\ofxXmlSettings\src\ofxXmlSettings.cpp">
<Filter>addons\ofxXmlSettings\src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxXmlSettings\libs\tinyxml.cpp">
<Filter>addons\ofxXmlSettings\libs</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxXmlSettings\libs\tinyxmlerror.cpp">
<Filter>addons\ofxXmlSettings\libs</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxXmlSettings\libs\tinyxmlparser.cpp">
<Filter>addons\ofxXmlSettings\libs</Filter>
</ClCompile>
<ClCompile Include="..\src\ofxImGuiParameter.cpp"> <ClCompile Include="..\src\ofxImGuiParameter.cpp">
<Filter>addons\ofxImGui\src</Filter> <Filter>addons\ofxImGui\src</Filter>
</ClCompile> </ClCompile>
...@@ -78,15 +66,6 @@ ...@@ -78,15 +66,6 @@
<Filter Include="addons\ofxImGui\libs\imgui\src"> <Filter Include="addons\ofxImGui\libs\imgui\src">
<UniqueIdentifier>{8f90a1fe-50e5-469a-8d64-01e8f2dc99e6}</UniqueIdentifier> <UniqueIdentifier>{8f90a1fe-50e5-469a-8d64-01e8f2dc99e6}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="addons\ofxXmlSettings">
<UniqueIdentifier>{e3c17501-f1d7-41db-841a-0d473deb6dc0}</UniqueIdentifier>
</Filter>
<Filter Include="addons\ofxXmlSettings\src">
<UniqueIdentifier>{709ac37c-8237-4a77-a87c-0bcd4df04f88}</UniqueIdentifier>
</Filter>
<Filter Include="addons\ofxXmlSettings\libs">
<UniqueIdentifier>{4f8472aa-8de3-4dc4-812e-eac04a9bd339}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="src\ofApp.h"> <ClInclude Include="src\ofApp.h">
...@@ -140,12 +119,6 @@ ...@@ -140,12 +119,6 @@
<ClInclude Include="..\..\..\addons\ofxImGui\libs\imgui\src\stb_truetype.h"> <ClInclude Include="..\..\..\addons\ofxImGui\libs\imgui\src\stb_truetype.h">
<Filter>addons\ofxImGui\libs\imgui\src</Filter> <Filter>addons\ofxImGui\libs\imgui\src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\addons\ofxXmlSettings\src\ofxXmlSettings.h">
<Filter>addons\ofxXmlSettings\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxXmlSettings\libs\tinyxml.h">
<Filter>addons\ofxXmlSettings\libs</Filter>
</ClInclude>
<ClInclude Include="..\src\ofxImGuiParameter.h"> <ClInclude Include="..\src\ofxImGuiParameter.h">
<Filter>addons\ofxImGui\src</Filter> <Filter>addons\ofxImGui\src</Filter>
</ClInclude> </ClInclude>
......
example-demo-parameter/src/ofApp.cpp
View file @ a9a31eff
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
//-------------------------------------------------------------- //--------------------------------------------------------------
void ofApp::setup() void ofApp::setup()
{ {
ofSetLogLevel(OF_LOG_VERBOSE); //ofSetLogLevel(OF_LOG_VERBOSE);
m_background_color.setName("Background Color"); m_background_color.setName("Background Color");
m_background_color.set(ofColor(114, 144, 154)); m_background_color.set(ofColor(114, 144, 154));
......
src/ofxImGuiParameter.cpp
View file @ a9a31eff
This diff is collapsed.
src/ofxImGuiParameter.h
View file @ a9a31eff
/*
The78ester
*/
#ifndef INCLUDE_OF_ADDONS_OFXIMGUIPARAMETER_H #ifndef INCLUDE_OF_ADDONS_OFXIMGUIPARAMETER_H_
#define INCLUDE_OF_ADDONS_OFXIMGUIPARAMETER_H #define INCLUDE_OF_ADDONS_OFXIMGUIPARAMETER_H_
#include <ofMain.h> #include <ofMain.h>
#include "ofXml.h"
typedef void(*gf_draw_func)(ofAbstractParameter*); typedef void(*gf_draw_func)(ofAbstractParameter*);
...@@ -26,6 +28,7 @@ public: ...@@ -26,6 +28,7 @@ public:
enum Style enum Style
{ {
StyleNone,
StyleInputField, StyleInputField,
StyleSlider, StyleSlider,
StyleDrag, StyleDrag,
...@@ -90,7 +93,7 @@ public: ...@@ -90,7 +93,7 @@ public:
bool is_setup(); bool is_setup();
void exit(); void exit();
BindedID bind(ofAbstractParameter const& param); BindedID bind(ofAbstractParameter const& param, Style style = StyleNone);
void unbind(BindedID bid); void unbind(BindedID bid);
void draw(); void draw();
bool save(std::string const& filepath = ""); bool save(std::string const& filepath = "");
...@@ -108,6 +111,9 @@ public: ...@@ -108,6 +111,9 @@ public:
ofEvent< void >& get_on_pre_draw_parameter_event(); ofEvent< void >& get_on_pre_draw_parameter_event();
ofEvent< void >& get_on_post_draw_parameter_event(); ofEvent< void >& get_on_post_draw_parameter_event();
ofEvent< std::string const >& get_on_save_event();
ofEvent< std::string const >& get_on_load_event();
private: private:
static std::vector< ofxImGuiParameter* > s_box; static std::vector< ofxImGuiParameter* > s_box;
...@@ -116,8 +122,10 @@ private: ...@@ -116,8 +122,10 @@ private:
static void sf_draw(ParamInfo* p_param_info); static void sf_draw(ParamInfo* p_param_info);
ofEvent< void > m_pre_draw_event; ofEvent< void > m_pre_draw_event;
ofEvent< void > m_post_draw_event; ofEvent< void > m_post_draw_event;
ofEvent< std::string const > m_on_save_event;
ofEvent< std::string const > m_on_load_event;
ofMutex m_mutex; ofMutex m_mutex;
gf_draw_func m_default_draw_i_func; gf_draw_func m_default_draw_i_func;
...@@ -141,7 +149,7 @@ private: ...@@ -141,7 +149,7 @@ private:
void mf_exit(); void mf_exit();
void mf_draw_dialog(); void mf_draw_dialog();
BindedID mf_bind(ofAbstractParameter const& param, std::vector< ParamInfo* >& contanier); BindedID mf_bind(ofAbstractParameter const& param, std::vector< ParamInfo* >& contanier, Style style);
void mf_unbind(std::vector< ParamInfo* >& contanier); void mf_unbind(std::vector< ParamInfo* >& contanier);
void mf_unbind(BindedID bid, std::vector< ParamInfo* >& contanier); void mf_unbind(BindedID bid, std::vector< ParamInfo* >& contanier);
...@@ -203,6 +211,16 @@ inline ofEvent< void >& ofxImGuiParameter::get_on_post_draw_parameter_event() ...@@ -203,6 +211,16 @@ inline ofEvent< void >& ofxImGuiParameter::get_on_post_draw_parameter_event()
return m_post_draw_event; return m_post_draw_event;
} }
inline ofEvent< std::string const >& ofxImGuiParameter::get_on_save_event()
{
return m_on_save_event;
}
inline ofEvent< std::string const >& ofxImGuiParameter::get_on_load_event()
{
return m_on_load_event;
}
typedef ofxImGuiParameter::ValueType< int > ofxImGuiInt; typedef ofxImGuiParameter::ValueType< int > ofxImGuiInt;
typedef ofxImGuiParameter::ValueType< float > ofxImGuiFloat; typedef ofxImGuiParameter::ValueType< float > ofxImGuiFloat;
typedef ofxImGuiParameter::EnumType ofxImGuiEnum; typedef ofxImGuiParameter::EnumType ofxImGuiEnum;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment