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

No crash on render, but not rendering

Browse Source
This commit is contained in:
Jonathan Fransson
2019-04-10 17:41:30 -06:00
parent 71881c59e1
commit 986176af56
3 changed files with 24 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/assets/spaceDebris.scene
+1 -1
View File
@@ -9,7 +9,7 @@ asset.require('scene/solarsystem/planets/earth/earth')
--assetHelper.requestAll(asset, 'scene/digitaluniverse')
-- Load default key bindings applicable to most scenes
asset.require('util/default_keybindings')
--asset.require('util/default_dashboard')
asset.require('util/default_dashboard')
--asset.require('util/default_joystick')
asset.require('util/webgui')
modules/space/rendering/renderablesatellites.cpp
+20 -63
View File
@@ -604,42 +604,26 @@ void RenderableSatellites::initializeGL() {
);
}
);
<<<<<<< HEAD
/*
_uniformCache.opacity = _programObject->uniformLocation("opacity");
_uniformCache.modelView = _programObject->uniformLocation("modelViewTransform");
_uniformCache.projection = _programObject->uniformLocation("projectionTransform");
_uniformCache.color = _programObject->uniformLocation("color");
_uniformCache.useLineFade = _programObject->uniformLocation("useLineFade");
_uniformCache.lineFade = _programObject->uniformLocation("lineFade");
=======
// _uniformCache.opacity = _programObject->uniformLocation("opacity");
// _uniformCache.modelView = _programObject->uniformLocation("modelViewTransform");
// _uniformCache.projection = _programObject->uniformLocation("projectionTransform");
// _uniformCache.color = _programObject->uniformLocation("color");
// _uniformCache.useLineFade = _programObject->uniformLocation("useLineFade");
// _uniformCache.lineFade = _programObject->uniformLocation("lineFade");
>>>>>>> e4734ae0b3148cae1f230b00570b5e8c723d5b4b
setRenderBin(Renderable::RenderBin::Overlay);
*/
}
void RenderableSatellites::deinitializeGL() {
SpaceModule::ProgramObjectManager.release(ProgramName);
<<<<<<< HEAD
glDeleteBuffers(1, &_vertexBuffer);
glDeleteBuffers(1, &_indexBuffer);
glDeleteVertexArrays(1, &_vertexArray);
=======
// glDeleteBuffers(1, &_vertexBuffer);
// glDeleteBuffers(1, &_indexBuffer);
// glDeleteVertexArrays(1, &_vertexArray);
>>>>>>> e4734ae0b3148cae1f230b00570b5e8c723d5b4b
}
@@ -652,9 +636,9 @@ bool RenderableSatellites::isReady() const {
void RenderableSatellites::update(const UpdateData&) {}
void RenderableSatellites::render(const RenderData& data, RendererTasks&) {
<<<<<<< HEAD
/*
_programObject->activate();
_programObject->setUniform(_uniformCache.opacity, _opacity);
glm::dmat4 modelTransform =
@@ -666,59 +650,32 @@ void RenderableSatellites::render(const RenderData& data, RendererTasks&) {
_uniformCache.modelView,
data.camera.combinedViewMatrix() * modelTransform
);
_programObject->setUniform(_uniformCache.projection, data.camera.projectionMatrix());
_programObject->setUniform(_uniformCache.color, _appearance.lineColor);
//_programObject->setUniform(_uniformCache.useLineFade, _appearance.useLineFade);
_programObject->setUniform(_uniformCache.useLineFade, _appearance.useLineFade);
if (_appearance.useLineFade) {
_programObject->setUniform(_uniformCache.lineFade, _appearance.lineFade);
}
//if (_appearance.useLineFade) {
// _programObject->setUniform(_uniformCache.lineFade, _appearance.lineFade);
//}
glDepthMask(false);
//glBlendFunc(GL_SRC_ALPHA, GL_ONE);
glBlendFunc(GL_SRC_ALPHA, GL_ONE);
// Crashes in here
glBindVertexArray(_vertexArray);
glDrawElements(GL_LINES,
static_cast<unsigned int>(_indexBufferData.size()),
GL_UNSIGNED_INT,
0);
//glDrawElements(GL_LINES,
// static_cast<GLsizei>(_indexBufferData.size()),
// GL_UNSIGNED_INT,
// 0);
glDrawArrays(GL_LINES,
0,
static_cast<unsigned int>(_indexBufferData.size()));
glBindVertexArray(0);
_programObject->deactivate();
*/
=======
// _programObject->activate();
// _programObject->setUniform(_uniformCache.opacity, _opacity);
// glm::dmat4 modelTransform =
// glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
// glm::dmat4(data.modelTransform.rotation) *
// glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
// _programObject->setUniform(
// _uniformCache.modelView,
// data.camera.combinedViewMatrix() * modelTransform
// );
// _programObject->setUniform(_uniformCache.projection, data.camera.projectionMatrix());
// _programObject->setUniform(_uniformCache.color, _appearance.lineColor);
// _programObject->setUniform(_uniformCache.useLineFade, _appearance.useLineFade);
// if (_appearance.useLineFade) {
// _programObject->setUniform(_uniformCache.lineFade, _appearance.lineFade);
// }
// glDepthMask(false);
// //glBlendFunc(GL_SRC_ALPHA, GL_ONE);
// glBindVertexArray(_vertexArray);
// glDrawElements(GL_LINES,
// static_cast<unsigned int>(_indexBufferData.size()),
// GL_UNSIGNED_INT,
// 0);
// glBindVertexArray(0);
// _programObject->deactivate();
>>>>>>> e4734ae0b3148cae1f230b00570b5e8c723d5b4b
}
void RenderableSatellites::updateBuffers() {
modules/space/rendering/renderablesatellites.h
+3 -3
View File
@@ -104,10 +104,10 @@ namespace openspace {
properties::StringProperty _meanAnomalyAtEpochColumnName;
properties::StringProperty _epochColumnName;
//RenderableTrail::Appearance _appearance;
RenderableTrail::Appearance _appearance;
//UniformCache(opacity, modelView, projection, color, useLineFade, lineFade)
// _uniformCache;
UniformCache(opacity, modelView, projection, color, useLineFade, lineFade)
_uniformCache;
/**
* Reads the provided TLE file and calles the KeplerTranslation::setKeplerElments