From b063321a5bbba25a169d6e0eb9cda42605b013fe Mon Sep 17 00:00:00 2001
From: kovacsv <viktorkovacs@gmail.com>
Date: Sun, 11 Jul 2021 15:44:22 +0200
Subject: [PATCH] Rename url parameters for default and background color.

---
 sandbox/embed_iframe.html            |  2 +-
 sandbox/embed_selfhost_multiple.html |  4 ++--
 source/parameters/parameterlist.js   | 12 ++++++------
 source/viewer/domviewer.js           | 16 ++++++++--------
 test/tests/parameterlist_test.js     | 20 ++++++++++----------
 website/o3dv/embed.js                |  6 +++---
 website/o3dv/hashhandler.js          |  6 +++---
 website/o3dv/website.js              |  6 +++---
 8 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/sandbox/embed_iframe.html b/sandbox/embed_iframe.html
index 81b8c6d..6571298 100644
--- a/sandbox/embed_iframe.html
+++ b/sandbox/embed_iframe.html
@@ -34,7 +34,7 @@
         style="border:1px solid #eeeeee;">
     </iframe>
     <iframe
-        src="../../website/embed.html#model=../test/testfiles/obj/hundred_cubes.obj$background=200,200,200$color=200,0,0"
+        src="../../website/embed.html#model=../test/testfiles/obj/hundred_cubes.obj$backgroundcolor=200,200,200$defaultcolor=200,0,0"
         width=360 height=240
         style="border:1px solid #eeeeee;">
     </iframe>
diff --git a/sandbox/embed_selfhost_multiple.html b/sandbox/embed_selfhost_multiple.html
index 7bcc483..23d719f 100644
--- a/sandbox/embed_selfhost_multiple.html
+++ b/sandbox/embed_selfhost_multiple.html
@@ -111,8 +111,8 @@
     <div class="online_3d_viewer"
 		style="width: 360px; height: 240px;"
         model="../../test/testfiles/obj/hundred_cubes.obj"
-        color="200,0,0"
-		background="200,200,200">
+        defaultcolor="200,0,0"
+		backgroundcolor="200,200,200">
     </div>
     <div class="online_3d_viewer"
 		style="width: 360px; height: 240px;"
diff --git a/source/parameters/parameterlist.js b/source/parameters/parameterlist.js
index 7c1d3f8..8456743 100644
--- a/source/parameters/parameterlist.js
+++ b/source/parameters/parameterlist.js
@@ -120,13 +120,13 @@ OV.ParameterListBuilder = class
 
     AddBackground (background)
     {
-        this.AddUrlPart ('background', OV.ParameterConverter.ColorToString (background));
+        this.AddUrlPart ('backgroundcolor', OV.ParameterConverter.ColorToString (background));
         return this;
     }
 
     AddColor (color)
     {
-        this.AddUrlPart ('color', OV.ParameterConverter.ColorToString (color));
+        this.AddUrlPart ('defaultcolor', OV.ParameterConverter.ColorToString (color));
         return this;
     }
 
@@ -172,15 +172,15 @@ OV.ParameterListParser = class
         return OV.ParameterConverter.StringToCamera (keywordParams);
     }
 
-    GetBackground ()
+    GetBackgroundColor ()
     {
-        let backgroundParams = this.GetKeywordParams ('background');
+        let backgroundParams = this.GetKeywordParams ('backgroundcolor');
         return OV.ParameterConverter.StringToColor (backgroundParams);
     }
 
-    GetColor ()
+    GetDefaultColor ()
     {
-        let colorParams = this.GetKeywordParams ('color');
+        let colorParams = this.GetKeywordParams ('defaultcolor');
         return OV.ParameterConverter.StringToColor (colorParams);
     }
     
diff --git a/source/viewer/domviewer.js b/source/viewer/domviewer.js
index 7f5554a..04f3ee1 100644
--- a/source/viewer/domviewer.js
+++ b/source/viewer/domviewer.js
@@ -55,11 +55,11 @@ OV.Init3DViewerElements = function (onReady)
             },
         });
 
-        let backgroundParam = element.getAttribute ('background');
+        let backgroundParam = element.getAttribute ('backgroundcolor');
         if (backgroundParam) {
-            let color = OV.ParameterConverter.StringToColor (backgroundParam);
-            if (color !== null) {
-                viewer.SetBackgroundColor (color);
+            let backgroundColor = OV.ParameterConverter.StringToColor (backgroundParam);
+            if (backgroundColor !== null) {
+                viewer.SetBackgroundColor (backgroundColor);
             }
         }
 
@@ -74,11 +74,11 @@ OV.Init3DViewerElements = function (onReady)
         }
 
         let settings = new OV.ImportSettings ();
-        let colorParam = element.getAttribute ('color');
+        let colorParam = element.getAttribute ('defaultcolor');
         if (colorParam) {
-            let color = OV.ParameterConverter.StringToColor (colorParam);
-            if (color !== null) {
-                settings.defaultColor = color;
+            let defaultColor = OV.ParameterConverter.StringToColor (colorParam);
+            if (defaultColor !== null) {
+                settings.defaultColor = defaultColor;
             }
         }
 
diff --git a/test/tests/parameterlist_test.js b/test/tests/parameterlist_test.js
index 7b3131f..15dcaa6 100644
--- a/test/tests/parameterlist_test.js
+++ b/test/tests/parameterlist_test.js
@@ -18,8 +18,8 @@ describe ('Parameter List', function () {
         assert.strictEqual (urlParams1, 'model=a.txt,b.txt');
         assert.strictEqual (urlParams2, 'camera=1.0000,1.0000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1.0000');
         assert.strictEqual (urlParams3, 'model=a.txt,b.txt$camera=1.0000,1.0000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1.0000');
-        assert.strictEqual (urlParams4, 'model=a.txt,b.txt$camera=1.0000,1.0000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1.0000$color=1,2,3');
-        assert.strictEqual (urlParams5, 'model=a.txt,b.txt$camera=1.0000,1.0000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1.0000$background=4,5,6$color=1,2,3');
+        assert.strictEqual (urlParams4, 'model=a.txt,b.txt$camera=1.0000,1.0000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1.0000$defaultcolor=1,2,3');
+        assert.strictEqual (urlParams5, 'model=a.txt,b.txt$camera=1.0000,1.0000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1.0000$backgroundcolor=4,5,6$defaultcolor=1,2,3');
     });
 
     it ('Parameter list parser', function () {
@@ -35,31 +35,31 @@ describe ('Parameter List', function () {
         let urlParams1 = 'model=a.txt,b.txt';
         let urlParams2 = 'camera=1.0000,1.0000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1.0000';
         let urlParams3 = 'model=a.txt,b.txt$camera=1.0000,1.0000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1.0000';
-        let urlParams4 = 'model=a.txt,b.txt$camera=1.0000,1.0000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1.0000$color=1,2,3';
-        let urlParams5 = 'model=a.txt,b.txt$camera=1.0000,1.0000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1.0000$background=4,5,6$color=1,2,3';
+        let urlParams4 = 'model=a.txt,b.txt$camera=1.0000,1.0000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1.0000$defaultcolor=1,2,3';
+        let urlParams5 = 'model=a.txt,b.txt$camera=1.0000,1.0000,1.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1.0000$backgroundcolor=4,5,6$defaultcolor=1,2,3';
         let parserLegacy = OV.CreateUrlParser (urlParamsLegacy);
         assert.deepStrictEqual (parserLegacy.GetModelUrls (), modelUrls);
         assert.deepStrictEqual (parserLegacy.GetCamera (), null);
         let parser1 = OV.CreateUrlParser (urlParams1);
         assert.deepStrictEqual (parser1.GetModelUrls (), modelUrls);
         assert.deepStrictEqual (parser1.GetCamera (), null);
-        assert.deepStrictEqual (parser1.GetColor (), null);
+        assert.deepStrictEqual (parser1.GetDefaultColor (), null);
         let parser2 = OV.CreateUrlParser (urlParams2);
         assert.deepStrictEqual (parser2.GetModelUrls (), null);
         assert.deepStrictEqual (parser2.GetCamera (), camera);
-        assert.deepStrictEqual (parser2.GetColor (), null);
+        assert.deepStrictEqual (parser2.GetDefaultColor (), null);
         let parser3 = OV.CreateUrlParser (urlParams3);
         assert.deepStrictEqual (parser3.GetModelUrls (), modelUrls);
         assert.deepStrictEqual (parser3.GetCamera (), camera);
-        assert.deepStrictEqual (parser3.GetColor (), null);
+        assert.deepStrictEqual (parser3.GetDefaultColor (), null);
         let parser4 = OV.CreateUrlParser (urlParams4);
         assert.deepStrictEqual (parser4.GetModelUrls (), modelUrls);
         assert.deepStrictEqual (parser4.GetCamera (), camera);
-        assert.deepStrictEqual (parser4.GetColor (), color);
+        assert.deepStrictEqual (parser4.GetDefaultColor (), color);
         let parser5 = OV.CreateUrlParser (urlParams5);
         assert.deepStrictEqual (parser5.GetModelUrls (), modelUrls);
         assert.deepStrictEqual (parser5.GetCamera (), camera);
-        assert.deepStrictEqual (parser5.GetColor (), color);
-        assert.deepStrictEqual (parser5.GetBackground (), background);
+        assert.deepStrictEqual (parser5.GetDefaultColor (), color);
+        assert.deepStrictEqual (parser5.GetBackgroundColor (), background);
     });
 });
diff --git a/website/o3dv/embed.js b/website/o3dv/embed.js
index 995c2ba..0fc3914 100644
--- a/website/o3dv/embed.js
+++ b/website/o3dv/embed.js
@@ -25,9 +25,9 @@ OV.Embed = class
                 this.viewer.SetBackgroundColor (background);
             }
             let settings = new OV.ImportSettings ();
-            let color = this.hashHandler.GetColorFromHash ();
-            if (color !== null) {
-                settings.defaultColor = color;
+            let defaultColor = this.hashHandler.GetDefaultColorFromHash ();
+            if (defaultColor !== null) {
+                settings.defaultColor = defaultColor;
             }            
             this.modelLoader.LoadFromUrlList (urls, settings);
             let hashParameters = OV.CreateModelUrlParameters (urls);
diff --git a/website/o3dv/hashhandler.js b/website/o3dv/hashhandler.js
index 5587b36..e74ee0d 100644
--- a/website/o3dv/hashhandler.js
+++ b/website/o3dv/hashhandler.js
@@ -49,13 +49,13 @@ OV.HashHandler = class
     GetBackgroundFromHash ()
     {
         let parser = OV.CreateUrlParser (this.GetHash ());
-        return parser.GetBackground ();
+        return parser.GetBackgroundColor ();
     }
 
-    GetColorFromHash ()
+    GetDefaultColorFromHash ()
     {
         let parser = OV.CreateUrlParser (this.GetHash ());
-        return parser.GetColor ();
+        return parser.GetDefaultColor ();
     }
 
     GetHash ()
diff --git a/website/o3dv/website.js b/website/o3dv/website.js
index 1dd53df..c96e914 100644
--- a/website/o3dv/website.js
+++ b/website/o3dv/website.js
@@ -205,9 +205,9 @@ OV.Website = class
             }
             let importSettings = new OV.ImportSettings ();
             importSettings.defaultColor = this.importSettings.defaultColor;
-            let color = this.hashHandler.GetColorFromHash ();
-            if (color !== null) {
-                importSettings.defaultColor = color;
+            let defaultColor = this.hashHandler.GetDefaultColorFromHash ();
+            if (defaultColor !== null) {
+                importSettings.defaultColor = defaultColor;
             }
             this.LoadModelFromUrlList (urls, importSettings);
         } else {