mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-03-14 17:40:26 -05:00
Cleanup of license headers
Cleanup of include guards in modules
This commit is contained in:
Alexander Bock
@@ -41,220 +41,233 @@ namespace {
|
||||
|
||||
namespace openspace {
|
||||
|
||||
DebugRenderer* DebugRenderer::_reference = nullptr;
|
||||
DebugRenderer* DebugRenderer::_reference = nullptr;
|
||||
|
||||
DebugRenderer::DebugRenderer() {
|
||||
_programObject = OsEng.renderEngine().buildRenderProgram(
|
||||
"BasicDebugShader",
|
||||
"${MODULE_DEBUGGING}/rendering/debugshader_vs.glsl",
|
||||
"${MODULE_DEBUGGING}/rendering/debugshader_fs.glsl"
|
||||
);
|
||||
}
|
||||
DebugRenderer::DebugRenderer() {
|
||||
_programObject = OsEng.renderEngine().buildRenderProgram(
|
||||
"BasicDebugShader",
|
||||
"${MODULE_DEBUGGING}/rendering/debugshader_vs.glsl",
|
||||
"${MODULE_DEBUGGING}/rendering/debugshader_fs.glsl"
|
||||
);
|
||||
}
|
||||
|
||||
DebugRenderer::DebugRenderer(std::unique_ptr<ProgramObject> programObject)
|
||||
: _programObject(std::move(programObject))
|
||||
{
|
||||
// nothing to do
|
||||
}
|
||||
DebugRenderer::DebugRenderer(std::unique_ptr<ghoul::opengl::ProgramObject> programObject)
|
||||
: _programObject(std::move(programObject))
|
||||
{
|
||||
// nothing to do
|
||||
}
|
||||
|
||||
DebugRenderer::~DebugRenderer()
|
||||
{
|
||||
// nothing to do
|
||||
}
|
||||
DebugRenderer::~DebugRenderer()
|
||||
{
|
||||
// nothing to do
|
||||
}
|
||||
|
||||
|
||||
|
||||
const DebugRenderer& DebugRenderer::ref() {
|
||||
if (_reference == nullptr) {
|
||||
try {
|
||||
_reference = new DebugRenderer();
|
||||
}
|
||||
catch (const ShaderObject::ShaderCompileError& e) {
|
||||
LERROR(e.what());
|
||||
}
|
||||
const DebugRenderer& DebugRenderer::ref() {
|
||||
if (_reference == nullptr) {
|
||||
try {
|
||||
_reference = new DebugRenderer();
|
||||
}
|
||||
return *_reference;
|
||||
catch (const ghoul::opengl::ShaderObject::ShaderCompileError& e) {
|
||||
LERROR(e.what());
|
||||
}
|
||||
}
|
||||
return *_reference;
|
||||
}
|
||||
|
||||
void DebugRenderer::renderVertices(const Vertices& clippingSpacePoints, GLenum mode,
|
||||
RGBA rgba) const
|
||||
{
|
||||
if (clippingSpacePoints.size() == 0) {
|
||||
// nothing to render
|
||||
return;
|
||||
}
|
||||
|
||||
void DebugRenderer::renderVertices(const Vertices& clippingSpacePoints, GLenum mode, RGBA rgba) const {
|
||||
if (clippingSpacePoints.size() == 0) {
|
||||
// nothing to render
|
||||
return;
|
||||
}
|
||||
// Generate a vao, vertex array object (keeping track of pointers to vbo)
|
||||
GLuint _vaoID;
|
||||
glGenVertexArrays(1, &_vaoID);
|
||||
ghoul_assert(_vaoID != 0, "Could not generate vertex arrays");
|
||||
|
||||
// Generate a vao, vertex array object (keeping track of pointers to vbo)
|
||||
GLuint _vaoID;
|
||||
glGenVertexArrays(1, &_vaoID);
|
||||
ghoul_assert(_vaoID != 0, "Could not generate vertex arrays");
|
||||
// Generate a vbo, vertex buffer object (storeing actual data)
|
||||
GLuint _vertexBufferID;
|
||||
glGenBuffers(1, &_vertexBufferID);
|
||||
ghoul_assert(_vertexBufferID != 0, "Could not create vertex buffer");
|
||||
|
||||
// Generate a vbo, vertex buffer object (storeing actual data)
|
||||
GLuint _vertexBufferID;
|
||||
glGenBuffers(1, &_vertexBufferID);
|
||||
ghoul_assert(_vertexBufferID != 0, "Could not create vertex buffer");
|
||||
// Activate the shader program and set the uniform color within the shader
|
||||
_programObject->activate();
|
||||
_programObject->setUniform("color", rgba);
|
||||
|
||||
// Activate the shader program and set the uniform color within the shader
|
||||
_programObject->activate();
|
||||
_programObject->setUniform("color", rgba);
|
||||
|
||||
glBindVertexArray(_vaoID);
|
||||
glBindBuffer(GL_ARRAY_BUFFER, _vertexBufferID);
|
||||
glBufferData(
|
||||
GL_ARRAY_BUFFER,
|
||||
clippingSpacePoints.size() * sizeof(clippingSpacePoints[0]),
|
||||
&clippingSpacePoints[0],
|
||||
GL_STATIC_DRAW);
|
||||
glBindVertexArray(_vaoID);
|
||||
glBindBuffer(GL_ARRAY_BUFFER, _vertexBufferID);
|
||||
glBufferData(
|
||||
GL_ARRAY_BUFFER,
|
||||
clippingSpacePoints.size() * sizeof(clippingSpacePoints[0]),
|
||||
&clippingSpacePoints[0],
|
||||
GL_STATIC_DRAW);
|
||||
|
||||
|
||||
glEnableVertexAttribArray(0);
|
||||
glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(clippingSpacePoints[0]), 0);
|
||||
glEnableVertexAttribArray(0);
|
||||
glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(clippingSpacePoints[0]), 0);
|
||||
|
||||
// Draw the vertices
|
||||
glDrawArrays(mode, 0, clippingSpacePoints.size());
|
||||
// Draw the vertices
|
||||
glDrawArrays(mode, 0, clippingSpacePoints.size());
|
||||
|
||||
// Check for errors
|
||||
GLenum error = glGetError();
|
||||
if (error != GL_NO_ERROR) {
|
||||
// Commenting this line. It causes errors to be printed. However
|
||||
// the errors are not caused by DebugRenderer!!
|
||||
//LERROR(error);
|
||||
}
|
||||
// Check for errors
|
||||
GLenum error = glGetError();
|
||||
if (error != GL_NO_ERROR) {
|
||||
// Commenting this line. It causes errors to be printed. However
|
||||
// the errors are not caused by DebugRenderer!!
|
||||
//LERROR(error);
|
||||
}
|
||||
|
||||
// Clean up after the draw call was made
|
||||
glBindVertexArray(0);
|
||||
glDeleteVertexArrays(1, &_vaoID);
|
||||
glDeleteBuffers(1, &_vertexBufferID);
|
||||
_programObject->deactivate();
|
||||
}
|
||||
// Clean up after the draw call was made
|
||||
glBindVertexArray(0);
|
||||
glDeleteVertexArrays(1, &_vaoID);
|
||||
glDeleteBuffers(1, &_vertexBufferID);
|
||||
_programObject->deactivate();
|
||||
}
|
||||
|
||||
|
||||
void DebugRenderer::renderBoxFaces(const Vertices& clippingSpaceBoxCorners, RGBA rgba) const {
|
||||
ghoul_assert(clippingSpaceBoxCorners.size() == 8, "Box must have 8 vertices");
|
||||
const Vertices& V = clippingSpaceBoxCorners;
|
||||
void DebugRenderer::renderBoxFaces(const Vertices& clippingSpaceBoxCorners,
|
||||
RGBA rgba) const
|
||||
{
|
||||
ghoul_assert(clippingSpaceBoxCorners.size() == 8, "Box must have 8 vertices");
|
||||
const Vertices& V = clippingSpaceBoxCorners;
|
||||
|
||||
std::vector<glm::vec4> T;
|
||||
std::vector<glm::vec4> T;
|
||||
|
||||
// add "sides"
|
||||
T.push_back(V[1]); T.push_back(V[0]); T.push_back(V[4]);
|
||||
T.push_back(V[4]); T.push_back(V[5]); T.push_back(V[1]);
|
||||
// add "sides"
|
||||
T.push_back(V[1]); T.push_back(V[0]); T.push_back(V[4]);
|
||||
T.push_back(V[4]); T.push_back(V[5]); T.push_back(V[1]);
|
||||
|
||||
|
||||
T.push_back(V[3]); T.push_back(V[1]); T.push_back(V[5]);
|
||||
T.push_back(V[5]); T.push_back(V[7]); T.push_back(V[3]);
|
||||
T.push_back(V[3]); T.push_back(V[1]); T.push_back(V[5]);
|
||||
T.push_back(V[5]); T.push_back(V[7]); T.push_back(V[3]);
|
||||
|
||||
T.push_back(V[6]); T.push_back(V[3]); T.push_back(V[7]);
|
||||
T.push_back(V[3]); T.push_back(V[6]); T.push_back(V[2]);
|
||||
T.push_back(V[6]); T.push_back(V[3]); T.push_back(V[7]);
|
||||
T.push_back(V[3]); T.push_back(V[6]); T.push_back(V[2]);
|
||||
|
||||
T.push_back(V[4]); T.push_back(V[2]); T.push_back(V[6]);
|
||||
T.push_back(V[2]); T.push_back(V[4]); T.push_back(V[0]);
|
||||
T.push_back(V[4]); T.push_back(V[2]); T.push_back(V[6]);
|
||||
T.push_back(V[2]); T.push_back(V[4]); T.push_back(V[0]);
|
||||
|
||||
// add "top"
|
||||
T.push_back(V[5]); T.push_back(V[6]); T.push_back(V[7]);
|
||||
T.push_back(V[6]); T.push_back(V[5]); T.push_back(V[4]);
|
||||
// add "top"
|
||||
T.push_back(V[5]); T.push_back(V[6]); T.push_back(V[7]);
|
||||
T.push_back(V[6]); T.push_back(V[5]); T.push_back(V[4]);
|
||||
|
||||
// add bottom
|
||||
T.push_back(V[0]); T.push_back(V[1]); T.push_back(V[2]);
|
||||
T.push_back(V[3]); T.push_back(V[2]); T.push_back(V[1]);
|
||||
// add bottom
|
||||
T.push_back(V[0]); T.push_back(V[1]); T.push_back(V[2]);
|
||||
T.push_back(V[3]); T.push_back(V[2]); T.push_back(V[1]);
|
||||
|
||||
renderVertices(T, GL_TRIANGLES, rgba);
|
||||
}
|
||||
renderVertices(T, GL_TRIANGLES, rgba);
|
||||
}
|
||||
|
||||
void DebugRenderer::renderBoxEdges(const Vertices& clippingSpaceBoxCorners, RGBA rgba) const {
|
||||
ghoul_assert(clippingSpaceBoxCorners.size() == 8, "Box must have 8 vertices");
|
||||
const Vertices& V = clippingSpaceBoxCorners;
|
||||
void DebugRenderer::renderBoxEdges(const Vertices& clippingSpaceBoxCorners,
|
||||
RGBA rgba) const
|
||||
{
|
||||
ghoul_assert(clippingSpaceBoxCorners.size() == 8, "Box must have 8 vertices");
|
||||
const Vertices& V = clippingSpaceBoxCorners;
|
||||
|
||||
std::vector<glm::vec4> lineVertices;
|
||||
std::vector<glm::vec4> lineVertices;
|
||||
|
||||
for (size_t i = 0; i < 4; i++) {
|
||||
lineVertices.push_back(V[2 * i]);
|
||||
lineVertices.push_back(V[2 * i + 1]);
|
||||
lineVertices.push_back(V[i]);
|
||||
lineVertices.push_back(V[i + 4]);
|
||||
for (size_t i = 0; i < 4; i++) {
|
||||
lineVertices.push_back(V[2 * i]);
|
||||
lineVertices.push_back(V[2 * i + 1]);
|
||||
lineVertices.push_back(V[i]);
|
||||
lineVertices.push_back(V[i + 4]);
|
||||
}
|
||||
lineVertices.push_back(V[0]); lineVertices.push_back(V[2]);
|
||||
lineVertices.push_back(V[1]); lineVertices.push_back(V[3]);
|
||||
lineVertices.push_back(V[4]); lineVertices.push_back(V[6]);
|
||||
lineVertices.push_back(V[5]); lineVertices.push_back(V[7]);
|
||||
|
||||
DebugRenderer::ref().renderVertices(lineVertices, GL_LINES, rgba);
|
||||
}
|
||||
|
||||
void DebugRenderer::renderNiceBox(const Vertices& clippingSpaceBoxCorners,
|
||||
RGBA rgba) const
|
||||
{
|
||||
renderBoxFaces(clippingSpaceBoxCorners, rgba);
|
||||
|
||||
glLineWidth(4.0f);
|
||||
DebugRenderer::ref().renderBoxEdges(clippingSpaceBoxCorners, rgba);
|
||||
|
||||
glPointSize(10.0f);
|
||||
DebugRenderer::ref().renderVertices(clippingSpaceBoxCorners, GL_POINTS, rgba);
|
||||
}
|
||||
|
||||
void DebugRenderer::renderCameraFrustum(const RenderData& data, const Camera& otherCamera,
|
||||
RGBA rgba) const
|
||||
{
|
||||
using namespace glm;
|
||||
dmat4 modelTransform = translate(dmat4(1), data.position.dvec3());
|
||||
dmat4 viewTransform = dmat4(data.camera.combinedViewMatrix());
|
||||
dmat4 vp = dmat4(data.camera.projectionMatrix()) * viewTransform;
|
||||
|
||||
dmat4 inverseSavedV = glm::inverse(otherCamera.combinedViewMatrix());
|
||||
dmat4 inverseSavedP = glm::inverse(otherCamera.projectionMatrix());
|
||||
Vertices clippingSpaceFrustumCorners(8);
|
||||
// loop through the corners of the saved camera frustum
|
||||
for (size_t i = 0; i < 8; i++) {
|
||||
bool cornerIsRight = i % 2 == 0;
|
||||
bool cornerIsUp = i > 3;
|
||||
bool cornerIsFar = (i / 2) % 2 == 1;
|
||||
|
||||
double x = cornerIsRight ? 1 : -1;
|
||||
double y = cornerIsUp ? 1 : -1;
|
||||
double z = cornerIsFar ? 1 : 0;
|
||||
|
||||
// p represents a corner in the frustum of the saved camera
|
||||
dvec4 pSavedClippingSpace(x, y, z, 1);
|
||||
dvec4 pSavedCameraSpace = inverseSavedP * pSavedClippingSpace;
|
||||
if (cornerIsFar) {
|
||||
pSavedCameraSpace.w *= 1e-7;
|
||||
}
|
||||
lineVertices.push_back(V[0]); lineVertices.push_back(V[2]);
|
||||
lineVertices.push_back(V[1]); lineVertices.push_back(V[3]);
|
||||
lineVertices.push_back(V[4]); lineVertices.push_back(V[6]);
|
||||
lineVertices.push_back(V[5]); lineVertices.push_back(V[7]);
|
||||
pSavedCameraSpace = glm::abs(1.0 / pSavedCameraSpace.w) * pSavedCameraSpace;
|
||||
|
||||
DebugRenderer::ref().renderVertices(lineVertices, GL_LINES, rgba);
|
||||
dvec4 pWorldSpace = inverseSavedV * pSavedCameraSpace;
|
||||
dvec4 pCurrentClippingSpace = vp * pWorldSpace;
|
||||
clippingSpaceFrustumCorners[i] = pCurrentClippingSpace;
|
||||
}
|
||||
|
||||
void DebugRenderer::renderNiceBox(const Vertices& clippingSpaceBoxCorners, RGBA rgba) const {
|
||||
renderBoxFaces(clippingSpaceBoxCorners, rgba);
|
||||
|
||||
glLineWidth(4.0f);
|
||||
DebugRenderer::ref().renderBoxEdges(clippingSpaceBoxCorners, rgba);
|
||||
|
||||
glPointSize(10.0f);
|
||||
DebugRenderer::ref().renderVertices(clippingSpaceBoxCorners, GL_POINTS, rgba);
|
||||
}
|
||||
|
||||
void DebugRenderer::renderCameraFrustum(const RenderData& data, const Camera& otherCamera, RGBA rgba) const {
|
||||
using namespace glm;
|
||||
dmat4 modelTransform = translate(dmat4(1), data.position.dvec3());
|
||||
dmat4 viewTransform = dmat4(data.camera.combinedViewMatrix());
|
||||
dmat4 vp = dmat4(data.camera.projectionMatrix()) * viewTransform;
|
||||
|
||||
dmat4 inverseSavedV = glm::inverse(otherCamera.combinedViewMatrix());
|
||||
dmat4 inverseSavedP = glm::inverse(otherCamera.projectionMatrix());
|
||||
Vertices clippingSpaceFrustumCorners(8);
|
||||
// loop through the corners of the saved camera frustum
|
||||
for (size_t i = 0; i < 8; i++) {
|
||||
bool cornerIsRight = i % 2 == 0;
|
||||
bool cornerIsUp = i > 3;
|
||||
bool cornerIsFar = (i / 2) % 2 == 1;
|
||||
|
||||
double x = cornerIsRight ? 1 : -1;
|
||||
double y = cornerIsUp ? 1 : -1;
|
||||
double z = cornerIsFar ? 1 : 0;
|
||||
|
||||
// p represents a corner in the frustum of the saved camera
|
||||
dvec4 pSavedClippingSpace(x, y, z, 1);
|
||||
dvec4 pSavedCameraSpace = inverseSavedP * pSavedClippingSpace;
|
||||
if (cornerIsFar) {
|
||||
pSavedCameraSpace.w *= 1e-7;
|
||||
}
|
||||
pSavedCameraSpace = glm::abs(1.0 / pSavedCameraSpace.w) * pSavedCameraSpace;
|
||||
|
||||
dvec4 pWorldSpace = inverseSavedV * pSavedCameraSpace;
|
||||
dvec4 pCurrentClippingSpace = vp * pWorldSpace;
|
||||
clippingSpaceFrustumCorners[i] = pCurrentClippingSpace;
|
||||
}
|
||||
|
||||
|
||||
glDisable(GL_CULL_FACE);
|
||||
renderNiceBox(clippingSpaceFrustumCorners, rgba);
|
||||
glEnable(GL_CULL_FACE);
|
||||
}
|
||||
glDisable(GL_CULL_FACE);
|
||||
renderNiceBox(clippingSpaceFrustumCorners, rgba);
|
||||
glEnable(GL_CULL_FACE);
|
||||
}
|
||||
|
||||
#ifdef OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
|
||||
void DebugRenderer::renderAABB2(const globebrowsing::AABB2& screenSpaceAABB, RGBA rgba) const {
|
||||
Vertices vertices(4);
|
||||
vertices[0] = glm::vec4(screenSpaceAABB.min.x, screenSpaceAABB.min.y, 1, 1);
|
||||
vertices[1] = glm::vec4(screenSpaceAABB.min.x, screenSpaceAABB.max.y, 1, 1);
|
||||
vertices[2] = glm::vec4(screenSpaceAABB.max.x, screenSpaceAABB.min.y, 1, 1);
|
||||
vertices[3] = glm::vec4(screenSpaceAABB.max.x, screenSpaceAABB.max.y, 1, 1);
|
||||
void DebugRenderer::renderAABB2(const globebrowsing::AABB2& screenSpaceAABB,
|
||||
RGBA rgba) const
|
||||
{
|
||||
Vertices vertices(4);
|
||||
vertices[0] = glm::vec4(screenSpaceAABB.min.x, screenSpaceAABB.min.y, 1, 1);
|
||||
vertices[1] = glm::vec4(screenSpaceAABB.min.x, screenSpaceAABB.max.y, 1, 1);
|
||||
vertices[2] = glm::vec4(screenSpaceAABB.max.x, screenSpaceAABB.min.y, 1, 1);
|
||||
vertices[3] = glm::vec4(screenSpaceAABB.max.x, screenSpaceAABB.max.y, 1, 1);
|
||||
|
||||
renderVertices(vertices, GL_LINES, rgba);
|
||||
}
|
||||
renderVertices(vertices, GL_LINES, rgba);
|
||||
}
|
||||
#endif // OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
|
||||
|
||||
#ifdef OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
|
||||
const DebugRenderer::Vertices DebugRenderer::verticesFor(const globebrowsing::AABB3& screenSpaceAABB) const {
|
||||
Vertices vertices(8);
|
||||
for (size_t i = 0; i < 8; i++) {
|
||||
bool cornerIsRight = i % 2 == 0;
|
||||
bool cornerIsUp = i > 3;
|
||||
bool cornerIsFar = (i / 2) % 2 == 1;
|
||||
const DebugRenderer::Vertices DebugRenderer::verticesFor(
|
||||
const globebrowsing::AABB3& screenSpaceAABB) const
|
||||
{
|
||||
Vertices vertices(8);
|
||||
for (size_t i = 0; i < 8; i++) {
|
||||
bool cornerIsRight = i % 2 == 0;
|
||||
bool cornerIsUp = i > 3;
|
||||
bool cornerIsFar = (i / 2) % 2 == 1;
|
||||
|
||||
double x = cornerIsRight ? screenSpaceAABB.max.x : screenSpaceAABB.min.x;
|
||||
double y = cornerIsUp ? screenSpaceAABB.max.y : screenSpaceAABB.min.y;
|
||||
double z = cornerIsFar ? screenSpaceAABB.max.z : screenSpaceAABB.min.z;
|
||||
double x = cornerIsRight ? screenSpaceAABB.max.x : screenSpaceAABB.min.x;
|
||||
double y = cornerIsUp ? screenSpaceAABB.max.y : screenSpaceAABB.min.y;
|
||||
double z = cornerIsFar ? screenSpaceAABB.max.z : screenSpaceAABB.min.z;
|
||||
|
||||
vertices[i] = glm::vec4(x, y, z, 1);
|
||||
}
|
||||
return std::move(vertices);
|
||||
vertices[i] = glm::vec4(x, y, z, 1);
|
||||
}
|
||||
return std::move(vertices);
|
||||
}
|
||||
#endif // OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
|
||||
Reference in New Issue
Block a user