Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 264 vs 273 for /trunk/Source Code/Dynamics/Entities/Impostor.cpp

Diff revisions: vs.
  @@ -22,7 +22,7 @@
22 22 _dummy->getSceneNodeRenderState().setDrawState(false);
23 23 _dummy->setResolution(8);
24 24 _dummy->setRadius(radius);
25 - RenderStateBlockDescriptor dummyDesc(_dummy->getMaterial()->getRenderStateBlock(FINAL_STAGE).getDescriptor());
25 + RenderStateBlockDescriptor dummyDesc(GFX_DEVICE.getStateBlockDescriptor(_dummy->getMaterial()->getRenderStateBlock(FINAL_STAGE)));
26 26 dummyDesc.setFillMode(FILL_MODE_WIREFRAME);
27 27 _dummy->getMaterial()->setRenderStateBlock(dummyDesc, FINAL_STAGE);
28 28 }
  @@ -39,8 +39,8 @@
39 39 _dummy->renderInstance()->transform(node->getTransform());
40 40
41 41 _dummy->onDraw(node, gfx.getRenderStage());
42 - _dummy->getMaterial()->getShaderProgram()->bind();
43 - _dummy->getMaterial()->getShaderProgram()->Uniform("material",_dummy->getMaterial()->getMaterialMatrix());
42 + _dummy->getMaterial()->getShaderInfo().getProgram()->bind();
43 + _dummy->getMaterial()->getShaderInfo().getProgram()->Uniform("material",_dummy->getMaterial()->getMaterialMatrix());
44 44
45 45 gfx.renderInstance(_dummy->renderInstance());
46 46 }
  @@ -53,8 +53,8 @@
53 53 _dummy->renderInstance()->transform(transform);
54 54
55 55 _dummy->onDraw(nullptr, gfx.getRenderStage());
56 - _dummy->getMaterial()->getShaderProgram()->bind();
57 - _dummy->getMaterial()->getShaderProgram()->Uniform("material",_dummy->getMaterial()->getMaterialMatrix());
56 + _dummy->getMaterial()->getShaderInfo().getProgram()->bind();
57 + _dummy->getMaterial()->getShaderInfo().getProgram()->Uniform("material",_dummy->getMaterial()->getMaterialMatrix());
58 58
59 59 gfx.renderInstance(_dummy->renderInstance());
60 60 }