mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 12:39:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'solarsystem2' into cleanup

Browse Source 
Conflicts:
	src/util/factorymanager.cpp
This commit is contained in:
Jonas Strandstedt
2014-10-27 19:03:36 +01:00
parent 20137613a8 51c8034fe9
commit 4bb9d8c800
30 changed files with 783 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/rendering/model/modelgeometry.h
+53
View File
@@ -0,0 +1,53 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __MODELGEOMETRY_H__
#define __MODELGEOMETRY_H__
#include <openspace/properties/propertyowner.h>
#include <openspace/rendering/model/renderablemodel.h>
#include <ghoul/misc/dictionary.h>
namespace openspace {
namespace modelgeometry {
class ModelGeometry : public properties::PropertyOwner {
public:
static ModelGeometry* createFromDictionary(const ghoul::Dictionary& dictionary);
ModelGeometry();
virtual ~ModelGeometry();
virtual bool initialize(RenderableModel* parent);
virtual void deinitialize();
virtual void render() = 0;
protected:
RenderableModel* _parent;
};
} // namespace modelgeometry
} // namespace openspace
#endif // __MODELGEOMETRY_H__
include/openspace/rendering/model/renderablemodel.h
+75
View File
@@ -0,0 +1,75 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __RENDERABLEMODEL_H__
#define __RENDERABLEMODEL_H__
// open space includes
#include <openspace/rendering/renderable.h>
#include <openspace/properties/stringproperty.h>
#include <openspace/util/updatestructures.h>
// ghoul includes
#include <ghoul/opengl/programobject.h>
#include <ghoul/opengl/texture.h>
namespace openspace {
namespace modelgeometry {
class ModelGeometry;
}
class RenderableModel : public Renderable {
public:
RenderableModel(const ghoul::Dictionary& dictionary);
~RenderableModel();
bool initialize() override;
bool deinitialize() override;
void render(const RenderData& data) override;
void update(const UpdateData& data) override;
protected:
void loadTexture();
private:
properties::StringProperty _colorTexturePath;
ghoul::opengl::ProgramObject* _programObject;
ghoul::opengl::Texture* _texture;
modelgeometry::ModelGeometry* _geometry;
glm::dmat3 _stateMatrix;
std::string _source;
std::string _destination;
};
} // namespace openspace
#endif // __RENDERABLEMODEL_H__
include/openspace/rendering/model/wavefrontgeometry.h
+73
View File
@@ -0,0 +1,73 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __WAVEFRONTOBJECT_H__
#define __WAVEFRONTOBJECT_H__
#include <openspace/rendering/model/modelgeometry.h>
namespace openspace {
class RenderableModel;
namespace modelgeometry {
class WavefrontGeometry : public ModelGeometry {
public:
WavefrontGeometry(const ghoul::Dictionary& dictionary);
~WavefrontGeometry();
bool initialize(RenderableModel* parent) override;
void deinitialize() override;
void render() override;
typedef struct
{
GLfloat location[4];
GLfloat tex[2];
GLfloat normal[3];
//GLubyte padding[4]; // Pads the struct out to 64 bytes for performance increase
} Vertex;
protected:
void loadObj(const char *filename);
private:
void createSphere();
GLuint _vaoID = 6;
GLuint _vBufferID = 7;
GLuint _iBufferID = 8;
GLenum _mode;
unsigned int _isize;
unsigned int _vsize;
Vertex* _varray;
int* _iarray;
};
} // namespace modelgeometry
} // namespace openspace
#endif // __WAVEFRONTOBJECT_H__
include/openspace/rendering/planets/renderableplanet.h
-1
View File
@@ -57,7 +57,6 @@ protected:
private:
properties::StringProperty _colorTexturePath;
ghoul::opengl::ProgramObject* _programObject;
ghoul::opengl::Texture* _texture;
planetgeometry::PlanetGeometry* _geometry;
include/openspace/rendering/renderablewavefrontobject.h → include/openspace/rendering/renderablemodel.h
+19 -25
View File
@@ -21,9 +21,9 @@
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __RENDERABLEWAVEFRONTOBJECT_H__
#define __RENDERABLEWAVEFRONTOBJECT_H__
/*
#ifndef __RENDERABLEMODEL_H__
#define __RENDERABLEMODEL_H__
// open space includes
#include <openspace/rendering/renderable.h>
@@ -37,10 +37,14 @@
namespace openspace {
class RenderableWavefrontObject : public Renderable {
namespace modelgeometry {
class ModelGeometry;
}
class RenderableModel : public Renderable {
public:
RenderableWavefrontObject(const ghoul::Dictionary& dictionary);
~RenderableWavefrontObject();
RenderableModel(const ghoul::Dictionary& dictionary);
~RenderableModel();
bool initialize() override;
bool deinitialize() override;
@@ -53,12 +57,11 @@ public:
GLfloat location[4];
GLfloat tex[2];
GLfloat normal[3];
/* GLfloat color[4];
GLfloat attribute[3];
GLfloat float_attribute;*/
//GLubyte padding[4]; // Pads the struct out to 64 bytes for performance increase
} Vertex;
protected:
void loadTexture();
void loadObj(const char *filename);
@@ -67,9 +70,9 @@ private:
properties::StringProperty _colorTexturePath;
ghoul::opengl::ProgramObject* _programObject;
ghoul::opengl::Texture* _texture;
modelgeometry::ModelGeometry* _geometry;
ghoul::opengl::ProgramObject* _fovProgram;
float abc;
GLuint _vaoID = 6;
GLuint _vBufferID = 7;
@@ -83,22 +86,13 @@ private:
glm::dmat3 _stateMatrix; // might need this
std::string _target;
///NH FOV
GLuint _vaoFOV = 10;
GLuint _vboFOV = 11;
GLuint _iboFOV = 12;
unsigned int _isizeFOV;
unsigned int _vsizeFOV;
std::vector<float> _varrayFOV;
int *_iarrayFOV;
std::string _source;
std::string _destination;
};
} // namespace openspace
#endif // __RENDERABLEWAVEFRONTOBJECT_H__
#endif // __RENDERABLEMODEL_H__
*/
include/openspace/rendering/renderabletrail.h
+10 -9
View File
@@ -58,16 +58,16 @@ public:
std::string _target;
std::string _observer;
std::string _frame;
std::string _orbitVariety;
// color
glm::vec3 _c;
double _r, _g, _b;
float _r, _g, _b;
// orbit relational data
double _tropic;
double _ratio;
double _day;
float _tropic;
float _ratio;
float _day;
// need to write robust method for vbo id selection
// (right now galactic grid has to be present) (why though?) solve later...
GLuint _vaoID ;
GLuint _vBufferID ;
GLuint _iBufferID;
@@ -88,12 +88,13 @@ public:
int* _iarray;
bool _once = false;
double lightTime;
//used for update of trail
psc _pscpos, _pscvel;
double _increment;
double _time = 0;
double _oldTime = 0;
float _increment;
float _time = 0;
float _oldTime = 0;
float _dtEt;
int _delta = 0;
int _dtprogress = 0;
include/openspace/util/constants.h
+8 -4
View File
@@ -43,7 +43,6 @@ namespace configurationmanager {
const std::string keyStartupScript = "StartupScripts";
const std::string keySpiceTimeKernel = "SpiceKernel.Time";
const std::string keySpiceLeapsecondKernel = "SpiceKernel.LeapSecond";
const std::string keySpiceNewHorizons = "SpiceKernel.NewHorizons";
} // namespace configurationmanager
namespace scenegraph {
@@ -68,17 +67,22 @@ namespace renderable {
} // namespace renderable
namespace renderableplanet {
const std::string keyGeometry = "Geometry";
const std::string keyFrame = "Frame";
const std::string keyGeometry = "Geometry";
} // namespace renderableplanet
namespace planetgeometry {
const std::string keyType = "Type";
} // namespace planetgeometry
namespace renderablewavefrontobject {
namespace renderablemodel {
const std::string keyGeometry = "Geometry";
} // namespace renderablemodel
namespace modelgeometry {
const std::string keyType = "Type";
const std::string keyObjFile = "ObjFile";
} // namespace renderableplanet
} // namespace modelgeometry
namespace renderablestars {
const std::string keySpeckFile = "SpeckFile";
include/openspace/util/time.h
+12
View File
@@ -134,6 +134,18 @@ public:
*/
double advanceTime(double tickTime);
/**
* Retreats the simulation time using the deltaTime() and the <code>tickTime</code>.
* The deltaTime() is the number of simulation seconds that pass for each real-time
* second. <code>tickTime</code> is the number of real-time seconds that passed since
* the last call to this method. If this method is called in the render loop, the
* <code>tickTime</code> should be equivalent to the frame time.
* \param tickTime The number of real-time seconds that passed since the last call
* to this method
* \return The new time value after retreating the time
*/
double retreatTime(double tickTime);
/**
* Returns the Lua library that contains all Lua functions available to change the
* current time, retrieve the current time etc. The functions contained are