Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 943 vs 948 for /trunk/Source Code/Environment/Sky/Sky.cpp

Diff revisions: vs.
  @@ -102,8 +102,10 @@
102 102 SceneNode::postLoad(sgn);
103 103 }
104 104
105 - bool Sky::onRender(const RenderStagePass& renderStagePass) {
106 - return _sky->onRender(renderStagePass);
105 + bool Sky::onRender(SceneGraphNode& sgn,
106 + const SceneRenderState& sceneRenderState,
107 + const RenderStagePass& renderStagePass) {
108 + return _sky->onRender(sgn, sceneRenderState, renderStagePass);
107 109 }
108 110
109 111 void Sky::buildDrawCommands(SceneGraphNode& sgn,
  @@ -119,10 +121,10 @@
119 121
120 122 GFX::DrawCommand drawCommand;
121 123 drawCommand._drawCommands.push_back(cmd);
122 - GFX::AddDrawCommands(pkgInOut.commands(), drawCommand);
124 + pkgInOut.addDrawCommand(drawCommand);
123 125
124 - const vectorImpl<Pipeline*>& pipelines = pkgInOut.commands().getPipelines();
125 - PipelineDescriptor pipeDesc = pipelines.front()->toDescriptor();
126 + const Pipeline& pipeline = pkgInOut.pipeline(1);
127 + PipelineDescriptor pipeDesc = pipeline.toDescriptor();
126 128 if (renderStagePass.pass() == RenderPassType::DEPTH_PASS) {
127 129 pipeDesc._stateHash = _skyboxRenderStateHashPrePass;
128 130 pipeDesc._shaderProgram = _skyShaderPrePass;
  @@ -133,7 +135,7 @@
133 135 pipeDesc._shaderProgram = _skyShader;
134 136 }
135 137
136 - pipelines.front()->fromDescriptor(pipeDesc);
138 + pkgInOut.pipeline(1, _context.newPipeline(pipeDesc));
137 139
138 140 SceneNode::buildDrawCommands(sgn, renderStagePass, pkgInOut);
139 141 }