vanitasvitae
/
Spherical
mirror of https://github.com/vanitasvitae/Spherical
1
0
Fork 0
Code Issues Releases Wiki Activity

Minor fixes

This commit is contained in:
Simon Leistikow 2017-09-13 01:35:34 +02:00
parent 17210c8525
commit 72f934b808
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/de/trac/spherical/rendering/Renderer.java
View File

@ -37,11 +37,10 @@ public class Renderer implements GLSurfaceView.Renderer {
* Out: sets fragment color * Out: sets fragment color
*/ */
private static final String DEFAULT_FRAGMENT_SHADER = private static final String DEFAULT_FRAGMENT_SHADER =
"precision mediump float;\n" +
"varying vec2 uv;\n" + "varying vec2 uv;\n" +
"uniform sampler2D tex;\n" + "uniform sampler2D tex;\n" +
"void main() {\n" + "void main() {\n" +
" gl_FragColor = vec4(0);//texture2D(tex, uv);\n" + " gl_FragColor = texture2D(tex, uv);\n" +
"}\n"; "}\n";
// Store a sphere geometry as framework for the photo texture. // Store a sphere geometry as framework for the photo texture.
@ -90,8 +89,8 @@ public class Renderer implements GLSurfaceView.Renderer {
glUniformMatrix4fv(mvpLocation, 1, false, mvpMatrix, 0); glUniformMatrix4fv(mvpLocation, 1, false, mvpMatrix, 0);
glDrawElements(GL_TRIANGLES, sphere.getIndexBuffer().capacity(), GL_UNSIGNED_SHORT, sphere.getIndexBuffer()); glDrawElements(GL_TRIANGLES, sphere.getIndexBuffer().capacity(), GL_UNSIGNED_SHORT, sphere.getIndexBuffer());
glDisableVertexAttribArray(0); glDisableVertexAttribArray(textureCoordinatesLocation);
glDisableVertexAttribArray(1); glDisableVertexAttribArray(positionLocation);
glUseProgram(0); glUseProgram(0);
} }
@ -130,7 +129,7 @@ public class Renderer implements GLSurfaceView.Renderer {
public void initialize() { public void initialize() {
// Initialize sphere. // Initialize sphere.
sphere = new Sphere(1.0f, 32, 32); // TODO: choose useful aparameters. sphere = new Sphere(1.0f, 32, 32); // TODO: choose useful parameters.
// Set OpenGL state. // Set OpenGL state.
glClearColor(1.0f, 0.0f, 0.0f, 1.0f); glClearColor(1.0f, 0.0f, 0.0f, 1.0f);