default scene for renderer

beta.r3js.org
-=yb4f310 2017-10-27 09:32:28 +02:00
parent 724647f8a6
commit 062c5daa03
2 changed files with 15 additions and 4 deletions

View File

@ -17,6 +17,7 @@
* @param bufferScene * @param bufferScene
* @param bufferCamera * @param bufferCamera
* @param renderTarget * @param renderTarget
* @param defaultScene
* @constructor * @constructor
*/ */
GameLib.D3.API.Renderer = function ( GameLib.D3.API.Renderer = function (
@ -36,6 +37,7 @@ GameLib.D3.API.Renderer = function (
bufferScene, bufferScene,
bufferCamera, bufferCamera,
renderTarget, renderTarget,
defaultScene,
parentEntity parentEntity
) { ) {
if (GameLib.Utils.UndefinedOrNull(id)) { if (GameLib.Utils.UndefinedOrNull(id)) {
@ -122,6 +124,11 @@ GameLib.D3.API.Renderer = function (
} }
this.renderTarget = renderTarget; this.renderTarget = renderTarget;
if (GameLib.Utils.UndefinedOrNull(defaultScene)) {
defaultScene = null;
}
this.defaultScene = defaultScene;
if (GameLib.Utils.UndefinedOrNull(parentEntity)) { if (GameLib.Utils.UndefinedOrNull(parentEntity)) {
parentEntity = null; parentEntity = null;
} }
@ -155,6 +162,7 @@ GameLib.D3.API.Renderer.FromObject = function(objectComponent) {
objectComponent.bufferScene, objectComponent.bufferScene,
objectComponent.bufferCamera, objectComponent.bufferCamera,
objectComponent.renderTarget, objectComponent.renderTarget,
objectComponent.defaultScene,
objectComponent.parentEntity objectComponent.parentEntity
); );
}; };

View File

@ -40,6 +40,7 @@ GameLib.D3.Renderer = function (
apiRenderer.bufferScene, apiRenderer.bufferScene,
apiRenderer.bufferCamera, apiRenderer.bufferCamera,
apiRenderer.renderTarget, apiRenderer.renderTarget,
apiRenderer.defaultScene,
apiRenderer.parentEntity apiRenderer.parentEntity
); );
@ -143,7 +144,8 @@ GameLib.D3.Renderer = function (
'clippingPlanes': [GameLib.D3.Mesh.Plane], 'clippingPlanes': [GameLib.D3.Mesh.Plane],
'bufferScene' : GameLib.D3.Scene, 'bufferScene' : GameLib.D3.Scene,
'bufferCamera' : GameLib.D3.Camera, 'bufferCamera' : GameLib.D3.Camera,
'renderTarget' : GameLib.D3.RenderTarget 'renderTarget' : GameLib.D3.RenderTarget,
'defaultScene' : GameLib.D3.Scene
} }
); );
@ -294,6 +296,7 @@ GameLib.D3.Renderer.prototype.toApiObject = function() {
GameLib.Utils.IdOrNull(this.bufferScene), GameLib.Utils.IdOrNull(this.bufferScene),
GameLib.Utils.IdOrNull(this.bufferCamera), GameLib.Utils.IdOrNull(this.bufferCamera),
GameLib.Utils.IdOrNull(this.renderTarget), GameLib.Utils.IdOrNull(this.renderTarget),
GameLib.Utils.IdOrNull(this.defaultScene),
GameLib.Utils.IdOrNull(this.parentEntity) GameLib.Utils.IdOrNull(this.parentEntity)
); );
@ -342,11 +345,11 @@ GameLib.D3.Renderer.prototype.render = function(delta) {
if ( if (
this.bufferScene && this.bufferScene &&
this.bufferScene.loaded && this.bufferScene.instance &&
this.bufferCamera && this.bufferCamera &&
this.bufferCamera.loaded && this.bufferCamera.instance &&
this.renderTarget && this.renderTarget &&
this.renderTarget.loaded this.renderTarget.instance
) { ) {
/** /**
* We have a buffer that should render to an offscreen render target * We have a buffer that should render to an offscreen render target