Merge pull request #3540 from samcake/temp0

replacing glutSolidSPhere by a cached Geometry

interface/resources/shaders/SkyFromAtmosphere.vert

@@ -35,6 +35,7 @@
 uniform vec3 v3CameraPos;		// The camera's current position
 uniform vec3 v3LightPos;		// The direction vector to the light source
 uniform vec3 v3InvWavelength;	// 1 / pow(wavelength, 4) for the red, green, and blue channels
+uniform float fOuterRadius;		// The outer (atmosphere) radius
 uniform float fInnerRadius;		// The inner (planetary) radius
 uniform float fKrESun;			// Kr * ESun
 uniform float fKmESun;			// Km * ESun
@@ -44,6 +45,7 @@ uniform float fScale;			// 1 / (fOuterRadius - fInnerRadius)
 uniform float fScaleDepth;		// The scale depth (i.e. the altitude at which the atmosphere's average density is found)
 uniform float fScaleOverScaleDepth;	// fScale / fScaleDepth
 
+
 const int nSamples = 2;
 const float fSamples = 2.0;
 
@@ -59,7 +61,7 @@ float scale(float fCos)
 void main(void)
 {
 	// Get the ray from the camera to the vertex, and its length (which is the far point of the ray passing through the atmosphere)
-	position = gl_Vertex.xyz;
+	position = gl_Vertex.xyz * fOuterRadius;
     
-	gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+	gl_Position = gl_ModelViewProjectionMatrix * vec4(position, 1.0);
 }

interface/resources/shaders/SkyFromSpace.vert

@@ -32,10 +32,12 @@
 // Copyright (c) 2004 Sean O'Neil
 //
 
+uniform float fOuterRadius;		// The outer (atmosphere) radius
+
 varying vec3 position;
 
 void main(void)
 {
-	position = gl_Vertex.xyz;
+	position = gl_Vertex.xyz * fOuterRadius;
-	gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+	gl_Position = gl_ModelViewProjectionMatrix * vec4(position, 1.0);
 }

interface/src/Application.cpp

@@ -883,7 +883,11 @@ void Application::keyPressEvent(QKeyEvent* event) {
                 break;
 
             case Qt::Key_W:
-                _myAvatar->setDriveKeys(FWD, 1.f);
+                if (isOption && !isShifted && !isMeta) {
+                    Menu::getInstance()->triggerOption(MenuOption::Wireframe);
+                } else {
+                    _myAvatar->setDriveKeys(FWD, 1.f);
+                }
                 break;
 
             case Qt::Key_S:
@@ -2902,10 +2906,8 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) {
         // draw a red sphere
         float originSphereRadius = 0.05f;
         glColor3f(1,0,0);
-        glPushMatrix();
+        _geometryCache.renderSphere(originSphereRadius, 15, 15);
-            glutSolidSphere(originSphereRadius, 15, 15);
+        
-        glPopMatrix();
-
         // draw the audio reflector overlay
         {
             PerformanceTimer perfTimer("audio");

interface/src/BuckyBalls.cpp

@@ -11,6 +11,7 @@
 
 #include "BuckyBalls.h"
 
+#include "Application.h"
 #include "Util.h"
 #include "world.h"
 #include "devices/SixenseManager.h"
@@ -171,7 +172,7 @@ void BuckyBalls::render() {
         }
         glPushMatrix();
         glTranslatef(_bballPosition[i].x, _bballPosition[i].y, _bballPosition[i].z);
-        glutSolidSphere(_bballRadius[i], 15, 15);
+        Application::getInstance()->getGeometryCache()->renderSphere(_bballRadius[i], 15, 15); 
         glPopMatrix();
     }
 }

interface/src/Environment.cpp

@@ -261,10 +261,10 @@ void Environment::renderAtmosphere(Camera& camera, const EnvironmentData& data)
     
     glDepthMask(GL_FALSE);
     glDisable(GL_DEPTH_TEST);
