From: Ryan Pavlik <ryan.pavlik@collabora.com>
Date: Thu, 11 Feb 2021 21:06:33 +0000 (+0000)
Subject: Use threejs from system.
X-Git-Tag: archive/raspbian/3.1+ds1-3+rpi1~1^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c75a71ec6597483d59b02361661b9e0d83e5c7f1;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 e261ba2..d893f93 100644
--- a/res/CMakeLists.txt
+++ b/res/CMakeLists.txt
@@ -284,7 +284,6 @@ add_resources(
     shaders/edge.frag
     shaders/edge.vert
     shaders/outline.vert
-    threejs/three-r76.js.gz
     threejs/hammer-2.0.8.js.gz
     threejs/SolveSpaceControls.js)
 
diff --git a/src/export.cpp b/src/export.cpp
index f5649b6..f25ebc6 100644
--- a/src/export.cpp
+++ b/src/export.cpp
@@ -1014,7 +1014,7 @@ void SolveSpaceUI::ExportMeshAsThreeJsTo(FILE *f, const Platform::Path &filename
 
     if(filename.HasExtension("html")) {
         fprintf(f, htmlbegin,
-                LoadStringFromGzip("threejs/three-r76.js.gz").c_str(),
+                LoadString("threejs/three.js").c_str(),
                 LoadStringFromGzip("threejs/hammer-2.0.8.js.gz").c_str(),
                 LoadString("threejs/SolveSpaceControls.js").c_str());
     }