From d03f5441b0f686f7315a158e4d8ac7a68aabd11b Mon Sep 17 00:00:00 2001
From: omigamedev <omarator@gmail.com>
Date: Thu, 2 May 2019 18:00:59 +0200
Subject: [PATCH] fix polygon selection and add steam deploy script

---
 .gitignore                           |  4 ++++
 src/canvas_modes.cpp                 |  3 ++-
 src/main.cpp                         |  7 +++++++
 steam/build.bat                      | 13 ++++++++++++
 steam/scripts/app_build_954880.vdf   | 15 ++++++++++++++
 steam/scripts/depot_build_954881.vdf | 31 ++++++++++++++++++++++++++++
 6 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 steam/build.bat
 create mode 100644 steam/scripts/app_build_954880.vdf
 create mode 100644 steam/scripts/depot_build_954881.vdf

diff --git a/.gitignore b/.gitignore
index 91e3366..711240b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,7 @@ PanoPainterPackage/_pkginfo.txt
 PanoPainterPackage/AppPackages/
 PanoPainterPackage/BundleArtifacts/
 Thumbs.db
+
+steam/content/
+steam/output/
+steam/steamid\.txt
diff --git a/src/canvas_modes.cpp b/src/canvas_modes.cpp
index cbbaacf..164d8dc 100644
--- a/src/canvas_modes.cpp
+++ b/src/canvas_modes.cpp
@@ -706,7 +706,7 @@ void CanvasModeMaskLine::leave(kCanvasMode next)
 {
     if (next != kCanvasMode::Draw && next != kCanvasMode::Erase && next != kCanvasMode::Line)
     {
-        m_points2d.clear();
+        m_points.clear();
         m_active_tool = false;
         Canvas::I->m_smask_active = false;
     }
@@ -1355,6 +1355,7 @@ void CanvasModeTransform::leave(kCanvasMode next)
     layer->optimize();
     //auto m = static_cast<CanvasModeMaskFree*>(Canvas::I->modes[(int)kCanvasMode::MaskFree][0]);
     //m->clear();
+    Canvas::I->draw_merge();
 }
 
 void CanvasModeTransform::on_Draw(const glm::mat4& ortho, const glm::mat4& proj, const glm::mat4& camera)
diff --git a/src/main.cpp b/src/main.cpp
index 1d546b7..ed4283f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -689,6 +689,7 @@ int main(int argc, char** argv)
         return -1; // A negative number because you are a negative one
     }
 
+    bool start_in_vr = false;
     if (argc > 1)
     {
         switch (const_hash(argv[1]))
@@ -697,6 +698,9 @@ int main(int argc, char** argv)
             App::I.initShaders();
             App::I.cmd_convert(argv[2], argv[3]);
             return 0;
+        case const_hash("-vrmode"):
+            start_in_vr = true;
+            break;
         default:
             break;
         }
@@ -844,6 +848,9 @@ int main(int argc, char** argv)
 
     SetTimer(hWnd, 1, 500, NULL);
 
+    if (start_in_vr)
+        App::I.vr_start();
+
     MSG msg;
     LOG("start main loop");
     while (running == 1)
diff --git a/steam/build.bat b/steam/build.bat
new file mode 100644
index 0000000..7f21d3a
--- /dev/null
+++ b/steam/build.bat
@@ -0,0 +1,13 @@
+@echo off
+mkdir content
+xcopy /I /D /Y /S "..\x64\Release\*.dll" content
+xcopy /I /D /Y /S "..\data\*" content\data\
+for /f %%i in ('git rev-parse --abbrev-ref HEAD') do set BRANCH=%%i
+for /f %%i in ('git log "--pretty=format:%%h" -n 1') do set HASH=%%i
+for /f %%i in ('git rev-list --count HEAD') do set COUNT=%%i
+for /f %%i in ('git describe --tags "--abbrev=0"') do set TAG=%%i
+set VERSION=%TAG%.%COUNT% (%HASH%-%BRANCH%)
+echo Building version %VERSION%
+set /p ID=<steamid.txt
+steamcmd.exe +login %ID% +drm_wrap 954880 "%~dp0..\x64\Release\PanoPainter.exe" "%~dp0content\PanoPainter.exe" drmtoolp 0 +run_app_build -desc "%VERSION%" "%~dp0scripts\app_build_954880.vdf" +quit
+pause
\ No newline at end of file
diff --git a/steam/scripts/app_build_954880.vdf b/steam/scripts/app_build_954880.vdf
new file mode 100644
index 0000000..dc4d39e
--- /dev/null
+++ b/steam/scripts/app_build_954880.vdf
@@ -0,0 +1,15 @@
+"appbuild"
+{
+	"appid"	"954880"
+	"desc" "Your build description here" // description for this build
+	"buildoutput" "..\output\" // build output folder for .log, .csm & .csd files, relative to location of this file
+	"contentroot" "..\content\" // root content folder, relative to location of this file
+	"setlive"	"" // branch to set live after successful build, non if empty
+	"preview" "0" // to enable preview builds
+	"local"	""	// set to flie path of local content server 
+	
+	"depots"
+	{
+		"954881" "depot_build_954881.vdf"
+	}
+}
\ No newline at end of file
diff --git a/steam/scripts/depot_build_954881.vdf b/steam/scripts/depot_build_954881.vdf
new file mode 100644
index 0000000..2e4a570
--- /dev/null
+++ b/steam/scripts/depot_build_954881.vdf
@@ -0,0 +1,31 @@
+"DepotBuildConfig"
+{
+	// Set your assigned depot ID here
+	"DepotID" "954881"
+
+	// Set a root for all content.
+	// All relative paths specified below (LocalPath in FileMapping entries, and FileExclusion paths)
+	// will be resolved relative to this root.
+	// If you don't define ContentRoot, then it will be assumed to be
+	// the location of this script file, which probably isn't what you want
+	// "ContentRoot"	"D:\MyGame\rel\master\"
+
+	// include all files recursivley
+  "FileMapping"
+  {
+  	// This can be a full path, or a path relative to ContentRoot
+    "LocalPath" "*"
+    
+    // This is a path relative to the install folder of your game
+    "DepotPath" "."
+    
+    // If LocalPath contains wildcards, setting this means that all
+    // matching files within subdirectories of LocalPath will also
+    // be included.
+    "recursive" "1"
+  }
+
+	// but exclude all symbol files  
+	// This can be a full path, or a path relative to ContentRoot
+  "FileExclusion" "*.pdb"
+}