rename engine to src

.gitignore

@@ -20,4 +20,4 @@ PanoPainter.aps
 panopainter-log.txt
 *.pano
 frames/
-engine/version.gen.h
+src/version.gen.h

PanoPainter.vcxproj

@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{6D5028CE-4D76-4B6A-A7C2-DE5A3268D433}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>engine</RootNamespace>
+    <RootNamespace>PanoPainter</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
     <ProjectName>PanoPainter</ProjectName>
   </PropertyGroup>
@@ -167,73 +167,73 @@
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="engine\action.cpp" />
-    <ClCompile Include="engine\app.cpp" />
-    <ClCompile Include="engine\app_cloud.cpp" />
-    <ClCompile Include="engine\app_commands.cpp" />
-    <ClCompile Include="engine\app_dialogs.cpp" />
-    <ClCompile Include="engine\app_events.cpp" />
-    <ClCompile Include="engine\app_layout.cpp" />
-    <ClCompile Include="engine\app_shaders.cpp" />
-    <ClCompile Include="engine\asset.cpp" />
-    <ClCompile Include="engine\bezier.cpp" />
-    <ClCompile Include="engine\brush.cpp" />
-    <ClCompile Include="engine\canvas.cpp" />
-    <ClCompile Include="engine\canvas_modes.cpp" />
-    <ClCompile Include="engine\event.cpp" />
-    <ClCompile Include="engine\font.cpp" />
-    <ClCompile Include="engine\image.cpp" />
-    <ClCompile Include="engine\layout.cpp" />
-    <ClCompile Include="engine\log.cpp" />
-    <ClCompile Include="engine\main.cpp" />
-    <ClCompile Include="engine\node.cpp" />
-    <ClCompile Include="engine\node_border.cpp" />
-    <ClCompile Include="engine\node_button.cpp" />
-    <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" />
-    <ClCompile Include="engine\node_message_box.cpp" />
-    <ClCompile Include="engine\node_panel_brush.cpp" />
-    <ClCompile Include="engine\node_panel_color.cpp" />
-    <ClCompile Include="engine\node_panel_grid.cpp" />
-    <ClCompile Include="engine\node_panel_layer.cpp" />
-    <ClCompile Include="engine\node_panel_stroke.cpp" />
-    <ClCompile Include="engine\node_popup_menu.cpp" />
-    <ClCompile Include="engine\node_progress_bar.cpp" />
-    <ClCompile Include="engine\node_scroll.cpp" />
-    <ClCompile Include="engine\node_settings.cpp" />
-    <ClCompile Include="engine\node_slider.cpp" />
-    <ClCompile Include="engine\node_stroke_preview.cpp" />
-    <ClCompile Include="engine\node_text.cpp" />
-    <ClCompile Include="engine\node_text_input.cpp" />
-    <ClCompile Include="engine\node_viewport.cpp" />
-    <ClCompile Include="engine\pch.cpp">
+    <ClCompile Include="src\action.cpp" />
+    <ClCompile Include="src\app.cpp" />
+    <ClCompile Include="src\app_cloud.cpp" />
+    <ClCompile Include="src\app_commands.cpp" />
+    <ClCompile Include="src\app_dialogs.cpp" />
+    <ClCompile Include="src\app_events.cpp" />
+    <ClCompile Include="src\app_layout.cpp" />
+    <ClCompile Include="src\app_shaders.cpp" />
+    <ClCompile Include="src\asset.cpp" />
+    <ClCompile Include="src\bezier.cpp" />
+    <ClCompile Include="src\brush.cpp" />
+    <ClCompile Include="src\canvas.cpp" />
+    <ClCompile Include="src\canvas_modes.cpp" />
+    <ClCompile Include="src\event.cpp" />
+    <ClCompile Include="src\font.cpp" />
+    <ClCompile Include="src\image.cpp" />
+    <ClCompile Include="src\layout.cpp" />
+    <ClCompile Include="src\log.cpp" />
+    <ClCompile Include="src\main.cpp" />
+    <ClCompile Include="src\node.cpp" />
+    <ClCompile Include="src\node_border.cpp" />
+    <ClCompile Include="src\node_button.cpp" />
+    <ClCompile Include="src\node_button_custom.cpp" />
+    <ClCompile Include="src\node_canvas.cpp" />
+    <ClCompile Include="src\node_checkbox.cpp" />
+    <ClCompile Include="src\node_colorwheel.cpp" />
+    <ClCompile Include="src\node_color_quad.cpp" />
+    <ClCompile Include="src\node_combobox.cpp" />
+    <ClCompile Include="src\node_dialog_browse.cpp" />
+    <ClCompile Include="src\node_dialog_cloud.cpp" />
+    <ClCompile Include="src\node_dialog_layer_rename.cpp" />
+    <ClCompile Include="src\node_dialog_open.cpp" />
+    <ClCompile Include="src\node_dialog_picker.cpp" />
+    <ClCompile Include="src\node_icon.cpp" />
+    <ClCompile Include="src\node_image.cpp" />
+    <ClCompile Include="src\node_image_texture.cpp" />
+    <ClCompile Include="src\node_message_box.cpp" />
+    <ClCompile Include="src\node_panel_brush.cpp" />
+    <ClCompile Include="src\node_panel_color.cpp" />
+    <ClCompile Include="src\node_panel_grid.cpp" />
+    <ClCompile Include="src\node_panel_layer.cpp" />
+    <ClCompile Include="src\node_panel_stroke.cpp" />
+    <ClCompile Include="src\node_popup_menu.cpp" />
+    <ClCompile Include="src\node_progress_bar.cpp" />
+    <ClCompile Include="src\node_scroll.cpp" />
+    <ClCompile Include="src\node_settings.cpp" />
+    <ClCompile Include="src\node_slider.cpp" />
+    <ClCompile Include="src\node_stroke_preview.cpp" />
+    <ClCompile Include="src\node_text.cpp" />
+    <ClCompile Include="src\node_text_input.cpp" />
+    <ClCompile Include="src\node_viewport.cpp" />
+    <ClCompile Include="src\pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="engine\rtt.cpp" />
-    <ClCompile Include="engine\shader.cpp" />
-    <ClCompile Include="engine\shape.cpp" />
-    <ClCompile Include="engine\texture.cpp" />
-    <ClCompile Include="engine\util.cpp" />
-    <ClCompile Include="engine\version.cpp">
+    <ClCompile Include="src\rtt.cpp" />
+    <ClCompile Include="src\shader.cpp" />
+    <ClCompile Include="src\shape.cpp" />
+    <ClCompile Include="src\texture.cpp" />
+    <ClCompile Include="src\util.cpp" />
+    <ClCompile Include="src\version.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="engine\wacom.cpp" />
+    <ClCompile Include="src\wacom.cpp" />
     <ClCompile Include="libs\jpeg\jpgd.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
