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

Fix featured property display

Browse Source 
Set correct blend mode for Themis on Mars
This commit is contained in:
Alexander Bock
2017-10-19 22:52:25 -04:00
parent 78aa164ccf
commit 4dacba868b
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scene/mars/mars.mod
+8 -4
View File
@@ -79,20 +79,24 @@ return {
},
{
Name = "Themis IR Day [Utah]",
FilePath = "map_service_configs/Utah/Themis_IR_Day.xml"
FilePath = "map_service_configs/Utah/Themis_IR_Day.xml",
BlendMode = "Color"
},
{
Name = "Themis IR Night [Utah]",
FilePath = "map_service_configs/Utah/Themis_IR_Night.xml"
FilePath = "map_service_configs/Utah/Themis_IR_Night.xml",
BlendMode = "Color"
},
{
Name = "Themis IR Day [AWS]",
FilePath = "map_service_configs/AWS/Themis_IR_Day.wms"
FilePath = "map_service_configs/AWS/Themis_IR_Day.wms",
BlendMode = "Color"
},
{
Name = "Themis IR Night [AWS]",
FilePath = "map_service_configs/AWS/Themis_IR_Night.wms"
FilePath = "map_service_configs/AWS/Themis_IR_Night.wms",
BlendMode = "Color"
}
},
Overlays = {
modules/imgui/src/gui.cpp
+2 -1
View File
@@ -49,7 +49,7 @@ const char* configurationFile = "imgui.ini";
//const char* GuiFont = "${FONTS}/ubuntu/Ubuntu-Regular.ttf";
const char* GuiFont = "${FONTS}/arimo/Arimo-Regular.ttf";
const float FontSize = 14.f;
const ImVec2 size = ImVec2(350, 500);
const ImVec2 size = ImVec2(500, 500);
//GLuint fontTex = 0;
// A VBO max size of 0 will cause a lazy instantiation of the buffer
@@ -385,6 +385,7 @@ void GUI::initialize() {
_globalProperty.initialize();
_globalProperty.setHasRegularProperties(true);
_featuredProperties.initialize();
_featuredProperties.setHasRegularProperties(true);
_virtualProperty.initialize();
_filePath.initialize();
#ifdef GLOBEBROWSING_USE_GDAL