From 062c5daa03936126b1da22da068fa7eebdef4fe6 Mon Sep 17 00:00:00 2001 From: -=yb4f310 Date: Fri, 27 Oct 2017 09:32:28 +0200 Subject: [PATCH] default scene for renderer --- src/game-lib-d3-api-renderer.js | 8 ++++++++ src/game-lib-d3-renderer.js | 11 +++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/game-lib-d3-api-renderer.js b/src/game-lib-d3-api-renderer.js index d4f74c2..773d02b 100644 --- a/src/game-lib-d3-api-renderer.js +++ b/src/game-lib-d3-api-renderer.js @@ -17,6 +17,7 @@ * @param bufferScene * @param bufferCamera * @param renderTarget + * @param defaultScene * @constructor */ GameLib.D3.API.Renderer = function ( @@ -36,6 +37,7 @@ GameLib.D3.API.Renderer = function ( bufferScene, bufferCamera, renderTarget, + defaultScene, parentEntity ) { if (GameLib.Utils.UndefinedOrNull(id)) { @@ -122,6 +124,11 @@ GameLib.D3.API.Renderer = function ( } this.renderTarget = renderTarget; + if (GameLib.Utils.UndefinedOrNull(defaultScene)) { + defaultScene = null; + } + this.defaultScene = defaultScene; + if (GameLib.Utils.UndefinedOrNull(parentEntity)) { parentEntity = null; } @@ -155,6 +162,7 @@ GameLib.D3.API.Renderer.FromObject = function(objectComponent) { objectComponent.bufferScene, objectComponent.bufferCamera, objectComponent.renderTarget, + objectComponent.defaultScene, objectComponent.parentEntity ); }; diff --git a/src/game-lib-d3-renderer.js b/src/game-lib-d3-renderer.js index e413c2b..c9ad3e1 100644 --- a/src/game-lib-d3-renderer.js +++ b/src/game-lib-d3-renderer.js @@ -40,6 +40,7 @@ GameLib.D3.Renderer = function ( apiRenderer.bufferScene, apiRenderer.bufferCamera, apiRenderer.renderTarget, + apiRenderer.defaultScene, apiRenderer.parentEntity ); @@ -143,7 +144,8 @@ GameLib.D3.Renderer = function ( 'clippingPlanes': [GameLib.D3.Mesh.Plane], 'bufferScene' : GameLib.D3.Scene, '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.bufferCamera), GameLib.Utils.IdOrNull(this.renderTarget), + GameLib.Utils.IdOrNull(this.defaultScene), GameLib.Utils.IdOrNull(this.parentEntity) ); @@ -342,11 +345,11 @@ GameLib.D3.Renderer.prototype.render = function(delta) { if ( this.bufferScene && - this.bufferScene.loaded && + this.bufferScene.instance && this.bufferCamera && - this.bufferCamera.loaded && + this.bufferCamera.instance && this.renderTarget && - this.renderTarget.loaded + this.renderTarget.instance ) { /** * We have a buffer that should render to an offscreen render target