@@ -288,60 +288,60 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="engine\action.h" />
-    <ClInclude Include="engine\app.h" />
-    <ClInclude Include="engine\asset.h" />
-    <ClInclude Include="engine\bezier.h" />
-    <ClInclude Include="engine\brush.h" />
-    <ClInclude Include="engine\canvas.h" />
-    <ClInclude Include="engine\canvas_modes.h" />
-    <ClInclude Include="engine\event.h" />
-    <ClInclude Include="engine\font.h" />
-    <ClInclude Include="engine\image.h" />
-    <ClInclude Include="engine\keymap.h" />
-    <ClInclude Include="engine\layout.h" />
-    <ClInclude Include="engine\log.h" />
-    <ClInclude Include="engine\node.h" />
-    <ClInclude Include="engine\node_border.h" />
-    <ClInclude Include="engine\node_button.h" />
-    <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" />
-    <ClInclude Include="engine\node_message_box.h" />
-    <ClInclude Include="engine\node_panel_brush.h" />
-    <ClInclude Include="engine\node_panel_color.h" />
-    <ClInclude Include="engine\node_panel_grid.h" />
-    <ClInclude Include="engine\node_panel_layer.h" />
-    <ClInclude Include="engine\node_panel_stroke.h" />
-    <ClInclude Include="engine\node_popup_menu.h" />
-    <ClInclude Include="engine\node_progress_bar.h" />
-    <ClInclude Include="engine\node_scroll.h" />
-    <ClInclude Include="engine\node_settings.h" />
-    <ClInclude Include="engine\node_slider.h" />
-    <ClInclude Include="engine\node_stroke_preview.h" />
-    <ClInclude Include="engine\node_text.h" />
-    <ClInclude Include="engine\node_text_input.h" />
-    <ClInclude Include="engine\node_viewport.h" />
-    <ClInclude Include="engine\pch.h" />
-    <ClInclude Include="engine\rtt.h" />
-    <ClInclude Include="engine\shader.h" />
-    <ClInclude Include="engine\shape.h" />
-    <ClInclude Include="engine\texture.h" />
-    <ClInclude Include="engine\util.h" />
-    <ClInclude Include="engine\version.gen.h" />
-    <ClInclude Include="engine\version.h" />
-    <ClInclude Include="engine\wacom.h" />
+    <ClInclude Include="src\action.h" />
+    <ClInclude Include="src\app.h" />
+    <ClInclude Include="src\asset.h" />
+    <ClInclude Include="src\bezier.h" />
+    <ClInclude Include="src\brush.h" />
+    <ClInclude Include="src\canvas.h" />
+    <ClInclude Include="src\canvas_modes.h" />
+    <ClInclude Include="src\event.h" />
+    <ClInclude Include="src\font.h" />
+    <ClInclude Include="src\image.h" />
+    <ClInclude Include="src\keymap.h" />
+    <ClInclude Include="src\layout.h" />
+    <ClInclude Include="src\log.h" />
+    <ClInclude Include="src\node.h" />
+    <ClInclude Include="src\node_border.h" />
+    <ClInclude Include="src\node_button.h" />
+    <ClInclude Include="src\node_button_custom.h" />
+    <ClInclude Include="src\node_canvas.h" />
+    <ClInclude Include="src\node_checkbox.h" />
+    <ClInclude Include="src\node_colorwheel.h" />
+    <ClInclude Include="src\node_color_quad.h" />
+    <ClInclude Include="src\node_combobox.h" />
+    <ClInclude Include="src\node_dialog_browse.h" />
+    <ClInclude Include="src\node_dialog_cloud.h" />
+    <ClInclude Include="src\node_dialog_layer_rename.h" />
+    <ClInclude Include="src\node_dialog_open.h" />
+    <ClInclude Include="src\node_dialog_picker.h" />
+    <ClInclude Include="src\node_icon.h" />
+    <ClInclude Include="src\node_image.h" />
+    <ClInclude Include="src\node_image_texture.h" />
+    <ClInclude Include="src\node_message_box.h" />
+    <ClInclude Include="src\node_panel_brush.h" />
+    <ClInclude Include="src\node_panel_color.h" />
+    <ClInclude Include="src\node_panel_grid.h" />
+    <ClInclude Include="src\node_panel_layer.h" />
+    <ClInclude Include="src\node_panel_stroke.h" />
+    <ClInclude Include="src\node_popup_menu.h" />
+    <ClInclude Include="src\node_progress_bar.h" />
+    <ClInclude Include="src\node_scroll.h" />
+    <ClInclude Include="src\node_settings.h" />
+    <ClInclude Include="src\node_slider.h" />
+    <ClInclude Include="src\node_stroke_preview.h" />
+    <ClInclude Include="src\node_text.h" />
+    <ClInclude Include="src\node_text_input.h" />
+    <ClInclude Include="src\node_viewport.h" />
+    <ClInclude Include="src\pch.h" />
+    <ClInclude Include="src\rtt.h" />
+    <ClInclude Include="src\shader.h" />
+    <ClInclude Include="src\shape.h" />
+    <ClInclude Include="src\texture.h" />
+    <ClInclude Include="src\util.h" />
+    <ClInclude Include="src\version.gen.h" />
+    <ClInclude Include="src\version.h" />
+    <ClInclude Include="src\wacom.h" />
     <ClInclude Include="libs\jpeg\jpgd.h" />
     <ClInclude Include="libs\jpeg\jpge.h" />
     <ClInclude Include="libs\tinyxml2\tinyxml2.h" />

PanoPainter.vcxproj.filters

@@ -42,142 +42,142 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="engine\app.cpp">
+    <ClCompile Include="src\app.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\image.cpp">
+    <ClCompile Include="src\image.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\shader.cpp">
+    <ClCompile Include="src\shader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\shape.cpp">
+    <ClCompile Include="src\shape.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\texture.cpp">
+    <ClCompile Include="src\texture.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\pch.cpp">
+    <ClCompile Include="src\pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\font.cpp">
+    <ClCompile Include="src\font.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\util.cpp">
+    <ClCompile Include="src\util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\asset.cpp">
+    <ClCompile Include="src\asset.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\rtt.cpp">
+    <ClCompile Include="src\rtt.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\bezier.cpp">
+    <ClCompile Include="src\bezier.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\canvas.cpp">
+    <ClCompile Include="src\canvas.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\brush.cpp">
+    <ClCompile Include="src\brush.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\log.cpp">
+    <ClCompile Include="src\log.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\action.cpp">
+    <ClCompile Include="src\action.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\event.cpp">
+    <ClCompile Include="src\event.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\canvas_modes.cpp">
+    <ClCompile Include="src\canvas_modes.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node.cpp">
+    <ClCompile Include="src\node.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_border.cpp">
+    <ClCompile Include="src\node_border.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_button.cpp">
+    <ClCompile Include="src\node_button.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_button_custom.cpp">
+    <ClCompile Include="src\node_button_custom.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_canvas.cpp">
+    <ClCompile Include="src\node_canvas.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_checkbox.cpp">
+    <ClCompile Include="src\node_checkbox.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_color_quad.cpp">
+    <ClCompile Include="src\node_color_quad.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_dialog_open.cpp">
+    <ClCompile Include="src\node_dialog_open.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_icon.cpp">
+    <ClCompile Include="src\node_icon.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_image.cpp">
+    <ClCompile Include="src\node_image.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_image_texture.cpp">
+    <ClCompile Include="src\node_image_texture.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_message_box.cpp">
+    <ClCompile Include="src\node_message_box.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_panel_brush.cpp">
+    <ClCompile Include="src\node_panel_brush.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_panel_color.cpp">
+    <ClCompile Include="src\node_panel_color.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_panel_layer.cpp">
+    <ClCompile Include="src\node_panel_layer.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_panel_stroke.cpp">
+    <ClCompile Include="src\node_panel_stroke.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_popup_menu.cpp">
+    <ClCompile Include="src\node_popup_menu.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_settings.cpp">
+    <ClCompile Include="src\node_settings.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_slider.cpp">
+    <ClCompile Include="src\node_slider.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_stroke_preview.cpp">
+    <ClCompile Include="src\node_stroke_preview.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_text.cpp">
+    <ClCompile Include="src\node_text.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_text_input.cpp">
+    <ClCompile Include="src\node_text_input.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_viewport.cpp">
+    <ClCompile Include="src\node_viewport.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\layout.cpp">
+    <ClCompile Include="src\layout.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_scroll.cpp">
+    <ClCompile Include="src\node_scroll.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\app_shaders.cpp">
+    <ClCompile Include="src\app_shaders.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\app_layout.cpp">
+    <ClCompile Include="src\app_layout.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\app_events.cpp">
+    <ClCompile Include="src\app_events.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="libs\jpeg\jpgd.cpp">
@@ -189,16 +189,16 @@
     <ClCompile Include="libs\tinyxml2\tinyxml2.cpp">
       <Filter>libs\tinyxml2</Filter>
     </ClCompile>
