summaryrefslogtreecommitdiff
path: root/graphics/asymptote/jsfile.cc
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-01-21 03:01:16 +0000
committerNorbert Preining <norbert@preining.info>2022-01-21 03:01:16 +0000
commit5d5f239204f5c0d1f7573c9ebc64b5ad1ae75b49 (patch)
treedd2a2d9a64fd0be0785bc558a4872a3c8185af23 /graphics/asymptote/jsfile.cc
parent217d27e597baa589f8e115e1b44eef51c7bb5dd0 (diff)
CTAN sync 202201210301
Diffstat (limited to 'graphics/asymptote/jsfile.cc')
-rw-r--r--graphics/asymptote/jsfile.cc24
1 files changed, 18 insertions, 6 deletions
diff --git a/graphics/asymptote/jsfile.cc b/graphics/asymptote/jsfile.cc
index b04c90f63e..19eb66428f 100644
--- a/graphics/asymptote/jsfile.cc
+++ b/graphics/asymptote/jsfile.cc
@@ -8,6 +8,10 @@ using namespace settings;
namespace camp {
+#ifndef HAVE_LIBGLM
+size_t materialIndex=0;
+#endif
+
jsfile::jsfile() : finished(false), fileName("")
{
@@ -97,10 +101,9 @@ void jsfile::svgtohtml(string prefix)
finished=true;
}
-#ifdef HAVE_LIBGLM
-
void jsfile::comment(string name)
{
+#ifdef HAVE_LIBGLM
out << "<!-- Use the following line to embed this file within another web page:" << newl
<< newl
<< "<iframe src=\"" << name
@@ -109,6 +112,7 @@ void jsfile::comment(string name)
<< "\" frameborder=\"0\"></iframe>" << newl
<< newl
<< "-->" << newl << newl;
+#endif
}
void jsfile::open(string name)
@@ -117,6 +121,7 @@ void jsfile::open(string name)
comment(name);
meta(name,false);
+#ifdef HAVE_LIBGLM
out.precision(getSetting<Int>("digits"));
bool ibl=getSetting<bool>("ibl");
@@ -148,9 +153,9 @@ void jsfile::open(string name)
out << "image=\"" << getSetting<string>("image") << "\";" << newl << newl;
}
out << newl
- << "minBound=[" << gl::xmin << "," << gl::ymin << "," << gl::zmin << "];"
+ << "minBound=[" << gl::Xmin << "," << gl::Ymin << "," << gl::Zmin << "];"
<< newl
- << "maxBound=[" << gl::xmax << "," << gl::ymax << "," << gl::zmax << "];"
+ << "maxBound=[" << gl::Xmax << "," << gl::Ymax << "," << gl::Zmax << "];"
<< newl
<< "orthographic=" << gl::orthographic << ";"
<< newl
@@ -183,13 +188,19 @@ void jsfile::open(string name)
out << "Background=[" << gl::Background[0] << "," << gl::Background[1] << ","
<< gl::Background[2] << "," << gl::Background[3] << "];"
<< newl << newl;
+ out << "Transform=[" << gl::T[0];
+ for(int i=1; i < 16; ++i)
+ out << "," << newl << gl::T[i];
+ out << "];" << newl << newl;
camp::clearCenters();
camp::clearMaterials();
+#endif
}
void jsfile::finish(string name)
{
+#ifdef HAVE_LIBGLM
finished=true;
size_t ncenters=drawElement::centers.size();
if(ncenters > 0) {
@@ -206,6 +217,7 @@ void jsfile::finish(string name)
<< "\" style=\"border: none; cursor: pointer;\">"
<< newl << "</canvas>";
footer(name);
+#endif
}
void jsfile::addColor(const prc::RGBAColour& c)
@@ -273,12 +285,14 @@ void jsfile::addPixel(const triple& z0, double width,
<< newl << newl;
}
+#ifdef HAVE_LIBGLM
void jsfile::addMaterial(Material const& material)
{
out << "material(" << newl
<< material
<< ");" << newl << newl;
}
+#endif
void jsfile::addTriangles(size_t nP, const triple* P, size_t nN,
const triple* N, size_t nC, const prc::RGBAColour* C,
@@ -400,6 +414,4 @@ void jsfile::addStraightBezierTriangle(triple const* controls,
addRawPatch(controls,3,Min,Max,c,3);
}
-#endif
-
}