Skip to content
Snippets Groups Projects
Commit e06f83b6 authored by Sandro Weber's avatar Sandro Weber
Browse files

[NRRPLT-2856] preparing for integration in ExDFrontend

Change-Id: I47f45aff568e548118b24e609da405bfcdfc06d8
parent 4dcc6add
No related branches found
No related tags found
No related merge requests found
...@@ -2,12 +2,16 @@ ...@@ -2,12 +2,16 @@
"name": "gz3d-hbp", "name": "gz3d-hbp",
"description": "3D rendering component of gzweb, modified for HBP", "description": "3D rendering component of gzweb, modified for HBP",
"version": "0.1.4", "version": "0.1.4",
"private": false, "private": true,
"repository": { "repository": {
"url": "git+ssh://bbpcode.epfl.ch/neurorobotics/gzweb", "url": "git+ssh://bbpcode.epfl.ch/neurorobotics/gzweb",
"type": "git" "type": "git"
}, },
"main": "gz3d/build/gz3d.js", "main": [
"gz3d/build/gz3d.js",
"gz3d/client/js/include/ColladaLoader.js",
"gz3d/client/js/include/ThreeBackwardsCompatibility.js"
],
"dependencies": { "dependencies": {
"angular": "~1.4.6", "angular": "~1.4.6",
"nodejs": "^0.10.0" "nodejs": "^0.10.0"
......
This diff is collapsed.
...@@ -117,17 +117,17 @@ GZ3D.MultiView.prototype.createView = function(name, displayParams, cameraParams ...@@ -117,17 +117,17 @@ GZ3D.MultiView.prototype.createView = function(name, displayParams, cameraParams
GZ3D.MultiView.prototype.createViewContainer = function(displayParams, name) GZ3D.MultiView.prototype.createViewContainer = function(displayParams, name)
{ {
if (!angular.isDefined(this.createRenderContainerCallback)) {
console.error('GZ3D.MultiView.createViewContainer() - no callback for creating view reference container defined');
return undefined;
}
// container div // container div
var viewContainer; var viewContainer;
if (name === GZ3D.MULTIVIEW_MAINVIEW_NAME) { if (name === GZ3D.MULTIVIEW_MAINVIEW_NAME) {
viewContainer = document.createElement('div'); viewContainer = document.createElement('div');
} else { } else {
viewContainer = this.createRenderContainerCallback(displayParams.adjustable, name); if (!angular.isDefined(this.createRenderContainerCallback)) {
console.error('GZ3D.MultiView.createViewContainer() - no callback for creating view reference container defined');
return undefined;
} else {
viewContainer = this.createRenderContainerCallback(displayParams.adjustable, name);
}
} }
if (!angular.isDefined(viewContainer)) { if (!angular.isDefined(viewContainer)) {
console.error('GZ3D.MultiView.createViewContainer() - could not create view container via callback'); console.error('GZ3D.MultiView.createViewContainer() - could not create view container via callback');
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment