Doni/ModelHandle
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename url parameters for default and background color.

Browse Source
This commit is contained in:
kovacsv 2021-07-11 15:44:22 +02:00
parent 46ef2c7a93
commit b063321a5b
8 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sandbox/embed_iframe.html
View File

@ -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>

4
sandbox/embed_selfhost_multiple.html
View File

@ -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;"

12
source/parameters/parameterlist.js
View File

@ -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);
}

16
source/viewer/domviewer.js
View File

@ -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;
}
}

20
test/tests/parameterlist_test.js
View File

@ -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);
});
});

6
website/o3dv/embed.js
View File

@ -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);

6
website/o3dv/hashhandler.js
View File

@ -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 ()

6
website/o3dv/website.js
View File

@ -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 {