mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-14 17:40:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/NewAtmosphere

Browse Source
This commit is contained in:
Jonathas Costa
2017-12-18 12:21:08 -05:00
parent c7a784f01e 0b0ad54028
commit 5ad7fa94f3
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/scene/stars/digitaluniverse/digitaluniverse.mod
View File

@@ -6,6 +6,7 @@ return {
Renderable = {
Type = "RenderableStars",
File = "speck/stars.speck",
-- File = "speck/stars_new.speck",
Texture = "textures/halo.png",
ColorMap = "colorbv.cmap"
},

2
ext/sgct

Submodule ext/sgct updated: a13b539088...81d1fe53b2

6
modules/touch/include/touchmarker.h
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

2
scripts/configuration_helper.lua
View File

@@ -290,7 +290,7 @@ function generateSettings(arg)
local refresh = ""
if arg["refreshRate"] then
refresh = "refreshRate=" .. arg["refreshRate"] .. " "
refresh = "refreshRate=\"" .. arg["refreshRate"] .. "\" "
end