From: Ryan Pavlik <ryan.pavlik@collabora.com>
Date: Thu, 12 May 2022 21:48:46 +0000 (-0500)
Subject: Use threejs from system.
X-Git-Tag: archive/raspbian/3.1+ds1-3.1+rpi1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a67d1f46fec80137b4ae05166c143d80499eaa63;p=solvespace.git

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 7303c6f..78d2bd2 100644
--- 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 f1c331f..d3a47b4 100644
--- 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(),