-    <ClCompile Include="engine\wacom.cpp">
+    <ClCompile Include="src\wacom.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="libs\wacom\WinTab\Utils.cpp">
       <Filter>libs\WinTab</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_dialog_layer_rename.cpp">
+    <ClCompile Include="src\node_dialog_layer_rename.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\app_dialogs.cpp">
+    <ClCompile Include="src\app_dialogs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="libs\poly2tri\poly2tri\common\shapes.cc">
@@ -216,28 +216,28 @@
     <ClCompile Include="libs\poly2tri\poly2tri\sweep\sweep_context.cc">
       <Filter>libs\poly2tri</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_progress_bar.cpp">
+    <ClCompile Include="src\node_progress_bar.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_dialog_browse.cpp">
+    <ClCompile Include="src\node_dialog_browse.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\app_commands.cpp">
+    <ClCompile Include="src\app_commands.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_dialog_cloud.cpp">
+    <ClCompile Include="src\node_dialog_cloud.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\app_cloud.cpp">
+    <ClCompile Include="src\app_cloud.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_combobox.cpp">
+    <ClCompile Include="src\node_combobox.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_dialog_picker.cpp">
+    <ClCompile Include="src\node_dialog_picker.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_colorwheel.cpp">
+    <ClCompile Include="src\node_colorwheel.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
     <ClCompile Include="libs\yoga\yoga\YGNodeList.c">
@@ -246,138 +246,138 @@
     <ClCompile Include="libs\yoga\yoga\Yoga.c">
       <Filter>libs\yoga</Filter>
     </ClCompile>
