Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 892 vs 893 for /trunk/Source Code/Platform/Video/IMPrimitive.cpp

Diff revisions: vs.
  @@ -12,8 +12,6 @@
12 12 _forceWireframe(false),
13 13 _paused(true),
14 14 _texture(nullptr),
15 - _drawShader(nullptr),
16 - _stateHash(0),
17 15 _primitivesGenerated(0)
18 16 {
19 17 }
  @@ -24,11 +22,9 @@
24 22 }
25 23
26 24 void IMPrimitive::clear() {
27 - stateHash(0);
28 25 clearRenderStates();
29 26 _worldMatrix.identity();
30 27 _texture = nullptr;
31 - _drawShader = nullptr;
32 28 }
33 29
34 30 void IMPrimitive::fromBox(const vec3<F32>& min, const vec3<F32>& max, const vec4<U8>& colour) {
  @@ -199,8 +195,8 @@
199 195 }
200 196 }
201 197
202 - void IMPrimitive::drawShader(const ShaderProgram_ptr& shaderProgram) {
203 - _drawShader = shaderProgram;
198 + void IMPrimitive::pipeline(const Pipeline& pipeline) {
199 + _pipeline = pipeline;
204 200 }
205 201
206 202 };