1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
From: Ryan Pavlik <ryan.pavlik@collabora.com>
Date: Thu, 12 May 2022 16:48:46 -0500
Subject: Use threejs from system.
Forwarded: not-needed
---
res/CMakeLists.txt | 1 -
src/export.cpp | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
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(),
|
