omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add to visual studio

Browse Source
This commit is contained in:
omigamedev
2017-11-24 00:01:05 +00:00
parent a90aa4a60e
commit 8a21f3f78a
5 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine.vcxproj
View File

@@ -193,12 +193,14 @@
<ClCompile Include="engine\node_button_custom.cpp" />
<ClCompile Include="engine\node_canvas.cpp" />
<ClCompile Include="engine\node_checkbox.cpp" />
<ClCompile Include="engine\node_colorwheel.cpp" />
<ClCompile Include="engine\node_color_quad.cpp" />
<ClCompile Include="engine\node_combobox.cpp" />
<ClCompile Include="engine\node_dialog_browse.cpp" />
<ClCompile Include="engine\node_dialog_cloud.cpp" />
<ClCompile Include="engine\node_dialog_layer_rename.cpp" />
<ClCompile Include="engine\node_dialog_open.cpp" />
<ClCompile Include="engine\node_dialog_picker.cpp" />
<ClCompile Include="engine\node_icon.cpp" />
<ClCompile Include="engine\node_image.cpp" />
<ClCompile Include="engine\node_image_texture.cpp" />
@@ -305,12 +307,14 @@
<ClInclude Include="engine\node_button_custom.h" />
<ClInclude Include="engine\node_canvas.h" />
<ClInclude Include="engine\node_checkbox.h" />
<ClInclude Include="engine\node_colorwheel.h" />
<ClInclude Include="engine\node_color_quad.h" />
<ClInclude Include="engine\node_combobox.h" />
<ClInclude Include="engine\node_dialog_browse.h" />
<ClInclude Include="engine\node_dialog_cloud.h" />
<ClInclude Include="engine\node_dialog_layer_rename.h" />
<ClInclude Include="engine\node_dialog_open.h" />
<ClInclude Include="engine\node_dialog_picker.h" />
<ClInclude Include="engine\node_icon.h" />
<ClInclude Include="engine\node_image.h" />
<ClInclude Include="engine\node_image_texture.h" />

18
engine.vcxproj.filters
View File

@@ -237,6 +237,12 @@
<ClCompile Include="engine\node_combobox.cpp">
<Filter>Source Files\ui</Filter>
</ClCompile>
<ClCompile Include="engine\node_dialog_picker.cpp">
<Filter>Source Files\ui</Filter>
</ClCompile>
<ClCompile Include="engine\node_colorwheel.cpp">
<Filter>Source Files\ui</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="engine\app.h">
@@ -365,9 +371,6 @@
<ClInclude Include="engine\layout.h">
<Filter>Header Files\ui</Filter>
</ClInclude>
<ClInclude Include="engine\node_scroll.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libs\jpeg\jpgd.h">
<Filter>Source Files\libs\jpeg</Filter>
</ClInclude>
@@ -419,6 +422,15 @@
<ClInclude Include="engine\node_combobox.h">
<Filter>Header Files\ui</Filter>
</ClInclude>
<ClInclude Include="engine\node_colorwheel.h">
<Filter>Header Files\ui</Filter>
</ClInclude>
<ClInclude Include="engine\node_dialog_picker.h">
<Filter>Header Files\ui</Filter>
</ClInclude>
<ClInclude Include="engine\node_scroll.h">
<Filter>Header Files\ui</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="PanoPainter.rc">

2
engine/node_colorwheel.cpp
View File

@@ -71,7 +71,7 @@ void NodeColorWheel::draw()
glBindVertexArray(0);
ShaderManager::use(kShader::Color);
ShaderManager::u_mat4(kShaderUniform::MVP, m_mvp * glm::eulerAngleZ(glm::radians(45.f)) * glm::translate(glm::vec3(.45,0,0)));
ShaderManager::u_mat4(kShaderUniform::MVP, m_mvp * glm::eulerAngleZ(glm::radians(360.f * m_hsv.x)) * glm::translate(glm::vec3(.45,0,0)));
ShaderManager::u_vec4(kShaderUniform::Col, {1, 1, 1, 1});
m_cur_hue.draw_stroke();
}

1
engine/node_colorwheel.h
View File

@@ -9,6 +9,7 @@ class NodeColorWheel : public Node
public:
ui::Circle m_circle;
ui::Circle m_cur_hue;
glm::vec3 m_hsv;
GLuint m_tri_vbo;
GLuint m_tri_vao;
GLuint buffers;

1
engine/node_dialog_picker.cpp
View File

@@ -33,6 +33,7 @@ void NodeColorPicker::draw()
m_slider_r->set_value(rgb.x);
m_slider_g->set_value(rgb.y);
m_slider_b->set_value(rgb.z);
m_wheel->m_hsv = hsv;
}
void NodeColorPicker::init_controls()