Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 860 vs 863 for /trunk/Source Code/Environment/Sky/Sky.cpp

Diff revisions: vs.
  @@ -9,8 +9,8 @@
9 9
10 10 namespace Divide {
11 11
12 - Sky::Sky(ResourceCache& parentCache, const stringImpl& name, U32 diameter)
13 - : SceneNode(parentCache, name, SceneNodeType::TYPE_SKY),
12 + Sky::Sky(ResourceCache& parentCache, size_t descriptorHash, const stringImpl& name, U32 diameter)
13 + : SceneNode(parentCache, descriptorHash, name, SceneNodeType::TYPE_SKY),
14 14 _sky(nullptr),
15 15 _skyShader(nullptr),
16 16 _skyShaderPrePass(nullptr),
  @@ -33,7 +33,7 @@
33 33 {
34 34 }
35 35
36 - bool Sky::load(const DELEGATE_CBK<void, Resource_wptr>& onLoadCallback) {
36 + bool Sky::load(const DELEGATE_CBK<void, CachedResource_wptr>& onLoadCallback) {
37 37 if (_sky != nullptr) {
38 38 return false;
39 39 }
  @@ -72,7 +72,7 @@
72 72 _boundingBox.set(vec3<F32>(-radius), vec3<F32>(radius));
73 73 Console::printfn(Locale::get(_ID("CREATE_SKY_RES_OK")));
74 74
75 - return Resource::load(onLoadCallback);
75 + return SceneNode::load(onLoadCallback);
76 76 }
77 77
78 78 void Sky::postLoad(SceneGraphNode& sgn) {