-    <ClCompile Include="engine\node_panel_grid.cpp">
+    <ClCompile Include="src\node_panel_grid.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="engine\version.cpp">
+    <ClCompile Include="src\version.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="engine\app.h">
+    <ClInclude Include="src\app.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\image.h">
+    <ClInclude Include="src\image.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\pch.h">
+    <ClInclude Include="src\pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\shader.h">
+    <ClInclude Include="src\shader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\shape.h">
+    <ClInclude Include="src\shape.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\texture.h">
+    <ClInclude Include="src\texture.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\font.h">
+    <ClInclude Include="src\font.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\util.h">
+    <ClInclude Include="src\util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\asset.h">
+    <ClInclude Include="src\asset.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\rtt.h">
+    <ClInclude Include="src\rtt.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\bezier.h">
+    <ClInclude Include="src\bezier.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\canvas.h">
+    <ClInclude Include="src\canvas.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\brush.h">
+    <ClInclude Include="src\brush.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\log.h">
+    <ClInclude Include="src\log.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\action.h">
+    <ClInclude Include="src\action.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\event.h">
+    <ClInclude Include="src\event.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\keymap.h">
+    <ClInclude Include="src\keymap.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\canvas_modes.h">
+    <ClInclude Include="src\canvas_modes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node.h">
+    <ClInclude Include="src\node.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_border.h">
+    <ClInclude Include="src\node_border.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_button.h">
+    <ClInclude Include="src\node_button.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_button_custom.h">
+    <ClInclude Include="src\node_button_custom.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_canvas.h">
+    <ClInclude Include="src\node_canvas.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_checkbox.h">
+    <ClInclude Include="src\node_checkbox.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_color_quad.h">
+    <ClInclude Include="src\node_color_quad.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_dialog_open.h">
+    <ClInclude Include="src\node_dialog_open.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_icon.h">
+    <ClInclude Include="src\node_icon.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_image.h">
+    <ClInclude Include="src\node_image.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_image_texture.h">
+    <ClInclude Include="src\node_image_texture.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_message_box.h">
+    <ClInclude Include="src\node_message_box.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_panel_brush.h">
+    <ClInclude Include="src\node_panel_brush.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_panel_color.h">
+    <ClInclude Include="src\node_panel_color.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_panel_layer.h">
+    <ClInclude Include="src\node_panel_layer.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_panel_stroke.h">
+    <ClInclude Include="src\node_panel_stroke.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_popup_menu.h">
+    <ClInclude Include="src\node_popup_menu.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_settings.h">
+    <ClInclude Include="src\node_settings.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_slider.h">
+    <ClInclude Include="src\node_slider.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_stroke_preview.h">
+    <ClInclude Include="src\node_stroke_preview.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_text.h">
+    <ClInclude Include="src\node_text.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_text_input.h">
+    <ClInclude Include="src\node_text_input.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_viewport.h">
+    <ClInclude Include="src\node_viewport.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\layout.h">
+    <ClInclude Include="src\layout.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
     <ClInclude Include="libs\jpeg\jpgd.h">
@@ -389,7 +389,7 @@
     <ClInclude Include="libs\tinyxml2\tinyxml2.h">
       <Filter>libs\tinyxml2</Filter>
     </ClInclude>
-    <ClInclude Include="engine\wacom.h">
+    <ClInclude Include="src\wacom.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="libs\wacom\WinTab\PKTDEF.H">
@@ -404,28 +404,28 @@
     <ClInclude Include="libs\wacom\WinTab\MSGPACK.H">
       <Filter>libs\WinTab</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_dialog_layer_rename.h">
+    <ClInclude Include="src\node_dialog_layer_rename.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_progress_bar.h">
+    <ClInclude Include="src\node_progress_bar.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_dialog_browse.h">
+    <ClInclude Include="src\node_dialog_browse.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_dialog_cloud.h">
+    <ClInclude Include="src\node_dialog_cloud.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_combobox.h">
+    <ClInclude Include="src\node_combobox.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_colorwheel.h">
+    <ClInclude Include="src\node_colorwheel.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_dialog_picker.h">
+    <ClInclude Include="src\node_dialog_picker.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_scroll.h">
+    <ClInclude Include="src\node_scroll.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
     <ClInclude Include="libs\yoga\yoga\YGEnums.h">
@@ -440,13 +440,13 @@
     <ClInclude Include="libs\yoga\yoga\Yoga.h">
       <Filter>libs\yoga</Filter>
     </ClInclude>
-    <ClInclude Include="engine\node_panel_grid.h">
+    <ClInclude Include="src\node_panel_grid.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="engine\version.gen.h">
+    <ClInclude Include="src\version.gen.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="engine\version.h">
+    <ClInclude Include="src\version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

android/CMakeLists.txt

