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

OS X now doesn't crash for volumes

Browse Source 
- Fixed a few warnings
This commit is contained in:
Jonas Strandstedt
2014-11-05 17:11:27 +01:00
parent 673e0014be
commit f85e18dc18
24 changed files with 212 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rendering/renderablefieldlines.cpp
+5 -2
View File
@@ -218,7 +218,7 @@ void RenderableFieldlines::render(const RenderData& data) {
glm::mat4 transform = data.camera.viewProjectionMatrix();
glm::mat4 camTransform = data.camera.viewRotationMatrix();
psc relative = data.position - data.camera.position();
//psc relative = data.position - data.camera.position();
transform = transform*camTransform;
transform = glm::mat4(1.0);
@@ -315,7 +315,10 @@ std::vector<std::vector<LinePoint> > RenderableFieldlines::getFieldlinesData(std
// ------ CLASSIFICATION & COLOR -----------
hintsDictionary.getValue("Color", fieldlineColor);
hintsDictionary.getValue("Classification", classification);
}
} else {
// model unitialized!
assert(false);
}
KameleonWrapper kw(filename, model);
if (lorentz) {