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/Scenes/Scene.cpp

Diff revisions: vs.
  @@ -29,6 +29,7 @@
29 29
30 30 #include "Dynamics/Entities/Units/Headers/Player.h"
31 31
32 + #include "Platform/File/Headers/FileManagement.h"
32 33 #include "Platform/Video/Headers/IMPrimitive.h"
33 34 #include "Platform/Video/Headers/RenderStateBlock.h"
34 35
  @@ -88,7 +89,10 @@
88 89 RenderStateBlock primitiveDescriptor;
89 90 _linesPrimitive = _context.gfx().newIMP();
90 91 _linesPrimitive->name("LinesRayPick");
91 - _linesPrimitive->stateHash(primitiveDescriptor.getHash());
92 + PipelineDescriptor pipeDesc;
93 + pipeDesc._stateHash = primitiveDescriptor.getHash();
94 +
95 + _linesPrimitive->pipeline(_context.gfx().newPipeline(pipeDesc));
92 96 _linesPrimitive->paused(true);
93 97 } else {
94 98 _linesPrimitive = nullptr;
  @@ -740,7 +744,7 @@
740 744 }
741 745
742 746 bool Scene::unload() {
743 - // prevent double unload calls
747 + // prevent double unload calls%
744 748 if (!checkLoadFlag()) {
745 749 return false;
746 750 }