From edfe5e845f3cd7b4beaa5cd6ec66ea39d5f5fd73 Mon Sep 17 00:00:00 2001 From: Andreas Plesch Date: Mon, 1 Jul 2019 19:57:21 -0400 Subject: [PATCH 1/2] add global useGeoCache setting --- src/Main.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Main.js b/src/Main.js index 81f99e37ff..544ff86e27 100644 --- a/src/Main.js +++ b/src/Main.js @@ -51,7 +51,8 @@ x3dom.userAgentFeature = { 'disableKeys', 'showTouchpoints', 'disableTouch', - 'maxActiveDownloads' + 'maxActiveDownloads', + 'useGeoCache' ]); var components, prefix; var showLoggingConsole = false; @@ -64,6 +65,7 @@ x3dom.userAgentFeature = { settings.setProperty("showStat", x3ds[i].getAttribute("showStat") || 'false'); settings.setProperty("showProgress", x3ds[i].getAttribute("showProgress") || 'true'); settings.setProperty("PrimitiveQuality", x3ds[i].getAttribute("PrimitiveQuality") || 'High'); + settings.setProperty("useGeoCache", x3ds[i].getAttribute("useGeoCache") || 'true'); // for each param element inside the X3D element // add settings to properties object From 70e2f889c5aa645550db16d80a9df171ce34c0dc Mon Sep 17 00:00:00 2001 From: Andreas Plesch Date: Mon, 1 Jul 2019 20:00:43 -0400 Subject: [PATCH 2/2] global useGeoCache setting as default --- src/nodes/Rendering/X3DGeometryNode.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/nodes/Rendering/X3DGeometryNode.js b/src/nodes/Rendering/X3DGeometryNode.js index 362113c91c..1526163804 100644 --- a/src/nodes/Rendering/X3DGeometryNode.js +++ b/src/nodes/Rendering/X3DGeometryNode.js @@ -49,13 +49,16 @@ x3dom.registerNodeType( /** * Most geo primitives use geo cache and others might later on, but one should be able to disable cache per geometry node. + * Defaults to global useGeoCache setting parameter. * @var {x3dom.fields.SFBool} useGeoCache * @memberof x3dom.nodeTypes.X3DGeometryNode * @initvalue true * @field x3dom * @instance */ - this.addField_SFBool(ctx, 'useGeoCache', true); + this.addField_SFBool(ctx, 'useGeoCache', this._nameSpace ? + this._nameSpace.doc.properties.getProperty("useGeoCache", "true").toLowerCase() == 'true' + : false); /** * Specifies whether this geometry should be rendered with or without lighting. @@ -125,4 +128,4 @@ x3dom.registerNodeType( } } ) -); \ No newline at end of file +);