Reenable digital universe on default

Fix refresh rate setting in configuration_helper
This commit is contained in:
Alexander Bock
2017-12-18 11:58:22 -05:00
parent d26cc999e9
commit 0b0ad54028
4 changed files with 6 additions and 5 deletions
+1 -1
View File
@@ -133,7 +133,7 @@ return {
-- "satellites",
"grids",
-- "digitaluniverse",
"digitaluniverse",
"stars/digitaluniverse",
"milkyway/digitaluniverse"
}
@@ -6,6 +6,7 @@ return {
Renderable = {
Type = "RenderableStars",
File = "speck/stars.speck",
-- File = "speck/stars_new.speck",
Texture = "textures/halo.png",
ColorMap = "colorbv.cmap"
},
+3 -3
View File
@@ -65,9 +65,9 @@ class TouchMarker : public properties::PropertyOwner {
std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
GLuint _quad;
GLuint _vertexPositionBuffer;
int _numFingers;
GLuint _quad = 0;
GLuint _vertexPositionBuffer = 0;
int _numFingers = 0;
};
} // openspace namespace
+1 -1
View File
@@ -290,7 +290,7 @@ function generateSettings(arg)
local refresh = ""
if arg["refreshRate"] then
refresh = "refreshRate=" .. arg["refreshRate"] .. " "
refresh = "refreshRate=\"" .. arg["refreshRate"] .. "\" "
end