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

initializeGL stuff

Browse Source
This commit is contained in:
Jonathan Fransson
2019-03-27 16:30:59 -06:00
parent 7ee9982973
commit 565612e973
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/space/rendering/renderablesatellites.cpp
View File

@@ -28,11 +28,14 @@
#include <modules/space/rendering/renderablesatellites.h>
#include <modules/space/translation/keplertranslation.h>
#include <modules/space/spacemodule.h>
#include <modules/base/basemodule.h>
#include <openspace/engine/openspaceengine.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/engine/globals.h>
#include <openspace/documentation/verifier.h>
#include <openspace/util/time.h>
#include <openspace/util/updatestructures.h>
@@ -42,6 +45,7 @@
#include <ghoul/misc/csvreader.h>
#include <ghoul/opengl/programobject.h>
#include <fstream>
@@ -548,7 +552,8 @@ void RenderableSatellites::readTLEFile(const std::string& filename, int lineNum)
using namespace std::chrono;
double period = seconds(hours(24)).count() / keplerElements.meanMotion;
/*
setKeplerElements(
keplerElements.eccentricity,
keplerElements.semiMajorAxis,
@@ -559,7 +564,7 @@ void RenderableSatellites::readTLEFile(const std::string& filename, int lineNum)
period,
keplerElements.epoch
);
*/
}
/*
@@ -597,10 +602,10 @@ void RenderableSatellites::initializeGL() {
glGenBuffers(1, &_vertexBuffer);
glGenBuffers(1, &_indexBuffer);
_programObject = BaseModule::ProgramObjectManager.requestProgramObject(
_programObject = SpaceModule::ProgramObjectManager.request(
ProgramName,
[]() -> std::unique_ptr<ghoul::opengl::ProgramObject> {
return OsEng.renderEngine().buildRenderProgram(
return global::renderEngine.buildRenderProgram(
ProgramName,
absPath("${MODULE_SPACE}/shaders/RenderableKeplerOrbits_vs.glsl"),
absPath("${MODULE_SPACE}/shaders/RenderableKeplerOrbits_fs.glsl")
@@ -619,7 +624,7 @@ void RenderableSatellites::initializeGL() {
}
void RenderableSatellites::deinitializeGL() {
BaseModule::ProgramObjectManager.releaseProgramObject(ProgramName);
SpaceModule::ProgramObjectManager.release(ProgramName);
glDeleteBuffers(1, &_vertexBuffer);
glDeleteBuffers(1, &_indexBuffer);

3
modules/space/rendering/renderablesatellites.h
View File

@@ -32,6 +32,7 @@
#include <openspace/properties/scalar/uintproperty.h>
#include <ghoul/opengl/programobject.h>
#include <ghoul/misc/objectmanager.h>
#ifndef __OPENSPACE_MODULE_BASE___RenderableSatellites___H__
#define __OPENSPACE_MODULE_BASE___RenderableSatellites___H__
@@ -84,6 +85,8 @@ private:
std::vector<KeplerTranslation::KeplerOrbit> _orbits;
ghoul::opengl::ProgramObject* _programObject;
//ghoul::ObjectManager* _objectManager;
properties::StringProperty _path;
properties::UIntProperty _nSegments;