-    glutSolidSphere(data.getAtmosphereOuterRadius(), 100, 50);
+    Application::getInstance()->getGeometryCache()->renderSphere(1.f, 100, 50); //Draw a unit sphere
     glDepthMask(GL_TRUE);
     
     program->release();
     
-    glPopMatrix();  
+    glPopMatrix();
 }

interface/src/Menu.cpp

@@ -385,7 +385,7 @@ Menu::Menu() :
                                   0,
                                   appInstance->getGlowEffect(),
                                   SLOT(cycleRenderMode()));
-    addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Wireframe, 0, false);
+    addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Wireframe, Qt::ALT | Qt::Key_W, false);
     addActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::LodTools, Qt::SHIFT | Qt::Key_L, this, SLOT(lodTools()));
 
     QMenu* avatarDebugMenu = developerMenu->addMenu("Avatar");

interface/src/MetavoxelSystem.cpp

@@ -2423,7 +2423,7 @@ void SphereRenderer::renderUnclipped(const glm::vec4& color, Mode mode) {
     glm::vec3 axis = glm::axis(rotation);
     glRotatef(glm::degrees(glm::angle(rotation)), axis.x, axis.y, axis.z);
     
-    glutSolidSphere(sphere->getScale(), 10, 10);
+    Application::getInstance()->getGeometryCache()->renderSphere(sphere->getScale(), 10, 10);
     
     glPopMatrix();
 }

interface/src/Util.cpp

@@ -27,6 +27,7 @@
 #include "ui/TextRenderer.h"
 #include "VoxelConstants.h"
 #include "world.h"
+#include "Application.h"
 
 #include "Util.h"
 
@@ -112,13 +113,13 @@ void drawVector(glm::vec3 * vector) {
     glPushMatrix();
     glColor3f(1,0,0);
     glTranslatef(vector->x, 0, 0);
-    glutSolidSphere(0.02, 10, 10);
+    Application::getInstance()->getGeometryCache()->renderSphere(0.02f, 10, 10);
     glColor3f(0,1,0);
     glTranslatef(-vector->x, vector->y, 0);
-    glutSolidSphere(0.02, 10, 10);
+    Application::getInstance()->getGeometryCache()->renderSphere(0.02f, 10, 10);
     glColor3f(0,0,1);
     glTranslatef(0, -vector->y, vector->z);
-    glutSolidSphere(0.02, 10, 10);
+    Application::getInstance()->getGeometryCache()->renderSphere(0.02f, 10, 10);
     glPopMatrix();
 
 }
@@ -155,22 +156,22 @@ void renderWorldBox() {
     glPushMatrix();
     glTranslatef(MARKER_DISTANCE, 0, 0);
     glColor3fv(red);
-    glutSolidSphere(MARKER_RADIUS, 10, 10);
+    Application::getInstance()->getGeometryCache()->renderSphere(MARKER_RADIUS, 10, 10);
     glPopMatrix();
     glPushMatrix();
     glTranslatef(0, MARKER_DISTANCE, 0);
     glColor3fv(green);
-    glutSolidSphere(MARKER_RADIUS, 10, 10);
+    Application::getInstance()->getGeometryCache()->renderSphere(MARKER_RADIUS, 10, 10);
     glPopMatrix();
     glPushMatrix();
     glTranslatef(0, 0, MARKER_DISTANCE);
     glColor3fv(blue);
-    glutSolidSphere(MARKER_RADIUS, 10, 10);
+    Application::getInstance()->getGeometryCache()->renderSphere(MARKER_RADIUS, 10, 10);
     glPopMatrix();
     glPushMatrix();
     glColor3fv(gray);
     glTranslatef(MARKER_DISTANCE, 0, MARKER_DISTANCE);
-    glutSolidSphere(MARKER_RADIUS, 10, 10);
+    Application::getInstance()->getGeometryCache()->renderSphere(MARKER_RADIUS, 10, 10);
     glPopMatrix();
 
 }