@@ -32,65 +32,65 @@ add_library(
 	../libs/poly2tri/poly2tri/sweep/sweep_context.cc
 	../libs/poly2tri/poly2tri/sweep/sweep.cc
 	src/main/cpp/main.cpp
-	../engine/pch.cpp
-	../engine/util.cpp
-	../engine/rtt.cpp
-	../engine/bezier.cpp
-	../engine/asset.cpp
-	../engine/image.cpp
-	../engine/texture.cpp
-	../engine/font.cpp
-	../engine/shader.cpp
-	../engine/shape.cpp
-	../engine/app.cpp
-	../engine/app_cloud.cpp
-	../engine/app_dialogs.cpp
-	../engine/app_events.cpp
-	../engine/app_layout.cpp
-	../engine/app_shaders.cpp
-	../engine/brush.cpp
-	../engine/canvas.cpp
-	../engine/canvas_modes.cpp
-	../engine/log.cpp
-	../engine/action.cpp
-	../engine/layout.cpp
-	../engine/node.cpp
-	../engine/node_border.cpp
-	../engine/node_button.cpp
-	../engine/node_button_custom.cpp
-	../engine/node_canvas.cpp
-	../engine/node_checkbox.cpp
-	../engine/node_color_quad.cpp
-	../engine/node_colorwheel.cpp
-	../engine/node_combobox.cpp
-	../engine/node_dialog_browse.cpp
-	../engine/node_dialog_cloud.cpp
-	../engine/node_dialog_open.cpp
-	../engine/node_dialog_picker.cpp
-	../engine/node_dialog_layer_rename.cpp
-	../engine/node_icon.cpp
-	../engine/node_image.cpp
-	../engine/node_image_texture.cpp
-	../engine/node_message_box.cpp
-	../engine/node_panel_brush.cpp
-	../engine/node_panel_color.cpp
-	../engine/node_panel_layer.cpp
-	../engine/node_panel_stroke.cpp
-	../engine/node_popup_menu.cpp
-	../engine/node_progress_bar.cpp
-	../engine/node_settings.cpp
-	../engine/node_slider.cpp
-	../engine/node_stroke_preview.cpp
-	../engine/node_text.cpp
-	../engine/node_text_input.cpp
-	../engine/node_viewport.cpp
-	../engine/node_scroll.cpp
+	../src\/pch.cpp
+	../src\/util.cpp
+	../src\/rtt.cpp
+	../src\/bezier.cpp
+	../src\/asset.cpp
+	../src\/image.cpp
+	../src\/texture.cpp
+	../src\/font.cpp
+	../src\/shader.cpp
+	../src\/shape.cpp
+	../src\/app.cpp
+	../src\/app_cloud.cpp
+	../src\/app_dialogs.cpp
+	../src\/app_events.cpp
+	../src\/app_layout.cpp
+	../src\/app_shaders.cpp
+	../src\/brush.cpp
+	../src\/canvas.cpp
+	../src\/canvas_modes.cpp
+	../src\/log.cpp
+	../src\/action.cpp
+	../src\/layout.cpp
+	../src\/node.cpp
+	../src\/node_border.cpp
+	../src\/node_button.cpp
+	../src\/node_button_custom.cpp
+	../src\/node_canvas.cpp
+	../src\/node_checkbox.cpp
+	../src\/node_color_quad.cpp
+	../src\/node_colorwheel.cpp
+	../src\/node_combobox.cpp
+	../src\/node_dialog_browse.cpp
+	../src\/node_dialog_cloud.cpp
+	../src\/node_dialog_open.cpp
+	../src\/node_dialog_picker.cpp
+	../src\/node_dialog_layer_rename.cpp
+	../src\/node_icon.cpp
+	../src\/node_image.cpp
+	../src\/node_image_texture.cpp
+	../src\/node_message_box.cpp
+	../src\/node_panel_brush.cpp
+	../src\/node_panel_color.cpp
+	../src\/node_panel_layer.cpp
+	../src\/node_panel_stroke.cpp
+	../src\/node_popup_menu.cpp
+	../src\/node_progress_bar.cpp
+	../src\/node_settings.cpp
+	../src\/node_slider.cpp
+	../src\/node_stroke_preview.cpp
+	../src\/node_text.cpp
+	../src\/node_text_input.cpp
+	../src\/node_viewport.cpp
+	../src\/node_scroll.cpp
 )
 
 target_include_directories(native-lib PRIVATE
 	${ANDROID_NDK}/sources/android/native_app_glue
 	src/main/cpp
-	../engine
+	../src\
 	../libs/glm
 	../libs/tinyxml2
 	../libs/yoga