Use threejs from system.

Forwarded: not-needed

Gbp-Pq: Name 03_use_system_threejs.patch

diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt
index 7303c6f7a4d217911cc9bf43b5eb6e2bf0e73605..78d2bd2688b9e3f800a886f65e353237f62865f7 100644 (file)
--- a/res/CMakeLists.txt
+++ b/res/CMakeLists.txt
@@ -295,7 +295,6 @@ add_resources(
     shaders/edge.frag
     shaders/edge.vert
     shaders/outline.vert
-    threejs/three-r111.min.js.gz
     threejs/hammer-2.0.8.js.gz
     threejs/SolveSpaceControls.js)
 

diff --git a/src/export.cpp b/src/export.cpp
index f1c331fd787b953de1faedd91f54555e9293ab83..d3a47b440fc4e0c4c26d2bce198ced7620a3aca3 100644 (file)
--- a/src/export.cpp
+++ b/src/export.cpp
@@ -953,7 +953,7 @@ void SolveSpaceUI::ExportMeshAsThreeJsTo(FILE *f, const Platform::Path &filename
     STriangle *tr;
     Vector bndl, bndh;
 
-    const std::string THREE_FN("three-r111.min.js");
+    const std::string THREE_FN("three.js");
     const std::string HAMMER_FN("hammer-2.0.8.js");
     const std::string CONTROLS_FN("SolveSpaceControls.js");
 
@@ -1016,7 +1016,7 @@ void SolveSpaceUI::ExportMeshAsThreeJsTo(FILE *f, const Platform::Path &filename
     if(filename.HasExtension("html")) {
         fprintf(f, htmlbegin,
                 THREE_FN.c_str(),
-                LoadStringFromGzip("threejs/" + THREE_FN + ".gz").c_str(),
+                LoadString("threejs/" + THREE_FN).c_str(),
                 HAMMER_FN.c_str(),
                 LoadStringFromGzip("threejs/" + HAMMER_FN + ".gz").c_str(),
                 CONTROLS_FN.c_str(),