mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-12 06:19:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Small changes in Imageplane color and AssetLoader

Browse Source
This commit is contained in:
Alexander Bock
2018-01-01 09:52:44 -05:00
parent edc250deb8
commit ebf99b3d0d
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/base/shaders/imageplane_fs.glsl
+1 -1
View File
@@ -36,7 +36,7 @@ Fragment getFragment() {
frag.color = texture(texture1, vs_st);
}
else {
frag.color = vec4(0.8);
frag.color = vec4(0.1, 0.1, 0.1, 1.0);
}
frag.depth = vs_screenSpaceDepth;
src/scene/assetloader.cpp
+8 -10
View File
@@ -88,11 +88,9 @@ namespace {
namespace openspace {
AssetLoader::AssetLoader(
ghoul::lua::LuaState& luaState,
SynchronizationWatcher* syncWatcher,
std::string assetRootDirectory
)
AssetLoader::AssetLoader(ghoul::lua::LuaState& luaState,
SynchronizationWatcher* syncWatcher,
std::string assetRootDirectory)
: _rootAsset(std::make_shared<Asset>(this, syncWatcher))
, _synchronizationWatcher(syncWatcher)
, _assetRootDirectory(assetRootDirectory)
@@ -694,7 +692,7 @@ void AssetLoader::addLuaDependencyTable(Asset* dependant, Asset* dependency) {
}
void AssetLoader::addAssetListener(AssetListener* listener) {
const auto it = std::find(
auto it = std::find(
_assetListeners.begin(),
_assetListeners.end(),
listener
@@ -714,7 +712,7 @@ void AssetLoader::removeAssetListener(AssetListener* listener) {
}
void AssetLoader::assetStateChanged(std::shared_ptr<Asset> asset, Asset::State state) {
for (auto& listener : _assetListeners) {
for (AssetListener* listener : _assetListeners) {
listener->assetStateChanged(asset, state);
}
}
@@ -722,7 +720,7 @@ void AssetLoader::assetStateChanged(std::shared_ptr<Asset> asset, Asset::State s
void AssetLoader::assetRequested(std::shared_ptr<Asset> parent,
std::shared_ptr<Asset> child)
{
for (auto& listener : _assetListeners) {
for (AssetListener* listener : _assetListeners) {
listener->assetRequested(parent, child);
}
}
@@ -730,9 +728,9 @@ void AssetLoader::assetRequested(std::shared_ptr<Asset> parent,
void AssetLoader::assetUnrequested(std::shared_ptr<Asset> parent,
std::shared_ptr<Asset> child)
{
for (auto& listener : _assetListeners) {
for (AssetListener* listener : _assetListeners) {
listener->assetUnrequested(parent, child);
}
}
}
} // namespace openspace