From 066c165dd131853ad031df91d4575336d3ff39a2 Mon Sep 17 00:00:00 2001 From: "nuclearmistake@gmail.com" Date: Sun, 5 May 2013 20:30:08 -0400 Subject: [PATCH] Update RayTracer class, rewrite raytracerIntegrated to use it. --- src/Binaries/raytraceIntegrated.cpp | 399 ++++------------------------ src/Classes/MONOLITH.cpp | 5 +- src/Classes/RayTracer.cpp | 346 +++++++++++------------- src/include/RayTracer.h | 46 +++- 4 files changed, 245 insertions(+), 551 deletions(-) diff --git a/src/Binaries/raytraceIntegrated.cpp b/src/Binaries/raytraceIntegrated.cpp index f297dda9..d77912bf 100644 --- a/src/Binaries/raytraceIntegrated.cpp +++ b/src/Binaries/raytraceIntegrated.cpp @@ -12,37 +12,20 @@ #include #include #include "Engine.hpp" +#include "RayTracer.h" #define GLCHECK(); if (glGetError()) { gprint( PRINT_ERROR, "glGetError() is true on line %d\n", __LINE__ ); exit(255); } +#define WTFGL ;GLCHECK(); + +RayTracer rt; /** Global shader object **/ GLuint program = -1; -GLint vRayPosition = -1; - -GLint uSphereCenterPoints = -1; -GLint uSphereRadius = -1; -GLint uSphereDiffuse = -1; -GLint uSphereAmbient = -1; -GLint uSphereSpecular = -1; -GLint uSphereShininess = -1; -GLint uSphereReflect = -1; -GLint uSphereRefract = -1; -GLint uNumOfSpheres = -1; - -GLint uNumOfTriangle = -1; -GLint uNumOfTriangleVectors = -1; -GLint uNumOfL2BoundingBoxes = -1; -GLint uNumOfL1BoundingBoxes = -1; - -GLint uNumOfL2TrianglesBounded = -1; +//---------------------------------------------------------------------------- -GLint uNumberOfLights = -1; -GLint uLightPositions = -1; -GLint uLightDiffuse = -1; -GLint uLightSpecular = -1; +int numSpheres = 3; -//---------------------------------------------------------------------------- GLfloat sphereCenterPoints[] = { 0.0, 0.0, 5.0, 5.0, 0.0, 0.0, @@ -93,16 +76,8 @@ GLfloat lightDiffuse[] = { 0.8, 0.8, 0.8, GLfloat lightSpecular[] = { 1.0, 1.0, 1.0, 1.0, 1.0, 1.0}; -int numTriangles = 0; - -int numOfL2BoundingBoxes = 0; -int numOfL1BoundingBoxes = 0; - int numOfL2TrianglesBounded = 20; -std::vector bufferData; -std::vector triangle_tData; - int numOfTriangleVectors = (sizeof(triangle_t) / ((sizeof(GLfloat) * 3))); bool stereo = false; @@ -119,172 +94,22 @@ void aRomanticEvening() { lightness = lightness * 3.0 / 10.0; lightness += .7; - lightDiffuse[0] = lightness; - lightDiffuse[1] = lightness; - lightDiffuse[2] = lightness; + if (rt.lightDiffuse) + { + rt.lightDiffuse[0] = lightness; + rt.lightDiffuse[1] = lightness; + rt.lightDiffuse[2] = lightness; + } sleep( 0.01 ); } } -int frameCount = 0; -float previousTime = 0.0; - /** * Handle the re-display of the scene. */ void display( void ) { - glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); - - int numSpheres = 3; - glUniform1i( uNumOfSpheres, numSpheres ); - glUniform3fv( uSphereCenterPoints, numSpheres, sphereCenterPoints ); - glUniform1fv( uSphereRadius, numSpheres, sphereRadius ); - glUniform3fv( uSphereDiffuse, numSpheres, sphereDiffuse ); - glUniform3fv( uSphereAmbient, numSpheres, sphereAmbient ); - glUniform3fv( uSphereSpecular, numSpheres, sphereSpecular ); - glUniform1fv( uSphereShininess, numSpheres, sphereShininess ); - glUniform1fv( uSphereReflect, numSpheres, sphereReflect ); - glUniform1fv( uSphereRefract, numSpheres, sphereRefract ); - - glUniform1i( uNumOfTriangle, numTriangles ); - glUniform1i( uNumOfTriangleVectors, numOfTriangleVectors ); - - glUniform1i( uNumOfL2BoundingBoxes, numOfL2BoundingBoxes ); - glUniform1i( uNumOfL1BoundingBoxes, numOfL1BoundingBoxes ); - - glUniform1i( uNumOfL2TrianglesBounded, numOfL2TrianglesBounded ); - - glUniform1i( uNumberOfLights, numberOfLights ); - glUniform3fv( uLightPositions, numberOfLights, lightPositions ); - glUniform3fv( uLightDiffuse, numberOfLights, lightDiffuse ); - glUniform3fv( uLightSpecular, numberOfLights, lightSpecular ); - - GLfloat vertices[] = { 1.0, 1.0, -1.0, 1.0, 1.0, -1.0, -1.0, -1.0, }; - - GLuint vbo_vertices; - glGenBuffers( 1, &vbo_vertices ); - glBindBuffer( GL_ARRAY_BUFFER, vbo_vertices ); - glBufferData( GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW ); - glBindBuffer( GL_ARRAY_BUFFER, 0 ); - - glBindBuffer( GL_ARRAY_BUFFER, vbo_vertices ); - glEnableVertexAttribArray( vRayPosition ); - glVertexAttribPointer( vRayPosition, // attribute - 2, // number of elements per vertex, here (x,) - GL_FLOAT, // the type of each element - GL_FALSE, // take our values as-is - 0, // no extra data between each position - 0 // offset of first element - ); - - Engine::instance()->cams()->active()->relinkUniforms(); - Engine::instance()->cams()->active()->view(); - - glDrawArrays( GL_TRIANGLE_STRIP, 0, 4 ); - - glutSwapBuffers(); - glDisableVertexAttribArray( vRayPosition ); - - frameCount++; - if ( frameCount == 10 ) { - float elapsedTime = glutGet( GLUT_ELAPSED_TIME ); - float fps = 10.0 / ((elapsedTime - previousTime) / 1000.0); - gprint( PRINT_INFO, "fps: %f\n", fps ); - previousTime = elapsedTime; - frameCount = 0; - } -} - -void addVec3ToVector(std::vector *_vector, vec3 _vec3) { - _vector->push_back(_vec3.x); - _vector->push_back(_vec3.y); - _vector->push_back(_vec3.z); -} - - -#define MINMACRO( XYZ, ABC ) if (min.XYZ > t.ABC.XYZ) min.XYZ = t.ABC.XYZ; -#define MAXMACRO( XYZ, ABC ) if (max.XYZ < t.ABC.XYZ) max.XYZ = t.ABC.XYZ; -#define MINTRIPLET( XYZ ) \ - MINMACRO( XYZ, a ) \ - MINMACRO( XYZ, b ) \ - MINMACRO( XYZ, c ) - -#define MAXTRIPLET( XYZ ) \ - MAXMACRO( XYZ, a ) \ - MAXMACRO( XYZ, b ) \ - MAXMACRO( XYZ, c ) - -void setMinMax( vec3 &min, vec3 &max, triangle_t &t ) { - - MINTRIPLET( x ); - MINTRIPLET( y ); - MINTRIPLET( z ); - - MAXTRIPLET( x ); - MAXTRIPLET( y ); - MAXTRIPLET( z ); - - } - -void addTriangle( const vec3& a, const vec3& b, const vec3& c, - const vec3& diffuse, const vec3& ambient, const vec3& specular, - float shininess, float reflect, float refract) { - - triangle_t newTriangle; - - vec3 normal = normalize(cross(b - a, c - b)); - float centerX, centerY, centerZ, x, y, z; - - centerX = (a.x + b.x + c.x) / 3; - centerY = (a.y + b.y + c.y) / 3; - centerZ = (a.z + b.z + c.z) / 3; - - float distance = 0.0; - float tempDistance = 0.0; - - x = centerX - a.x; - y = centerY - a.y; - z = centerZ - a.z; - tempDistance = sqrtf((x * x) + (y * y) + (z * z)); - if(tempDistance > distance) distance = tempDistance; - - x = centerX - b.x; - y = centerY - b.y; - z = centerZ - b.z; - tempDistance = sqrtf((x * x) + (y * y) + (z * z)); - if(tempDistance > distance) distance = tempDistance; - - x = centerX - c.x; - y = centerY - c.y; - z = centerZ - c.z; - tempDistance = sqrtf((x * x) + (y * y) + (z * z)); - if(tempDistance > distance) distance = tempDistance; - distance += 0.0001; - - /** Load our data into the triangle slice **/ - newTriangle.a = a; - newTriangle.b = b; - newTriangle.c = c; - newTriangle.diffuse = diffuse; - newTriangle.ambient = ambient; - newTriangle.specular = specular; - - newTriangle.shininess = shininess; - newTriangle.reflect = reflect; - newTriangle.refract = refract; - - newTriangle.normal = normal; - - newTriangle.centerx = centerX; - newTriangle.centery = centerY; - newTriangle.centerz = centerZ; - newTriangle.distance = distance; - newTriangle.distanceSquared = (distance * distance); - newTriangle.padding = 0.0; - - triangle_tData.push_back( newTriangle ); - + rt._display(); } void addCube(vec3 position, vec3 diffuse, vec3 ambient, vec3 specular, float shininess, float reflect, float refract) { @@ -300,200 +125,78 @@ void addCube(vec3 position, vec3 diffuse, vec3 ambient, vec3 specular, float shi }; //front - addTriangle(vertices[1] + position, vertices[0] + position, vertices[3] + position, diffuse, ambient, specular, shininess, reflect, refract); - addTriangle(vertices[1] + position, vertices[3] + position, vertices[2] + position, diffuse, ambient, specular, shininess, reflect, refract); + rt.addTriangle(vertices[1] + position, vertices[0] + position, vertices[3] + position, diffuse, ambient, specular, shininess, reflect, refract); + rt.addTriangle(vertices[1] + position, vertices[3] + position, vertices[2] + position, diffuse, ambient, specular, shininess, reflect, refract); //back - addTriangle(vertices[6] + position, vertices[7] + position, vertices[4] + position, diffuse, ambient, specular, shininess, reflect, refract); - addTriangle(vertices[6] + position, vertices[4] + position, vertices[5] + position, diffuse, ambient, specular, shininess, reflect, refract); + rt.addTriangle(vertices[6] + position, vertices[7] + position, vertices[4] + position, diffuse, ambient, specular, shininess, reflect, refract); + rt.addTriangle(vertices[6] + position, vertices[4] + position, vertices[5] + position, diffuse, ambient, specular, shininess, reflect, refract); //right - addTriangle(vertices[2] + position, vertices[3] + position, vertices[7] + position, diffuse, ambient, specular, shininess, reflect, refract); - addTriangle(vertices[2] + position, vertices[7] + position, vertices[6] + position, diffuse, ambient, specular, shininess, reflect, refract); + rt.addTriangle(vertices[2] + position, vertices[3] + position, vertices[7] + position, diffuse, ambient, specular, shininess, reflect, refract); + rt.addTriangle(vertices[2] + position, vertices[7] + position, vertices[6] + position, diffuse, ambient, specular, shininess, reflect, refract); //left - addTriangle(vertices[5] + position, vertices[4] + position, vertices[0] + position, diffuse, ambient, specular, shininess, reflect, refract); - addTriangle(vertices[5] + position, vertices[0] + position, vertices[1] + position, diffuse, ambient, specular, shininess, reflect, refract); + rt.addTriangle(vertices[5] + position, vertices[4] + position, vertices[0] + position, diffuse, ambient, specular, shininess, reflect, refract); + rt.addTriangle(vertices[5] + position, vertices[0] + position, vertices[1] + position, diffuse, ambient, specular, shininess, reflect, refract); //top - addTriangle(vertices[5] + position, vertices[1] + position, vertices[2] + position, diffuse, ambient, specular, shininess, reflect, refract); - addTriangle(vertices[5] + position, vertices[2] + position, vertices[6] + position, diffuse, ambient, specular, shininess, reflect, refract); + rt.addTriangle(vertices[5] + position, vertices[1] + position, vertices[2] + position, diffuse, ambient, specular, shininess, reflect, refract); + rt.addTriangle(vertices[5] + position, vertices[2] + position, vertices[6] + position, diffuse, ambient, specular, shininess, reflect, refract); //bottom - addTriangle(vertices[0] + position, vertices[4] + position, vertices[7] + position, diffuse, ambient, specular, shininess, reflect, refract); - addTriangle(vertices[0] + position, vertices[7] + position, vertices[3] + position, diffuse, ambient, specular, shininess, reflect, refract); -} - -void pushTriangleDataToBuffer( std::vector &dataBuffer, - std::vector &triangleBuffer, - size_t start, size_t count ) { - - gprint( PRINT_DEBUG, "Adding triangles from %lu to %lu, out of %lu total.\n", - start, start + count, triangleBuffer.size() ); - - size_t numFloats = dataBuffer.size(); - size_t numTriangles = triangleBuffer.size(); - - if (start > numTriangles) { - throw std::logic_error( "start index in pushTriangleDataToBuffer cannot exceed " - "the total size of the triangleBuffer vector.\n" ); - } - - /** Request a std::vector resize **/ - size_t numLeft = (numTriangles - start); - if (count > numLeft) count = numLeft; - size_t floatsPerTriangle = numOfTriangleVectors * 3; - size_t newFloats = count * floatsPerTriangle; - if ((sizeof(triangle_t) * count) != (newFloats * sizeof(GLfloat))) { - throw std::logic_error( "Size of new triangles to add is different from the size " - "we requested for new floats we requested for the buffer." ); - } - - dataBuffer.resize( numFloats + newFloats ); - void *src = &(dataBuffer.at(numFloats)); - void *dst = &(triangleBuffer.at(start)); - memcpy( src, dst, sizeof(triangle_t) * count ); - -} - -void pushDataToBuffer( std::vector &dataBuffer ) { - - vec3 min, max; - min = vec3( INFINITY, INFINITY, INFINITY ); - max = vec3( -INFINITY, -INFINITY, -INFINITY ); - - std::vector::iterator it; - size_t count = 1; - numTriangles = triangle_tData.size(); - - for (it = triangle_tData.begin(); it != triangle_tData.end(); ++it, ++count ) { - setMinMax( min, max, *it ); - - // If we've added some amount of triangles (20, currently) - // Or if this is the LAST triangle, add the bounding box and triangles. - if ((count % numOfL2TrianglesBounded == 0) || - (count == triangle_tData.size())) { - - // Push bounding box into the buffer. - addVec3ToVector(&bufferData, min); - addVec3ToVector(&bufferData, max); - - // ???? - dataBuffer.push_back((GLfloat)numOfL2TrianglesBounded); - dataBuffer.push_back(0.0); - dataBuffer.push_back(0.0); - - // Push the triangles this box bounds into the buffer. - // pTDTB( destination, source, start_index, num_to_push ) - pushTriangleDataToBuffer( dataBuffer, triangle_tData, - // Below: (0 * 20), (1 * 20), etc. - (numOfL2BoundingBoxes * numOfL2TrianglesBounded), - numOfL2TrianglesBounded ); - - // Increment how many Bounding Boxes we've generated. - ++numOfL2BoundingBoxes; - - // Reset our Bounding Box. - min = vec3( INFINITY, INFINITY, INFINITY ); - max = vec3( -INFINITY, -INFINITY, -INFINITY ); - } - } - - gprint( PRINT_DEBUG, "numTriangles %d\n", numTriangles ); - gprint( PRINT_DEBUG, "numOfL2BoundingBoxes %d\n", numOfL2BoundingBoxes ); - - - GLuint bufObj; - glActiveTexture(GL_TEXTURE0); - glGenBuffers(1, &bufObj); - glBindBuffer(GL_TEXTURE_BUFFER, bufObj); - glBufferData(GL_TEXTURE_BUFFER, sizeof(GLfloat) * bufferData.size(), bufferData.data(), GL_STATIC_DRAW); - glTexBuffer(GL_TEXTURE_BUFFER, GL_RGB32F, bufObj); + rt.addTriangle(vertices[0] + position, vertices[4] + position, vertices[7] + position, diffuse, ambient, specular, shininess, reflect, refract); + rt.addTriangle(vertices[0] + position, vertices[7] + position, vertices[3] + position, diffuse, ambient, specular, shininess, reflect, refract); } void genereateScene() { //TODO: raytrace1 use class/Raytrace - Object *bottle = new Object("", program); ObjLoader::loadModelFromFile( bottle, "../models/bottle_wine_med.obj" ); - - vec4 *vertices = bottle->_vertices.data(); - - unsigned long int count = 0; - while(count < bottle->_vertices.size()) { - vec4 vertex = vertices[count++]; - vec3 a = vec3(vertex.x, vertex.y, vertex.z); - vertex = vertices[count++]; - vec3 b = vec3(vertex.x, vertex.y, vertex.z); - vertex = vertices[count++]; - vec3 c = vec3(vertex.x, vertex.y, vertex.z); - - addTriangle(a, b, c, vec3(0.5, 0.5, 0.5), vec3(0.05, 0.05, 0.05), vec3(1.0, 1.0, 1.0), 100.0, 0.3, 1.0); - } - + bottle ->bufferToRaytracer(rt); addCube(vec3(-2.0, 1.0, -3.0), vec3(0.8, 0.8, 0.8), vec3(0.05, 0.05, 0.05), vec3(0.0, 0.0, 0.0), 1000.0, 0.5, 0.0); addCube(vec3(2.0, 1.0, -3.0), vec3(0.8, 0.8, 0.8), vec3(0.05, 0.05, 0.05), vec3(0.0, 0.0, 0.0), 1000.0, 0.5, 0.0); - addTriangle(vec3(-5.0, -3.0, -5.0), vec3(5.0, -3.0, -5.0), vec3(5.0, 7.0, -5.0), vec3(1.0, 1.0, 1.0), vec3(0.05, 0.05, 0.05), vec3(1.0, 1.0, 1.0), 100.0, 0.0, 0.0); - addTriangle(vec3(-5.0, -3.0, -5.0), vec3(5.0, 7.0, -5.0), vec3(-5.0, 7.0, -5.0), vec3(0.0, 0.0, 1.0), vec3(0.0, 0.0, 0.05), vec3(0.0, 0.0, 1.0), 100.0, 0.0, 0.0); + rt.addTriangle(vec3(-5.0, -3.0, -5.0), vec3(5.0, -3.0, -5.0), vec3(5.0, 7.0, -5.0), vec3(1.0, 1.0, 1.0), vec3(0.05, 0.05, 0.05), vec3(1.0, 1.0, 1.0), 100.0, 0.0, 0.0); + rt.addTriangle(vec3(-5.0, -3.0, -5.0), vec3(5.0, 7.0, -5.0), vec3(-5.0, 7.0, -5.0), vec3(0.0, 0.0, 1.0), vec3(0.0, 0.0, 0.05), vec3(0.0, 0.0, 1.0), 100.0, 0.0, 0.0); - addTriangle(vec3(-5.0, -3.0, -5.0), vec3(-5.0, -3.0, 5.0), vec3(5.0, -3.0, 5.0), vec3(0.0, 1.0, 0.0), vec3(0.0, 0.05, 0.0), vec3(0.0, 1.0, 0.0), 100.0, 0.0, 0.0); - addTriangle(vec3(-5.0, -3.0, -5.0), vec3(5.0, -3.0, 5.0), vec3(5.0, -3.0, -5.0), vec3(1.0, 0.0, 0.0), vec3(0.05, 0.0, 0.0), vec3(1.0, 0.0, 0.0), 100.0, 0.0, 0.0); + rt.addTriangle(vec3(-5.0, -3.0, -5.0), vec3(-5.0, -3.0, 5.0), vec3(5.0, -3.0, 5.0), vec3(0.0, 1.0, 0.0), vec3(0.0, 0.05, 0.0), vec3(0.0, 1.0, 0.0), 100.0, 0.0, 0.0); + rt.addTriangle(vec3(-5.0, -3.0, -5.0), vec3(5.0, -3.0, 5.0), vec3(5.0, -3.0, -5.0), vec3(1.0, 0.0, 0.0), vec3(0.05, 0.0, 0.0), vec3(1.0, 0.0, 0.0), 100.0, 0.0, 0.0); - addTriangle(vec3(-5.0, -3.0, -5.0), vec3(-5.0, 7.0, 5.0), vec3(-5.0, -3.0, 5.0), vec3(1.0, 0.0, 1.0), vec3(0.05, 0.0, 0.05), vec3(1.0, 0.0, 1.0), 100.0, 0.0, 0.0); - addTriangle(vec3(-5.0, -3.0, -5.0), vec3(-5.0, 7.0, -5.0), vec3(-5.0, 7.0, 5.0), vec3(1.0, 1.0, 0.0), vec3(0.05, 0.05, 0.0), vec3(1.0, 1.0, 0.0), 100.0, 0.0, 0.0); + rt.addTriangle(vec3(-5.0, -3.0, -5.0), vec3(-5.0, 7.0, 5.0), vec3(-5.0, -3.0, 5.0), vec3(1.0, 0.0, 1.0), vec3(0.05, 0.0, 0.05), vec3(1.0, 0.0, 1.0), 100.0, 0.0, 0.0); + rt.addTriangle(vec3(-5.0, -3.0, -5.0), vec3(-5.0, 7.0, -5.0), vec3(-5.0, 7.0, 5.0), vec3(1.0, 1.0, 0.0), vec3(0.05, 0.05, 0.0), vec3(1.0, 1.0, 0.0), 100.0, 0.0, 0.0); - pushDataToBuffer( bufferData ); + rt.pushDataToBuffer(rt.bufferData); } /** * Initialization of objects and OpenGL state. */ void init( void ) { - - // Create a vertex array object - GLuint vao; - glGenVertexArrays( 1, &vao ); - glBindVertexArray( vao ); - // Load shaders and use the resulting shader program program = Angel::InitShader( "shaders/vRaytracer.glsl", - "shaders/fRaytracer.glsl" ); - Engine::instance()->switchShader( program ); - Engine::instance()->rootScene()->shader( program ); - Engine::instance()->cams()->shader( program ); - Engine::instance()->cams()->active()->shader( program ); - - vRayPosition = glGetAttribLocation( program, "vRayPosition" ); - - uNumOfSpheres = glGetUniformLocation( program, "uNumOfSpheres" ); - uSphereCenterPoints = glGetUniformLocation( program, "uSphereCenterPoints" ); - uSphereRadius = glGetUniformLocation( program, "uSphereRadius" ); - uSphereDiffuse = glGetUniformLocation( program, "uSphereDiffuse" ); - uSphereAmbient = glGetUniformLocation( program, "uSphereAmbient" ); - uSphereSpecular = glGetUniformLocation( program, "uSphereSpecular" ); - uSphereShininess = glGetUniformLocation( program, "uSphereShininess" ); - uSphereReflect = glGetUniformLocation( program, "uSphereReflect" ); - uSphereRefract = glGetUniformLocation( program, "uSphereRefract" ); - - uNumOfTriangle = glGetUniformLocation( program, "uNumOfTriangle" ); - uNumOfTriangleVectors = glGetUniformLocation( program, "uNumOfTriangleVectors" ); - - uNumOfL2BoundingBoxes = glGetUniformLocation( program, "uNumOfL2BoundingBoxes" ); - uNumOfL1BoundingBoxes = glGetUniformLocation( program, "uNumOfL1BoundingBoxes" ); - - uNumOfL2TrianglesBounded = glGetUniformLocation( program, "uNumOfL2TrianglesBounded" ); - - uNumberOfLights = glGetUniformLocation( program, "uNumberOfLights" ); - uLightPositions = glGetUniformLocation( program, "uLightPositions" ); - uLightDiffuse = glGetUniformLocation( program, "uLightDiffuse" ); - uLightSpecular = glGetUniformLocation( program, "uLightSpecular" ); - - tick.setTimeUniform( glGetUniformLocation( program, "ftime" ) ); + "shaders/fRaytracer.glsl" ); + + rt.numOfL2TrianglesBounded = numOfL2TrianglesBounded; + rt.numOfTriangleVectors = numOfTriangleVectors; + rt.numberOfLights = numberOfLights; + rt.lightDiffuse = lightDiffuse; + rt.lightPositions = lightPositions; + rt.lightSpecular = lightSpecular; + rt.numSpheres = numSpheres; + rt.sphereAmbient = sphereAmbient; + rt.sphereCenterPoints = sphereCenterPoints; + rt.sphereDiffuse = sphereDiffuse; + rt.sphereRadius = sphereRadius; + rt.sphereReflect = sphereReflect; + rt.sphereRefract = sphereRefract; + rt.sphereShininess = sphereShininess; + rt.sphereSpecular = sphereSpecular; + rt.init(program); genereateScene(); } diff --git a/src/Classes/MONOLITH.cpp b/src/Classes/MONOLITH.cpp index 8e030916..cf519d17 100644 --- a/src/Classes/MONOLITH.cpp +++ b/src/Classes/MONOLITH.cpp @@ -53,9 +53,6 @@ void MONOLITH::cleanup(void) { extinguish = true; zipo.join(); - if(lightPositions)free(lightPositions); - if(lightDiffuse)free(lightDiffuse); - if(lightSpecular)free(lightSpecular); } bool heisenbergUncertaintyPrinciple; @@ -447,7 +444,7 @@ void MONOLITH::raytraceStatusChanged(bool newstatus) //ITERATE OVER ALL OBJS IN SCENE! Engine::instance()->rootScene()->bufferToRaytracer( rt ); - rt.pushDataToBuffer(); + rt.pushDataToBuffer(rt.bufferData); // rt.genereateScene(objs); } else diff --git a/src/Classes/RayTracer.cpp b/src/Classes/RayTracer.cpp index de9c7606..0e7c61e8 100644 --- a/src/Classes/RayTracer.cpp +++ b/src/Classes/RayTracer.cpp @@ -11,97 +11,90 @@ RayTracer::RayTracer() : display(boost::bind(&RayTracer::_display,this)) { - lightPositions = (GLfloat*)malloc(sizeof(GLfloat)*3); - lightPositions[0]=lightPositions[1]=1.0; - lightPositions[2]=10.0; - lightDiffuse = (GLfloat*)malloc(sizeof(GLfloat)*3); - lightSpecular = (GLfloat*)malloc(sizeof(GLfloat)*3); - lightDiffuse[0]=lightDiffuse[1]=lightDiffuse[2]=lightSpecular[0]=lightSpecular[1]=lightSpecular[2]=1.0; - // TODO Auto-generated constructor stub - } RayTracer::~RayTracer() { - if (lightPositions)free(lightPositions); - if(lightDiffuse)free(lightDiffuse); - if(lightSpecular)free(lightSpecular); } + + +void RayTracer::setMinMax( vec3 &min, vec3 &max, triangle_t &t ) { + + MINTRIPLET( x ); + MINTRIPLET( y ); + MINTRIPLET( z ); + + MAXTRIPLET( x ); + MAXTRIPLET( y ); + MAXTRIPLET( z ); + + } + /** * Handle the re-display of the scene. */ void RayTracer::_display( void ) { #ifndef __APPLE__ - Engine &engie = *Engine::instance(); - Camera *cammy = engie.cams()->active(); - glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); - engie.switchCamera( cammy ); - engie.switchShader( program ); - - tick.sendTime(); - - int numSpheres = 0; - glUniform1i( uNumOfSpheres, numSpheres ); - /*glUniform3fv( uSphereCenterPoints, numSpheres, sphereCenterPoints ); - glUniform1fv( uSphereRadius, numSpheres, sphereRadius ); - glUniform3fv( uSphereDiffuse, numSpheres, sphereDiffuse ); - glUniform3fv( uSphereAmbient, numSpheres, sphereAmbient ); - glUniform3fv( uSphereSpecular, numSpheres, sphereSpecular ); - glUniform1fv( uSphereShininess, numSpheres, sphereShininess ); - glUniform1fv( uSphereReflect, numSpheres, sphereReflect ); - glUniform1fv( uSphereRefract, numSpheres, sphereRefract );*/ - - glUniform1i( uNumOfTriangle, numTriangles ); - glUniform1i( uNumOfTriangleVectors, numOfTriangleVectors ); - - glUniform1i( uNumOfBoundingBoxes, numOfBoundingBoxes ); - - glUniform3fv( uLightPositions, 1, lightPositions ); - glUniform3fv( uLightDiffuse, 1, lightDiffuse ); - glUniform3fv( uLightSpecular, 1, lightSpecular ); - - GLfloat vertices[] = { 1.0, 1.0, -1.0, 1.0, 1.0, -1.0, -1.0, -1.0, }; - - GLuint vbo_vertices; - glGenBuffers( 1, &vbo_vertices ); - glBindBuffer( GL_ARRAY_BUFFER, vbo_vertices ); - glBufferData( GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW ); - glBindBuffer( GL_ARRAY_BUFFER, 0 ); - - glBindBuffer( GL_ARRAY_BUFFER, vbo_vertices ); - glEnableVertexAttribArray( vRayPosition ); - glVertexAttribPointer( vRayPosition, // attribute - 2, // number of elements per vertex, here (x,) - GL_FLOAT, // the type of each element - GL_FALSE, // take our values as-is - 0, // no extra data between each position - 0 // offset of first element - ); - - - //this stuff is important. WOOPS! - glUniform1i( uDisplay, 0 ); - - glUniformMatrix4fv( uRotationMatrix, 1, GL_TRUE, - Engine::instance()->cams()->active()->_trans._rotation.matrix() ); - glUniform4fv( uCameraPosition, 1, Engine::instance()->cams()->active()->_trans._displacement.matrix() ); - glDrawArrays( GL_TRIANGLE_STRIP, 0, 4 ); - - - glutSwapBuffers(); - glDisableVertexAttribArray( vRayPosition ); - - frameCount++; - if ( frameCount == 10 ) { - float elapsedTime = glutGet( GLUT_ELAPSED_TIME ); - float fps = 10.0 / ((elapsedTime - previousTime) / 1000.0); - printf("fps: %f\n", fps ); - previousTime = elapsedTime; - frameCount = 0; - } + glUniform1i( uNumOfSpheres, numSpheres ); + glUniform3fv( uSphereCenterPoints, numSpheres, sphereCenterPoints ); + glUniform1fv( uSphereRadius, numSpheres, sphereRadius ); + glUniform3fv( uSphereDiffuse, numSpheres, sphereDiffuse ); + glUniform3fv( uSphereAmbient, numSpheres, sphereAmbient ); + glUniform3fv( uSphereSpecular, numSpheres, sphereSpecular ); + glUniform1fv( uSphereShininess, numSpheres, sphereShininess ); + glUniform1fv( uSphereReflect, numSpheres, sphereReflect ); + glUniform1fv( uSphereRefract, numSpheres, sphereRefract ); + + glUniform1i( uNumOfTriangle, numTriangles ); + glUniform1i( uNumOfTriangleVectors, numOfTriangleVectors ); + + glUniform1i( uNumOfL2BoundingBoxes, numOfL2BoundingBoxes ); + glUniform1i( uNumOfL1BoundingBoxes, numOfL1BoundingBoxes ); + + glUniform1i( uNumOfL2TrianglesBounded, numOfL2TrianglesBounded ); + + glUniform1i( uNumberOfLights, numberOfLights ); + glUniform3fv( uLightPositions, numberOfLights, lightPositions ); + glUniform3fv( uLightDiffuse, numberOfLights, lightDiffuse ); + glUniform3fv( uLightSpecular, numberOfLights, lightSpecular ); + + GLfloat vertices[] = { 1.0, 1.0, -1.0, 1.0, 1.0, -1.0, -1.0, -1.0, }; + + GLuint vbo_vertices; + glGenBuffers( 1, &vbo_vertices ); + glBindBuffer( GL_ARRAY_BUFFER, vbo_vertices ); + glBufferData( GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW ); + glBindBuffer( GL_ARRAY_BUFFER, 0 ); + + glBindBuffer( GL_ARRAY_BUFFER, vbo_vertices ); + glEnableVertexAttribArray( vRayPosition ); + glVertexAttribPointer( vRayPosition, // attribute + 2, // number of elements per vertex, here (x,) + GL_FLOAT, // the type of each element + GL_FALSE, // take our values as-is + 0, // no extra data between each position + 0 // offset of first element + ); + + Engine::instance()->cams()->active()->relinkUniforms(); + Engine::instance()->cams()->active()->view(); + + glDrawArrays( GL_TRIANGLE_STRIP, 0, 4 ); + + glutSwapBuffers(); + glDisableVertexAttribArray( vRayPosition ); + + frameCount++; + if ( frameCount == 10 ) { + float elapsedTime = glutGet( GLUT_ELAPSED_TIME ); + float fps = 10.0 / ((elapsedTime - previousTime) / 1000.0); + gprint( PRINT_INFO, "fps: %f\n", fps ); + previousTime = elapsedTime; + frameCount = 0; + } #else gprint(PRINT_ERROR, "STEVE JOBS SAYS YOU CAN'T DO THAT!\n"); #endif @@ -113,27 +106,6 @@ void RayTracer::addVec3ToVector(std::vector *_vector, vec3 _vec3) { _vector->push_back(_vec3.z); } -void RayTracer::setMinMax(vec3 *min, vec3 *max, vec3 v) { - - if(min->x > v.x) { - min->x = v.x; - } else if (max->x < v.x) { - max->x = v.x; - } - - if(min->y > v.y) { - min->y = v.y; - } else if (max->y < v.y) { - max->y = v.y; - } - - if(min->z > v.z) { - min->z = v.z; - } else if (max->z < v.z) { - max->z = v.z; - } -} - void RayTracer::addTriangle( const vec3& a, const vec3& b, const vec3& c, const vec3& diffuse, const vec3& ambient, const vec3& specular, float shininess, float reflect, float refract) { @@ -169,6 +141,7 @@ void RayTracer::addTriangle( const vec3& a, const vec3& b, const vec3& c, if(tempDistance > distance) distance = tempDistance; distance += 0.0001; + /** Load our data into the triangle slice **/ newTriangle.a = a; newTriangle.b = b; newTriangle.c = c; @@ -189,104 +162,96 @@ void RayTracer::addTriangle( const vec3& a, const vec3& b, const vec3& c, newTriangle.distanceSquared = (distance * distance); newTriangle.padding = 0.0; - GLfloat *ptr = NULL; - for ( ptr = (GLfloat *)&newTriangle; - (void *)ptr < (void *)(&newTriangle + 1); - ptr++ ) { - bufferData.push_back( *ptr ); - } - - numTriangles++; + triangle_tData.push_back( newTriangle ); } -void RayTracer::pushDataToBuffer() { -#ifndef __APPLE__ - gprint( PRINT_DEBUG, "numTriangles %d\n", numTriangles ); - gprint( PRINT_DEBUG, "numOfBoundingBoxes %d\n", numOfBoundingBoxes ); - - GLuint bufObj; - glActiveTexture(GL_TEXTURE0); - glGenBuffers(1, &bufObj); - glBindBuffer(GL_TEXTURE_BUFFER, bufObj); - glBufferData(GL_TEXTURE_BUFFER, sizeof(GLfloat) * bufferData.size(), bufferData.data(), GL_STATIC_DRAW); - glTexBuffer(GL_TEXTURE_BUFFER, GL_RGB32F, bufObj); -#else - gprint(PRINT_ERROR, "STEVE JOBS SAYS YOU CAN'T DO THAT!\n"); -#endif -} +void RayTracer::pushTriangleDataToBuffer( std::vector &dataBuffer, + std::vector &triangleBuffer, + size_t start, size_t count ) { + gprint( PRINT_DEBUG, "Adding triangles from %lu to %lu, out of %lu total.\n", + start, start + count, triangleBuffer.size() ); -/* -void RayTracer::genereateScene(std::vector objects) { + size_t numFloats = dataBuffer.size(); + size_t numTriangles = triangleBuffer.size(); - std::vector boundingBoxes; + if (start > numTriangles) { + throw std::logic_error( "start index in pushTriangleDataToBuffer cannot exceed " + "the total size of the triangleBuffer vector.\n" ); + } - vec3 diffuse = vec3(0.0, 1.0, 0.0); - vec3 ambient = vec3(0.0, 0.1, 0.0); - vec3 specular = vec3(0.0, 0.0, 0.0); + /** Request a std::vector resize **/ + size_t numLeft = (numTriangles - start); + if (count > numLeft) count = numLeft; + size_t floatsPerTriangle = numOfTriangleVectors * 3; + size_t newFloats = count * floatsPerTriangle; + if ((sizeof(triangle_t) * count) != (newFloats * sizeof(GLfloat))) { + throw std::logic_error( "Size of new triangles to add is different from the size " + "we requested for new floats we requested for the buffer." ); + } - for(std::vector::iterator it = objects.begin(); it != objects.end(); it++) - { + dataBuffer.resize( numFloats + newFloats ); + void *dst = &(dataBuffer.at(numFloats)); + void *src = &(triangleBuffer.at(start)); + memcpy( dst, src, sizeof(triangle_t) * count ); +} - vec3 min, max; - - vec4 *vertices = (*it)->_vertices.data(); - min.x = vertices[0].x; - max.x = vertices[0].x; - min.y = vertices[0].y; - max.y = vertices[0].y; - min.z = vertices[0].z; - max.z = vertices[0].z; - - int bounding = 10; - - unsigned long int count = 0; - while(count < (*it)->_vertices.size()) { - vec4 vertex = vertices[count++]; - vec3 a = vec3(vertex.x, vertex.y, vertex.z); - vertex = vertices[count++]; - vec3 b = vec3(vertex.x, vertex.y, vertex.z); - vertex = vertices[count++]; - vec3 c = vec3(vertex.x, vertex.y, vertex.z); - - setMinMax(&min, &max, a); - setMinMax(&min, &max, b); - setMinMax(&min, &max, c); - - //addTriangle(a, b, c, diffuse, ambient, specular, 1.0, 0.5, 0.0); - - if(numTriangles > 0 && numTriangles % bounding == 0) { - addVec3ToVector(&boundingBoxes, min); - addVec3ToVector(&boundingBoxes, max); - boundingBoxes.push_back(float(numTriangles - bounding)); // starting index - boundingBoxes.push_back((float)numTriangles); // ending index - boundingBoxes.push_back(0.0); // unused - numOfBoundingBoxes += 1; - - min.x = vertices[count + 1].x; - max.x = vertices[count + 1].x; - min.y = vertices[count + 1].y; - max.y = vertices[count + 1].y; - min.z = vertices[count + 1].z; - max.z = vertices[count + 1].z; +void RayTracer::pushDataToBuffer( std::vector &dataBuffer ) { +#ifndef __APPLE__ + vec3 min, max; + min = vec3( INFINITY, INFINITY, INFINITY ); + max = vec3( -INFINITY, -INFINITY, -INFINITY ); + + std::vector::iterator it; + size_t count = 1; + numTriangles = triangle_tData.size(); + + for (it = triangle_tData.begin(); it != triangle_tData.end(); ++it, ++count ) { + setMinMax( min, max, *it ); + + // If we've added some amount of triangles (20, currently) + // Or if this is the LAST triangle, add the bounding box and triangles. + if ((count % numOfL2TrianglesBounded == 0) || + (count == triangle_tData.size())) { + + // Push bounding box into the buffer. + addVec3ToVector(&bufferData, min); + addVec3ToVector(&bufferData, max); + + // ???? + dataBuffer.push_back((GLfloat)numOfL2TrianglesBounded); + dataBuffer.push_back(0.0); + dataBuffer.push_back(0.0); + + // Push the triangles this box bounds into the buffer. + // pTDTB( destination, source, start_index, num_to_push ) + pushTriangleDataToBuffer( dataBuffer, triangle_tData, + // Below: (0 * 20), (1 * 20), etc. + (numOfL2BoundingBoxes * numOfL2TrianglesBounded), + numOfL2TrianglesBounded ); + + // Increment how many Bounding Boxes we've generated. + ++numOfL2BoundingBoxes; + + // Reset our Bounding Box. + min = vec3( INFINITY, INFINITY, INFINITY ); + max = vec3( -INFINITY, -INFINITY, -INFINITY ); } - } - addVec3ToVector(&boundingBoxes, min); - addVec3ToVector(&boundingBoxes, max); - boundingBoxes.push_back(float(numTriangles - bounding)); // starting index - boundingBoxes.push_back((float)numTriangles); // ending index - boundingBoxes.push_back(0.0); // unused - numOfBoundingBoxes += 1; - } + gprint( PRINT_DEBUG, "numTriangles %d\n", numTriangles ); + gprint( PRINT_DEBUG, "numOfL2BoundingBoxes %d\n", numOfL2BoundingBoxes ); - for(unsigned long int i = 0; i < boundingBoxes.size(); i++) { - bufferData.push_back(boundingBoxes.data()[i]); - } - pushDataToBuffer(); + GLuint bufObj; + glActiveTexture(GL_TEXTURE0); + glGenBuffers(1, &bufObj); + glBindBuffer(GL_TEXTURE_BUFFER, bufObj); + glBufferData(GL_TEXTURE_BUFFER, sizeof(GLfloat) * bufferData.size(), bufferData.data(), GL_STATIC_DRAW); + glTexBuffer(GL_TEXTURE_BUFFER, GL_RGB32F, bufObj); +#else + gprint(PRINT_ERROR, "STEVE JOBS SAYS YOU CAN'T DO THAT!\n"); +#endif } -*/ /** * Initialization of objects and OpenGL state. @@ -302,12 +267,11 @@ void RayTracer::init( GLint shader ) { glBindVertexArray( vao ); Engine::instance()->switchShader( program ); + Engine::instance()->rootScene()->shader( program ); + Engine::instance()->cams()->shader( program ); + Engine::instance()->cams()->active()->shader( program ); vRayPosition = glGetAttribLocation( program, "vRayPosition" ); - uDisplay = glGetUniformLocation( program, "uDisplay" ); - - uRotationMatrix = glGetUniformLocation( program, "uRotationMatrix" ); - uCameraPosition = glGetUniformLocation( program, "uCameraPosition" ); uNumOfSpheres = glGetUniformLocation( program, "uNumOfSpheres" ); uSphereCenterPoints = glGetUniformLocation( program, "uSphereCenterPoints" ); @@ -322,8 +286,12 @@ void RayTracer::init( GLint shader ) { uNumOfTriangle = glGetUniformLocation( program, "uNumOfTriangle" ); uNumOfTriangleVectors = glGetUniformLocation( program, "uNumOfTriangleVectors" ); - uNumOfBoundingBoxes = glGetUniformLocation( program, "uNumOfBoundingBoxes" ); + uNumOfL2BoundingBoxes = glGetUniformLocation( program, "uNumOfL2BoundingBoxes" ); + uNumOfL1BoundingBoxes = glGetUniformLocation( program, "uNumOfL1BoundingBoxes" ); + + uNumOfL2TrianglesBounded = glGetUniformLocation( program, "uNumOfL2TrianglesBounded" ); + uNumberOfLights = glGetUniformLocation( program, "uNumberOfLights" ); uLightPositions = glGetUniformLocation( program, "uLightPositions" ); uLightDiffuse = glGetUniformLocation( program, "uLightDiffuse" ); uLightSpecular = glGetUniformLocation( program, "uLightSpecular" ); diff --git a/src/include/RayTracer.h b/src/include/RayTracer.h index 94c7f250..21876525 100644 --- a/src/include/RayTracer.h +++ b/src/include/RayTracer.h @@ -22,6 +22,18 @@ #include #include "RaytraceBuffer.hpp" +#define MINMACRO( XYZ, ABC ) if (min.XYZ > t.ABC.XYZ) min.XYZ = t.ABC.XYZ; +#define MAXMACRO( XYZ, ABC ) if (max.XYZ < t.ABC.XYZ) max.XYZ = t.ABC.XYZ; +#define MINTRIPLET( XYZ ) \ + MINMACRO( XYZ, a ) \ + MINMACRO( XYZ, b ) \ + MINMACRO( XYZ, c ) + +#define MAXTRIPLET( XYZ ) \ + MAXMACRO( XYZ, a ) \ + MAXMACRO( XYZ, b ) \ + MAXMACRO( XYZ, c ) + class RayTracer { public: @@ -30,16 +42,17 @@ class RayTracer void init(GLint shader); void generateScene(void); void addVec3ToVector(std::vector *_vector, vec3 _vec3); - void setMinMax(vec3 *min, vec3 *max, vec3 v); void addTriangle( const vec3& a, const vec3& b, const vec3& c, const vec3& diffuse, const vec3& ambient, const vec3& specular, float shininess, float reflect, float refract); - void pushDataToBuffer(); + void pushTriangleDataToBuffer( std::vector &dataBuffer, + std::vector &triangleBuffer, + size_t start, size_t count ); + void pushDataToBuffer( std::vector &dataBuffer ); //void genereateScene(std::vector objects); - virtual - ~RayTracer(); - private: + virtual ~RayTracer(); void _display(void); + void setMinMax( vec3 &min, vec3 &max, triangle_t &t ); int frameCount; float previousTime; @@ -57,10 +70,19 @@ class RayTracer GLint uSphereReflect; GLint uSphereRefract; GLint uNumOfSpheres; + GLfloat *sphereCenterPoints, *sphereRadius, *sphereAmbient, *sphereDiffuse, *sphereSpecular, *sphereShininess, *sphereReflect, *sphereRefract; + GLint numSpheres; GLint uNumOfTriangle; GLint uNumOfTriangleVectors; + GLint uNumOfL2BoundingBoxes; + GLint uNumOfL1BoundingBoxes; + + GLint uNumOfL2TrianglesBounded; + + GLint uNumberOfLights; + GLint uNumOfBoundingBoxes; GLint uNumOfBoundingSpheres; GLint uNumOfTrianglesBounded; @@ -69,19 +91,23 @@ class RayTracer GLint uLightDiffuse; GLint uLightSpecular; + int numberOfLights; GLfloat *lightPositions; GLfloat *lightDiffuse; GLfloat *lightSpecular; int numTriangles; - int numOfBoundingSpheres; - std::vector< GLfloat > bufferData; + int numOfL2BoundingBoxes; + int numOfL1BoundingBoxes; + int numOfBoundingBoxes; - int numOfTriangleVectors; - int numOfTrianglesBounded; + int numOfL2TrianglesBounded; - int numOfBoundingBoxes; + std::vector bufferData; + std::vector triangle_tData; + + int numOfTriangleVectors; GLint uDisplay;