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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
kovacsv 2021-10-16 12:00:05 +02:00
commit 3d11217c78
13 changed files with 174 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sandbox/embed_selfhost_errors.html
View File

@ -33,6 +33,7 @@
<script type="text/javascript" src="../source/model/element.js"></script>
<script type="text/javascript" src="../source/model/mesh.js"></script>
<script type="text/javascript" src="../source/model/meshbuffer.js"></script>
<script type="text/javascript" src="../source/model/node.js"></script>
<script type="text/javascript" src="../source/model/model.js"></script>
<script type="text/javascript" src="../source/model/topology.js"></script>
<script type="text/javascript" src="../source/model/modelutils.js"></script>

1
sandbox/embed_selfhost_externallibs.html
View File

@ -33,6 +33,7 @@
<script type="text/javascript" src="../source/model/element.js"></script>
<script type="text/javascript" src="../source/model/mesh.js"></script>
<script type="text/javascript" src="../source/model/meshbuffer.js"></script>
<script type="text/javascript" src="../source/model/node.js"></script>
<script type="text/javascript" src="../source/model/model.js"></script>
<script type="text/javascript" src="../source/model/topology.js"></script>
<script type="text/javascript" src="../source/model/modelutils.js"></script>

1
sandbox/embed_selfhost_fullscreen.html
View File

@ -32,6 +32,7 @@
<script type="text/javascript" src="../source/model/element.js"></script>
<script type="text/javascript" src="../source/model/mesh.js"></script>
<script type="text/javascript" src="../source/model/meshbuffer.js"></script>
<script type="text/javascript" src="../source/model/node.js"></script>
<script type="text/javascript" src="../source/model/model.js"></script>
<script type="text/javascript" src="../source/model/topology.js"></script>
<script type="text/javascript" src="../source/model/modelutils.js"></script>

1
sandbox/embed_selfhost_manual.html
View File

@ -33,6 +33,7 @@
<script type="text/javascript" src="../source/model/element.js"></script>
<script type="text/javascript" src="../source/model/mesh.js"></script>
<script type="text/javascript" src="../source/model/meshbuffer.js"></script>
<script type="text/javascript" src="../source/model/node.js"></script>
<script type="text/javascript" src="../source/model/model.js"></script>
<script type="text/javascript" src="../source/model/topology.js"></script>
<script type="text/javascript" src="../source/model/modelutils.js"></script>

1
sandbox/embed_selfhost_multiple.html
View File

@ -33,6 +33,7 @@
<script type="text/javascript" src="../source/model/element.js"></script>
<script type="text/javascript" src="../source/model/mesh.js"></script>
<script type="text/javascript" src="../source/model/meshbuffer.js"></script>
<script type="text/javascript" src="../source/model/node.js"></script>
<script type="text/javascript" src="../source/model/model.js"></script>
<script type="text/javascript" src="../source/model/topology.js"></script>
<script type="text/javascript" src="../source/model/modelutils.js"></script>

1
sandbox/embed_selfhost_single.html
View File

@ -32,6 +32,7 @@
<script type="text/javascript" src="../source/model/element.js"></script>
<script type="text/javascript" src="../source/model/mesh.js"></script>
<script type="text/javascript" src="../source/model/meshbuffer.js"></script>
<script type="text/javascript" src="../source/model/node.js"></script>
<script type="text/javascript" src="../source/model/model.js"></script>
<script type="text/javascript" src="../source/model/topology.js"></script>
<script type="text/javascript" src="../source/model/modelutils.js"></script>

1
sandbox/embed_selfhost_single_scroll.html
View File

@ -32,6 +32,7 @@
<script type="text/javascript" src="../source/model/element.js"></script>
<script type="text/javascript" src="../source/model/mesh.js"></script>
<script type="text/javascript" src="../source/model/meshbuffer.js"></script>
<script type="text/javascript" src="../source/model/node.js"></script>
<script type="text/javascript" src="../source/model/model.js"></script>
<script type="text/javascript" src="../source/model/topology.js"></script>
<script type="text/javascript" src="../source/model/modelutils.js"></script>

56
source/model/node.js Normal file
View File

