Use threejs from system.
authorRyan Pavlik <ryan.pavlik@collabora.com>
Thu, 11 Feb 2021 21:06:33 +0000 (21:06 +0000)
committerRyan Pavlik <ryan@ryanpavlik.com>
Thu, 11 Feb 2021 21:06:33 +0000 (21:06 +0000)
Forwarded: not-needed

Gbp-Pq: Name 03_use_system_threejs.patch

res/CMakeLists.txt
src/export.cpp

index e261ba2134b36d0f8745a6d57ab415df725fa55e..d893f938dd2d1394804169df6d69e1a27c2743a8 100644 (file)
@@ -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)
 
index f5649b687dd221078aaa477df63d338d0ce1b6b3..f25ebc677f0a1e862416f91453d19ba982a22592 100644 (file)
@@ -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());
     }