interface/src/avatar/Avatar.cpp

@@ -399,7 +399,7 @@ void Avatar::render(const glm::vec3& cameraPosition, RenderMode renderMode, bool
                 } else {
                     glTranslatef(_position.x, getDisplayNamePosition().y + LOOK_AT_INDICATOR_OFFSET, _position.z);
                 }
-                glutSolidSphere(LOOK_AT_INDICATOR_RADIUS, 15, 15);
+                Application::getInstance()->getGeometryCache()->renderSphere(LOOK_AT_INDICATOR_RADIUS, 15, 15); 
                 glPopMatrix();
             }
         }
@@ -427,7 +427,8 @@ void Avatar::render(const glm::vec3& cameraPosition, RenderMode renderMode, bool
                 glPushMatrix();
                 glTranslatef(_position.x, _position.y, _position.z);
                 glScalef(height, height, height);
-                glutSolidSphere(sphereRadius, 15, 15);
+                Application::getInstance()->getGeometryCache()->renderSphere(sphereRadius, 15, 15); 
+
                 glPopMatrix();
             }
         }

interface/src/avatar/Hand.cpp

@@ -114,7 +114,7 @@ void Hand::render(bool isMine, Model::RenderMode renderMode) {
             glPushMatrix();
             glTranslatef(position.x, position.y, position.z);
             glColor3f(0.0f, 1.0f, 0.0f);
-            glutSolidSphere(PALM_COLLISION_RADIUS * _owningAvatar->getScale(), 10, 10);
+            Application::getInstance()->getGeometryCache()->renderSphere(PALM_COLLISION_RADIUS * _owningAvatar->getScale(), 10, 10);
             glPopMatrix();
         }
     }
@@ -179,7 +179,7 @@ void Hand::renderHandTargets(bool isMine) {
             Avatar::renderJointConnectingCone(root, offsetFromPalm, PALM_DISK_RADIUS, 0.0f);
             glPushMatrix();
             glTranslatef(root.x, root.y, root.z);
-            glutSolidSphere(PALM_BALL_RADIUS, 20.0f, 20.0f);
+            Application::getInstance()->getGeometryCache()->renderSphere(PALM_BALL_RADIUS, 20.0f, 20.0f);
             glPopMatrix();
         }
     }

interface/src/avatar/MyAvatar.cpp