@ -0,0 +1,56 @@
OV.Node = class
{
constructor ()
{
this.parent = null;
this.name = '';
this.childNodes = [];
this.meshIndices = [];
}
GetParent ()
{
return this.parent;
}
GetName ()
{
return this.name;
}
SetName (name)
{
this.name = name;
}
AddChildNode (node)
{
node.parent = this;
this.childNodes.push (node);
return this.childNodes.length - 1;
}
GetChildNodes ()
{
return this.childNodes;
}
AddMeshIndex (index)
{
this.meshIndices.push (index);
return this.meshIndices.length - 1;
}
GetMeshIndices ()
{
return this.meshIndices;
}
EnumerateChildren (processor)
{
for (const childNode of this.childNodes) {
processor (childNode);
childNode.EnumerateChildren (processor);
}
}
};

60
test/tests/node_test.js Normal file
View File

@ -0,0 +1,60 @@
var assert = require ('assert');
describe ('Node', function() {
it ('Default Initialization', function () {
let node = new OV.Node ();
assert.strictEqual (node.GetName (), '');
assert.deepStrictEqual (node.GetChildNodes (), []);
assert.deepStrictEqual (node.GetMeshIndices (), []);
});
it ('Set Name', function () {
let node = new OV.Node ();
node.SetName ('New Name');
assert.strictEqual (node.GetName (), 'New Name');
});
it ('Add Mesh Indices', function () {
let node = new OV.Node ();
node.AddMeshIndex (0);
node.AddMeshIndex (4);
node.AddMeshIndex (8);
assert.deepStrictEqual (node.GetMeshIndices (), [0, 4, 8]);
});
it ('Add Child Node', function () {
let node = new OV.Node ();
let child1 = new OV.Node ();
let child2 = new OV.Node ();
child1.SetName ('Child 1');
child2.SetName ('Child 2');
node.AddChildNode (child1);
node.AddChildNode (child2);
assert.strictEqual (node.GetChildNodes ().length, 2);
assert.strictEqual (node.GetChildNodes ()[0].GetName (), 'Child 1');
assert.strictEqual (node.GetChildNodes ()[1].GetName (), 'Child 2');
assert.strictEqual (node.GetChildNodes ()[0].GetParent (), node);
assert.strictEqual (node.GetChildNodes ()[1].GetParent (), node);
});
it ('Recursive Enumeration', function () {
let node = new OV.Node ();
let child1 = new OV.Node ();
let child2 = new OV.Node ();
let child11 = new OV.Node ();
let child12 = new OV.Node ();
node.AddChildNode (child1);
node.AddChildNode (child2);
child1.AddChildNode (child11);
child1.AddChildNode (child12);
let enumerated = [];
node.EnumerateChildren ((child) => {
enumerated.push (child);
});
assert.deepStrictEqual (enumerated, [child1, child11, child12, child2]);
});
});

1
tools/config.json
View File

@ -29,6 +29,7 @@
"source/model/element.js",
"source/model/mesh.js",
"source/model/meshbuffer.js",
"source/model/node.js",
"source/model/model.js",
"source/model/topology.js",
"source/model/modelutils.js",

1
website/embed.html
View File

@ -42,6 +42,7 @@
<script type="text/javascript" src="../source/model/element.js"></script>
<script type="text/javascript" src="../source/model/mesh.js"></script>
<script type="text/javascript" src="../source/model/meshbuffer.js"></script>
<script type="text/javascript" src="../source/model/node.js"></script>
<script type="text/javascript" src="../source/model/model.js"></script>
<script type="text/javascript" src="../source/model/topology.js"></script>
<script type="text/javascript" src="../source/model/modelutils.js"></script>

1
website/index.html
View File

@ -42,6 +42,7 @@
<script type="text/javascript" src="../source/model/element.js"></script>
<script type="text/javascript" src="../source/model/mesh.js"></script>
<script type="text/javascript" src="../source/model/meshbuffer.js"></script>
<script type="text/javascript" src="../source/model/node.js"></script>
<script type="text/javascript" src="../source/model/model.js"></script>
<script type="text/javascript" src="../source/model/topology.js"></script>
<script type="text/javascript" src="../source/model/modelutils.js"></script>

