Subversion Repository Public Repository

Divide-Framework

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

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

Diff revisions: vs.
  @@ -48,7 +48,7 @@
48 48 ResourceDescriptor skyboxTextures("SkyboxTextures");
49 49 skyboxTextures.setResourceName("skybox_1.jpg, skybox_2.jpg, skybox_3.jpg, skybox_4.jpg, skybox_5.jpg, skybox_6.jpg");
50 50 skyboxTextures.setResourceLocation(Paths::g_assetsLocation + Paths::g_imagesLocation);
51 - skyboxTextures.setEnumValue(to_const_uint(TextureType::TEXTURE_CUBE_MAP));
51 + skyboxTextures.setEnumValue(to_const_U32(TextureType::TEXTURE_CUBE_MAP));
52 52 skyboxTextures.setPropertyDescriptor<SamplerDescriptor>(skyboxSampler);
53 53 _skybox = CreateResource<Texture>(_parentCache, skyboxTextures);
54 54
  @@ -57,7 +57,7 @@
57 57 ResourceDescriptor skybox("SkyBox");
58 58 skybox.setFlag(true); // no default material;
59 59 skybox.setID(4); // resolution
60 - skybox.setEnumValue(to_uint(radius)); // radius
60 + skybox.setEnumValue(to_U32(radius)); // radius
61 61 _sky = CreateResource<Sphere3D>(_parentCache, skybox);
62 62 _sky->renderState().setDrawState(false);
63 63
  @@ -76,10 +76,10 @@
76 76 }
77 77
78 78 void Sky::postLoad(SceneGraphNode& sgn) {
79 - static const U32 normalMask = to_const_uint(SGNComponent::ComponentType::PHYSICS) |
80 - to_const_uint(SGNComponent::ComponentType::BOUNDS) |
81 - to_const_uint(SGNComponent::ComponentType::RENDERING) |
82 - to_const_uint(SGNComponent::ComponentType::NAVIGATION);
79 + static const U32 normalMask = to_const_U32(SGNComponent::ComponentType::PHYSICS) |
80 + to_const_U32(SGNComponent::ComponentType::BOUNDS) |
81 + to_const_U32(SGNComponent::ComponentType::RENDERING) |
82 + to_const_U32(SGNComponent::ComponentType::NAVIGATION);
83 83
84 84 assert(_sky != nullptr);
85 85
  @@ -91,7 +91,7 @@
91 91
92 92 _skybox->flushTextureState();
93 93 TextureData skyTextureData = _skybox->getData();
94 - skyTextureData.setHandleLow(to_const_uint(ShaderProgram::TextureUsage::UNIT0));
94 + skyTextureData.setHandleLow(to_const_U32(ShaderProgram::TextureUsage::UNIT0));
95 95 renderable->registerTextureDependency(skyTextureData);
96 96 }
97 97