@@ -399,7 +399,7 @@ void MyAvatar::renderDebugBodyPoints() {
     glPushMatrix();
     glColor4f(0, 1, 0, .5f);
     glTranslatef(position.x, position.y, position.z);
-    glutSolidSphere(0.2, 10, 10);
+    Application::getInstance()->getGeometryCache()->renderSphere(0.2, 10, 10);
     glPopMatrix();
 
     //  Head Sphere
@@ -407,7 +407,7 @@ void MyAvatar::renderDebugBodyPoints() {
     glPushMatrix();
     glColor4f(0, 1, 0, .5f);
     glTranslatef(position.x, position.y, position.z);
-    glutSolidSphere(0.15, 10, 10);
+    Application::getInstance()->getGeometryCache()->renderSphere(0.15, 10, 10);
     glPopMatrix();
 }
 

interface/src/avatar/SkeletonModel.cpp

@@ -554,9 +554,9 @@ void SkeletonModel::renderRagdoll() {
         glTranslatef(position.x, position.y, position.z);
         // draw each point as a yellow hexagon with black border
         glColor4f(0.0f, 0.0f, 0.0f, alpha);
-        glutSolidSphere(radius2, BALL_SUBDIVISIONS, BALL_SUBDIVISIONS);
+        Application::getInstance()->getGeometryCache()->renderSphere(radius2, BALL_SUBDIVISIONS, BALL_SUBDIVISIONS);
         glColor4f(1.0f, 1.0f, 0.0f, alpha);
-        glutSolidSphere(radius1, BALL_SUBDIVISIONS, BALL_SUBDIVISIONS);
+        Application::getInstance()->getGeometryCache()->renderSphere(radius1, BALL_SUBDIVISIONS, BALL_SUBDIVISIONS);
         glPopMatrix();
     }
     glPopMatrix();
@@ -847,7 +847,7 @@ void SkeletonModel::renderBoundingCollisionShapes(float alpha) {
     endPoint = endPoint - _translation;
     glTranslatef(endPoint.x, endPoint.y, endPoint.z);
     glColor4f(0.6f, 0.6f, 0.8f, alpha);
-    glutSolidSphere(_boundingShape.getRadius(), BALL_SUBDIVISIONS, BALL_SUBDIVISIONS);
+    Application::getInstance()->getGeometryCache()->renderSphere(_boundingShape.getRadius(), BALL_SUBDIVISIONS, BALL_SUBDIVISIONS);
 
     // draw a yellow sphere at the capsule startpoint
     glm::vec3 startPoint;
@@ -856,7 +856,7 @@ void SkeletonModel::renderBoundingCollisionShapes(float alpha) {
     glm::vec3 axis = endPoint - startPoint;
     glTranslatef(-axis.x, -axis.y, -axis.z);
     glColor4f(0.8f, 0.8f, 0.6f, alpha);
-    glutSolidSphere(_boundingShape.getRadius(), BALL_SUBDIVISIONS, BALL_SUBDIVISIONS);
+    Application::getInstance()->getGeometryCache()->renderSphere(_boundingShape.getRadius(), BALL_SUBDIVISIONS, BALL_SUBDIVISIONS);
 
     // draw a green cylinder between the two points
     glm::vec3 origin(0.0f);
@@ -889,7 +889,7 @@ void SkeletonModel::renderJointCollisionShapes(float alpha) {
             glTranslatef(position.x, position.y, position.z);
             // draw a grey sphere at shape position
             glColor4f(0.75f, 0.75f, 0.75f, alpha);
-            glutSolidSphere(shape->getBoundingRadius(), BALL_SUBDIVISIONS, BALL_SUBDIVISIONS);
+            Application::getInstance()->getGeometryCache()->renderSphere(shape->getBoundingRadius(), BALL_SUBDIVISIONS, BALL_SUBDIVISIONS);
         } else if (shape->getType() == CAPSULE_SHAPE) {
             CapsuleShape* capsule = static_cast<CapsuleShape*>(shape);
 
@@ -898,8 +898,8 @@ void SkeletonModel::renderJointCollisionShapes(float alpha) {
             capsule->getEndPoint(endPoint);
             endPoint = endPoint - simulationTranslation;
             glTranslatef(endPoint.x, endPoint.y, endPoint.z);                                     
-            glColor4f(0.6f, 0.6f, 0.8f, alpha);
+            glColor4f(0.6f, 0.6f, 0.8f, alpha); 
-            glutSolidSphere(capsule->getRadius(), BALL_SUBDIVISIONS, BALL_SUBDIVISIONS);          
+            Application::getInstance()->getGeometryCache()->renderSphere(capsule->getRadius(), BALL_SUBDIVISIONS, BALL_SUBDIVISIONS); 
 
             // draw a yellow sphere at the capsule startpoint
             glm::vec3 startPoint;
@@ -907,8 +907,8 @@ void SkeletonModel::renderJointCollisionShapes(float alpha) {
             startPoint = startPoint - simulationTranslation;
             glm::vec3 axis = endPoint - startPoint;
             glTranslatef(-axis.x, -axis.y, -axis.z);
-            glColor4f(0.8f, 0.8f, 0.6f, alpha);
+            glColor4f(0.8f, 0.8f, 0.6f, alpha); 
-            glutSolidSphere(capsule->getRadius(), BALL_SUBDIVISIONS, BALL_SUBDIVISIONS);
+            Application::getInstance()->getGeometryCache()->renderSphere(capsule->getRadius(), BALL_SUBDIVISIONS, BALL_SUBDIVISIONS); 
 
             // draw a green cylinder between the two points
             glm::vec3 origin(0.0f);

interface/src/renderer/DeferredLightingEffect.cpp

@@ -51,7 +51,7 @@ void DeferredLightingEffect::releaseSimpleProgram() {
 
 void DeferredLightingEffect::renderSolidSphere(float radius, int slices, int stacks) {
     bindSimpleProgram();
-    glutSolidSphere(radius, slices, stacks);
+    Application::getInstance()->getGeometryCache()->renderSphere(radius, slices, stacks); 
     releaseSimpleProgram();
 }
 

interface/src/renderer/GeometryCache.cpp

@@ -110,6 +110,114 @@ void GeometryCache::renderHemisphere(int slices, int stacks) {
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
 }
 
+
+void GeometryCache::renderSphere(float radius, int slices, int stacks) {
+    VerticesIndices& vbo = _sphereVBOs[IntPair(slices, stacks)];
+    int vertices = slices * (stacks - 1) + 2;
+    const int NUM_VERTICES_PER_TRIANGLE = 3;
+    const int NUM_TRIANGLES_PER_QUAD = 2;
+    int indices = slices * NUM_TRIANGLES_PER_QUAD * NUM_VERTICES_PER_TRIANGLE * (stacks - 1) + slices * NUM_TRIANGLES_PER_QUAD * NUM_VERTICES_PER_TRIANGLE;
+    if (vbo.first == 0) {
+        const int NUM_COORDS_PER_VERTEX = 3;
+        GLfloat* vertexData = new GLfloat[vertices * NUM_COORDS_PER_VERTEX];
+        GLfloat* vertex = vertexData;
+
+        // south pole
+        *(vertex++) = 0.0f;
+        *(vertex++) = 0.0f;
+        *(vertex++) = -1.0f;
+
+        //add stacks vertices climbing up Y axis
+        for (int i = 1; i < stacks; i++) {
+            float phi = PI * (float)i / (float)(stacks) - PI_OVER_TWO;
+            float z = sinf(phi), radius = cosf(phi);
+            
+            for (int j = 0; j < slices; j++) {
+                float theta = TWO_PI * (float)j / (float)slices;
+
+                *(vertex++) = sinf(theta) * radius;
+                *(vertex++) = cosf(theta) * radius;
+                *(vertex++) = z;
+            }
+        }
+
+        // north pole
+        *(vertex++) = 0.0f;
+        *(vertex++) = 0.0f;
+        *(vertex++) = 1.0f;
+        
+        glGenBuffers(1, &vbo.first);
+        glBindBuffer(GL_ARRAY_BUFFER, vbo.first);
+        const int BYTES_PER_VERTEX = NUM_COORDS_PER_VERTEX * sizeof(GLfloat);
+        glBufferData(GL_ARRAY_BUFFER, vertices * BYTES_PER_VERTEX, vertexData, GL_STATIC_DRAW);
+        delete[] vertexData;
+        
+        GLushort* indexData = new GLushort[indices];
+        GLushort* index = indexData;
+
+        // South cap
+        GLushort bottom = 0;
+        GLushort top = 1;
+        for (int i = 0; i < slices; i++) {    
+            *(index++) = bottom;
+            *(index++) = top + i;
+            *(index++) = top + (i + 1) % slices;
+        }
+
+        // (stacks - 2) ribbons
+        for (int i = 0; i < stacks - 2; i++) {
+            bottom = i * slices + 1;
+            top = bottom + slices;
+            for (int j = 0; j < slices; j++) {
+                int next = (j + 1) % slices;
+                
+                *(index++) = bottom + j;
+                *(index++) = top + next;
+                *(index++) = top + j;
+                
+                *(index++) = bottom + j;
+                *(index++) = bottom + next;
+                *(index++) = top + next;
+            }
+        }
+        
+        // north cap
+        bottom = (stacks - 2) * slices + 1;
+        top = bottom + slices;
+        for (int i = 0; i < slices; i++) {    
+            *(index++) = bottom + i;
+            *(index++) = bottom + (i + 1) % slices;
+            *(index++) = top;
+        }
+        
+        glGenBuffers(1, &vbo.second);
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, vbo.second);
+        const int BYTES_PER_INDEX = sizeof(GLushort);
+        glBufferData(GL_ELEMENT_ARRAY_BUFFER, indices * BYTES_PER_INDEX, indexData, GL_STATIC_DRAW);
+        delete[] indexData;
+    
+    } else {
+        glBindBuffer(GL_ARRAY_BUFFER, vbo.first);
+        glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, vbo.second);
+    }
+    glEnableClientState(GL_VERTEX_ARRAY);
+    glEnableClientState(GL_NORMAL_ARRAY);
+
+    glVertexPointer(3, GL_FLOAT, 0, 0);
+    glNormalPointer(GL_FLOAT, 0, 0);
+
+    glPushMatrix();
+    glScalef(radius, radius, radius);
+    glDrawRangeElementsEXT(GL_TRIANGLES, 0, vertices - 1, indices, GL_UNSIGNED_SHORT, 0);
+    glPopMatrix();
+
+    glDisableClientState(GL_VERTEX_ARRAY);
+    glDisableClientState(GL_NORMAL_ARRAY);
+    
+    glBindBuffer(GL_ARRAY_BUFFER, 0);
+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+}
+
 void GeometryCache::renderSquare(int xDivisions, int yDivisions) {
     VerticesIndices& vbo = _squareVBOs[IntPair(xDivisions, yDivisions)];
     int xVertices = xDivisions + 1;

interface/src/renderer/GeometryCache.h

@@ -39,6 +39,7 @@ public:
     virtual ~GeometryCache();
     
     void renderHemisphere(int slices, int stacks);
+    void renderSphere(float radius, int slices, int stacks);
     void renderSquare(int xDivisions, int yDivisions);
     void renderHalfCylinder(int slices, int stacks);
     void renderGrid(int xDivisions, int yDivisions);
@@ -67,6 +68,7 @@ private:
     typedef QPair<GLuint, GLuint> VerticesIndices;
     
     QHash<IntPair, VerticesIndices> _hemisphereVBOs;
+    QHash<IntPair, VerticesIndices> _sphereVBOs;
     QHash<IntPair, VerticesIndices> _squareVBOs;
     QHash<IntPair, VerticesIndices> _halfCylinderVBOs;
     QHash<IntPair, QOpenGLBuffer> _gridBuffers;

interface/src/ui/overlays/Sphere3DOverlay.cpp

@@ -15,6 +15,7 @@
 #include <SharedUtil.h>
 
 #include "Sphere3DOverlay.h"
+#include "Application.h"
 #include "renderer/GlowEffect.h"
 
 Sphere3DOverlay::Sphere3DOverlay() {
@@ -34,7 +35,6 @@ void Sphere3DOverlay::render() {
     const float MAX_COLOR = 255.0f;
     glColor4f(color.red / MAX_COLOR, color.green / MAX_COLOR, color.blue / MAX_COLOR, alpha);
 
-
     glDisable(GL_LIGHTING);
     
     glm::vec3 position = getPosition();
@@ -58,7 +58,7 @@ void Sphere3DOverlay::render() {
             glScalef(dimensions.x, dimensions.y, dimensions.z);
             //Application::getInstance()->getDeferredLightingEffect()->renderSolidCube(1.0f);
             if (_isSolid) {
-                glutSolidSphere(1.0f, SLICES, SLICES);
+                Application::getInstance()->getGeometryCache()->renderSphere(1.0f, SLICES, SLICES); 
             } else {
                 glutWireSphere(1.0f, SLICES, SLICES);
             }