81
website/o3dv/js/website.js
View File

@ -1,3 +1,10 @@
OV.WebsiteUIState =
{
Intro : 1,
Model : 2,
Loading : 3
};
OV.Website = class
{
constructor (parameters)
@ -77,22 +84,29 @@ OV.Website = class
this.viewer.Resize (contentWidth, contentHeight);
}
ShowViewer (show)
SetUIState (uiState)
{
if (show) {
this.parameters.mainDiv.show ();
this.Resize ();
} else {
let onlyOnModel = $('.only_on_model');
if (uiState === OV.WebsiteUIState.Intro) {
this.parameters.introDiv.show ();
this.parameters.mainDiv.hide ();
onlyOnModel.hide ();
} else if (uiState === OV.WebsiteUIState.Model) {
this.parameters.introDiv.hide ();
this.parameters.mainDiv.show ();
onlyOnModel.show ();
} else if (uiState === OV.WebsiteUIState.Loading) {
this.parameters.introDiv.hide ();
this.parameters.mainDiv.hide ();
onlyOnModel.hide ();
}
this.Resize ();
}
ClearModel ()
{
this.HidePopups ();
this.model = null;
this.parameters.introDiv.hide ();
this.ShowViewer (false);
this.viewer.Clear ();
this.navigator.Clear ();
}
@ -109,7 +123,6 @@ OV.Website = class
OnModelFinished (importResult, threeMeshes)
{
this.model = importResult.model;
this.ShowViewer (true);
this.viewer.AddMeshes (threeMeshes);
this.viewer.SetUpVector (importResult.upVector, false);
this.navigator.FillTree (importResult);
@ -205,7 +218,7 @@ OV.Website = class
this.LoadModelFromUrlList (urls, importSettings);
} else {
this.ClearModel ();
this.parameters.introDiv.show ();
this.SetUIState (OV.WebsiteUIState.Intro);
}
}
@ -316,24 +329,24 @@ OV.Website = class
'assets/envmaps/fishermans_bastion/posz.jpg',
'assets/envmaps/fishermans_bastion/negz.jpg'
]);
this.ShowViewer (false);
this.SetUIState (OV.WebsiteUIState.Intro);
}
InitToolbar ()
{
function AddButton (toolbar, eventHandler, imageName, imageTitle, onlyFullWidth, onClick)
function AddButton (toolbar, eventHandler, imageName, imageTitle, extraClass, onClick)
{
let button = toolbar.AddImageButton (imageName, imageTitle, () => {
eventHandler.HandleEvent ('toolbar_clicked', { item : imageName });
onClick ();
});
if (onlyFullWidth) {
button.AddClass ('only_full_width');
if (extraClass !== null) {
button.AddClass (extraClass);
}
return button;
}
function AddRadioButton (toolbar, eventHandler, imageNames, imageTitles, selectedIndex, onlyFullWidth, onClick)
function AddRadioButton (toolbar, eventHandler, imageNames, imageTitles, selectedIndex, extraClass, onClick)
{
let imageData = [];
for (let i = 0; i < imageNames.length; i++) {
@ -348,57 +361,57 @@ OV.Website = class
eventHandler.HandleEvent ('toolbar_clicked', { item : imageNames[buttonIndex] });
onClick (buttonIndex);
});
if (onlyFullWidth) {
if (extraClass !== null) {
for (let i = 0; i < buttons.length; i++) {
let button = buttons[i];
button.AddClass ('only_full_width');
button.AddClass (extraClass);
}
}
}
function AddSeparator (toolbar, onlyFullWidth)
function AddSeparator (toolbar, extraClass)
{
let separator = toolbar.AddSeparator ();
if (onlyFullWidth) {
separator.addClass ('only_full_width');
if (extraClass) {
separator.addClass (extraClass);
}
}
let importer = this.modelLoader.GetImporter ();
AddButton (this.toolbar, this.eventHandler, 'open', 'Open model from your device', false, () => {
AddButton (this.toolbar, this.eventHandler, 'open', 'Open model from your device', null, () => {
this.OpenFileBrowserDialog ();
});
AddButton (this.toolbar, this.eventHandler, 'open_url', 'Open model from a url', false, () => {
AddButton (this.toolbar, this.eventHandler, 'open_url', 'Open model from a url', null, () => {
this.dialog = OV.ShowOpenUrlDialog ((urls) => {
if (urls.length > 0) {
this.hashHandler.SetModelFilesToHash (urls);
}
});
});
AddSeparator (this.toolbar);
AddButton (this.toolbar, this.eventHandler, 'fit', 'Fit model to window', false, () => {
AddSeparator (this.toolbar, 'only_on_model');
AddButton (this.toolbar, this.eventHandler, 'fit', 'Fit model to window', 'only_on_model', () => {
this.FitModelToWindow (false);
});
AddButton (this.toolbar, this.eventHandler, 'up_y', 'Set Y axis as up vector', false, () => {
AddButton (this.toolbar, this.eventHandler, 'up_y', 'Set Y axis as up vector', 'only_on_model', () => {
this.viewer.SetUpVector (OV.Direction.Y, true);
});
AddButton (this.toolbar, this.eventHandler, 'up_z', 'Set Z axis as up vector', false, () => {
AddButton (this.toolbar, this.eventHandler, 'up_z', 'Set Z axis as up vector', 'only_on_model', () => {
this.viewer.SetUpVector (OV.Direction.Z, true);
});
AddButton (this.toolbar, this.eventHandler, 'flip', 'Flip up vector', false, () => {
AddButton (this.toolbar, this.eventHandler, 'flip', 'Flip up vector', 'only_on_model', () => {
this.viewer.FlipUpVector ();
});
AddSeparator (this.toolbar);
AddRadioButton (this.toolbar, this.eventHandler, ['fix_up_on', 'fix_up_off'], ['Fixed up vector', 'Free orbit'], 0, false, (buttonIndex) => {
AddSeparator (this.toolbar, 'only_on_model');
AddRadioButton (this.toolbar, this.eventHandler, ['fix_up_on', 'fix_up_off'], ['Fixed up vector', 'Free orbit'], 0, 'only_on_model', (buttonIndex) => {
if (buttonIndex === 0) {
this.viewer.SetFixUpVector (true);
} else if (buttonIndex === 1) {
this.viewer.SetFixUpVector (false);
}
});
AddSeparator (this.toolbar, true);
AddButton (this.toolbar, this.eventHandler, 'export', 'Export model', true, () => {
AddSeparator (this.toolbar, 'only_full_width only_on_model');
AddButton (this.toolbar, this.eventHandler, 'export', 'Export model', 'only_full_width only_on_model', () => {
let exportDialog = new OV.ExportDialog ({
onDialog : (dialog) => {
this.dialog = dialog;
@ -406,7 +419,7 @@ OV.Website = class
});
exportDialog.Show (this.model, this.viewer);
});
AddButton (this.toolbar, this.eventHandler, 'share', 'Share model', true, () => {
AddButton (this.toolbar, this.eventHandler, 'share', 'Share model', 'only_full_width only_on_model', () => {
this.dialog = OV.ShowSharingDialog (importer, this.settings, this.viewer.GetCamera ());
});
@ -446,12 +459,14 @@ OV.Website = class
onStart : () =>
{
this.ClearModel ();
this.SetUIState (OV.WebsiteUIState.Loading);
},
onFinish : (importResult, threeMeshes) =>
{
this.OnModelFinished (importResult, threeMeshes);
let importedExtension = OV.GetFileExtension (importResult.mainFile);
this.eventHandler.HandleEvent ('model_loaded', { extension : importedExtension });
this.SetUIState (OV.WebsiteUIState.Model);
},
onRender : () =>
{
@ -475,6 +490,7 @@ OV.Website = class
reason : reason,
extensions : extensions
});
this.SetUIState (OV.WebsiteUIState.Intro);
}
});
}
@ -487,8 +503,7 @@ OV.Website = class
eventHandler.HandleEvent ('sidebar_clicked', { item : sidebarPanel.image });
onClick ();
});
button.AddClass ('only_full_width');
button.AddClass ('right');
button.AddClass ('only_full_width only_on_model right');
return button;
}