From ffbed442e8258209b254d8fff312bba32b890963 Mon Sep 17 00:00:00 2001 From: Rob L Date: Thu, 7 Jul 2016 12:46:22 -0400 Subject: [PATCH] Staging and testing for json data movement --- mapview/js/mapviewgl.js | 4 ++-- mapview/webviewgl.htm | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mapview/js/mapviewgl.js b/mapview/js/mapviewgl.js index d378a1d..550bbd5 100644 --- a/mapview/js/mapviewgl.js +++ b/mapview/js/mapviewgl.js @@ -1,5 +1,5 @@ if ( ! Detector.webgl ) Detector.addGetWebGLMessage(); -var jsonEmpire = { +/* var jsonEmpire = { "CU": { "name": "Cardasian Union", "color": "#CC9933", @@ -1060,7 +1060,7 @@ var jsonEmpire = { }, "bases": {} } -}; +}; */ var camera, controls, scene, renderer; var canvas_t=[]; var context_t=[]; diff --git a/mapview/webviewgl.htm b/mapview/webviewgl.htm index 3c48952..4724568 100644 --- a/mapview/webviewgl.htm +++ b/mapview/webviewgl.htm @@ -1,10 +1,11 @@ - - - - + + + + +