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 7e1b2db3a1764709053b13eb9b69c7b794abcd8c..30b577c131e576b13729252ce79b15b95d027c5b 100644 (file)
--- a/res/CMakeLists.txt
+++ b/res/CMakeLists.txt
@@ -313,7 +313,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 5e6ad07389bf0e76f97bc69497bcb587ac46a195..aeadcd464a69b21f13c4199413460c5e0f4abc16 100644 (file)
--- a/src/export.cpp
+++ b/src/export.cpp
@@ -955,7 +955,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");
 
@@ -1018,7 +1018,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(),