From 0404cd46ef30e4ecca94331bb1351d22dd4d329d Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Thu, 21 Jan 2021 15:26:39 -0600 Subject: [PATCH] Standardize how we refer to the other javascript files we include, too. --- src/export.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/export.cpp b/src/export.cpp index c70237e..970552c 100644 --- a/src/export.cpp +++ b/src/export.cpp @@ -958,6 +958,8 @@ void SolveSpaceUI::ExportMeshAsThreeJsTo(FILE *f, const Platform::Path &filename Vector bndl, bndh; const std::string THREE_FN("three-r111.min.js"); + const std::string HAMMER_FN("hammer-2.0.8.js"); + const std::string CONTROLS_FN("SolveSpaceControls.js"); const char htmlbegin[] = R"( @@ -966,8 +968,8 @@ void SolveSpaceUI::ExportMeshAsThreeJsTo(FILE *f, const Platform::Path &filename Three.js Solvespace Mesh - - + + @@ -1019,7 +1021,10 @@ void SolveSpaceUI::ExportMeshAsThreeJsTo(FILE *f, const Platform::Path &filename fprintf(f, htmlbegin, THREE_FN.c_str(), LoadStringFromGzip("threejs/" + THREE_FN + ".gz").c_str(), - LoadString("threejs/SolveSpaceControls.js").c_str()); + HAMMER_FN.c_str(), + LoadStringFromGzip("threejs/" + HAMMER_FN + ".gz").c_str(), + CONTROLS_FN.c_str(), + LoadString("threejs/" + CONTROLS_FN).c_str()); } fprintf(f, "var solvespace_model_%s = {\n"