mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-26 05:58:48 -05:00
Restructuring for OpenSpace tests
- Moved all OpenSpace headers to separate include directory - Added OpenSpaceTests binary with OPENSPACE_HAVE_TESTS define - Added CMake setting of BASE_DIR - Added OpenSpace initial tests for SceneGraph and SceneGraphNodes - Added OpenSpace initial tests for psc and pss - Restructured OpenSpace so no GL functions are called in constructors to make the classes testable - Todo: Make the base dir possible to set through command line argument and configuration file
This commit is contained in:
@@ -0,0 +1,36 @@
|
||||
#ifndef RENDERABLE_H
|
||||
#define RENDERABLE_H
|
||||
|
||||
// open space includes
|
||||
#include <openspace/util/psc.h>
|
||||
#include <openspace/util/pss.h>
|
||||
#include <openspace/util/camera.h>
|
||||
#include <ghoul/misc/dictionary.h>
|
||||
|
||||
namespace openspace {
|
||||
|
||||
class Renderable {
|
||||
public:
|
||||
|
||||
// constructors & destructor
|
||||
Renderable(const ghoul::Dictionary& dictionary);
|
||||
virtual ~Renderable();
|
||||
|
||||
virtual bool initialize() = 0;
|
||||
virtual bool deinitialize() = 0;
|
||||
|
||||
void setBoundingSphere(const pss &boundingSphere);
|
||||
const pss &getBoundingSphere();
|
||||
|
||||
virtual void render(const Camera *camera, const psc &thisPosition) = 0;
|
||||
virtual void update();
|
||||
protected:
|
||||
Renderable();
|
||||
private:
|
||||
pss boundingSphere_;
|
||||
|
||||
};
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,37 @@
|
||||
#ifndef RENDERABLEBODY_H
|
||||
#define RENDERABLEBODY_H
|
||||
|
||||
// open space includes
|
||||
#include <openspace/rendering/renderable.h>
|
||||
#include <openspace/util/sphere.h>
|
||||
|
||||
// ghoul includes
|
||||
#include "ghoul/opengl/programobject.h"
|
||||
#include "ghoul/opengl/texture.h"
|
||||
|
||||
namespace openspace {
|
||||
/*
|
||||
class RenderableBody: public Renderable {
|
||||
public:
|
||||
|
||||
// constructors & destructor
|
||||
RenderableBody(const pss &radius);
|
||||
~RenderableBody();
|
||||
|
||||
void setProgramObject(ghoul::opengl::ProgramObject *programObject);
|
||||
void setTexture(ghoul::opengl::Texture *texture);
|
||||
|
||||
virtual void render(const Camera *camera, const psc &thisPosition);
|
||||
virtual void update();
|
||||
|
||||
private:
|
||||
ghoul::opengl::ProgramObject *programObject_;
|
||||
ghoul::opengl::Texture *texture_;
|
||||
double rad_;
|
||||
|
||||
gl4::Sphere *planet_;
|
||||
};
|
||||
*/
|
||||
} // namespace openspace
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,45 @@
|
||||
#ifndef RENDERABLEPLANET_H
|
||||
#define RENDERABLEPLANET_H
|
||||
|
||||
// open space includes
|
||||
#include <openspace/rendering/renderable.h>
|
||||
#include <openspace/util/powerscaledsphere.h>
|
||||
|
||||
// ghoul includes
|
||||
#include <ghoul/opengl/programobject.h>
|
||||
#include <ghoul/opengl/texture.h>
|
||||
|
||||
namespace openspace {
|
||||
|
||||
class RenderablePlanet: public Renderable {
|
||||
public:
|
||||
|
||||
// constructors & destructor
|
||||
RenderablePlanet(const ghoul::Dictionary& dictionary);
|
||||
~RenderablePlanet();
|
||||
|
||||
bool initialize();
|
||||
bool deinitialize();
|
||||
|
||||
void setProgramObject(ghoul::opengl::ProgramObject *programObject = nullptr);
|
||||
void setTexture(ghoul::opengl::Texture *texture);
|
||||
|
||||
virtual void render(const Camera *camera, const psc &thisPosition);
|
||||
virtual void update();
|
||||
|
||||
private:
|
||||
|
||||
// shader
|
||||
ghoul::opengl::ProgramObject *programObject_;
|
||||
|
||||
// texture
|
||||
std::string _texturePath;
|
||||
ghoul::opengl::Texture *texture_;
|
||||
|
||||
// Object
|
||||
PowerScaledSphere *planet_;
|
||||
};
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,62 @@
|
||||
/*****************************************************************************************
|
||||
* *
|
||||
* 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 __RENDERENGINE_H__
|
||||
#define __RENDERENGINE_H__
|
||||
|
||||
#include <openspace/scenegraph/scenegraph.h>
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace openspace {
|
||||
|
||||
class Camera;
|
||||
|
||||
class RenderEngine {
|
||||
public:
|
||||
RenderEngine();
|
||||
~RenderEngine();
|
||||
|
||||
bool initialize();
|
||||
|
||||
SceneGraph* sceneGraph();
|
||||
|
||||
// sgct wrapped functions
|
||||
bool initializeGL();
|
||||
void postSynchronizationPreDraw();
|
||||
void render();
|
||||
void postDraw();
|
||||
|
||||
// object extensions
|
||||
//virtual void encode();
|
||||
//virtual void decode();
|
||||
|
||||
private:
|
||||
Camera* _mainCamera;
|
||||
SceneGraph* _sceneGraph;
|
||||
};
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
#endif // __RENDERENGINE_H__
|
||||
Reference in New Issue
Block a user