color support in shaders and emulation
This commit is contained in:
Alon Zakai
Родитель
04b9ead6af
Коммит
09d02eb1fa
|
|
@ -990,14 +990,15 @@ var LibraryGL = {
|
|||
}
|
||||
}
|
||||
}
|
||||
if (source.indexOf('gl_FrontColor') >= 0) {
|
||||
source = 'varying vec4 v_color; \n' +
|
||||
source.replace(/gl_FrontColor/g, 'v_color');
|
||||
}
|
||||
if (source.indexOf('gl_Color') >= 0) {
|
||||
source = 'varying vec4 v_color; \n' +
|
||||
source.replace(/gl_Color/g, 'vec4(1, 1, 1, 1)').replace(/gl_FrontColor/g, 'v_color'); // XXX gl_Color can be either an attribute, or
|
||||
// from glColor, and we don't know which here.
|
||||
// For now, just use white
|
||||
//source = 'attribute vec4 a_color; \n\
|
||||
// varying vec4 v_color; \n' +
|
||||
// source.replace(/gl_Color/g, 'a_color').replace(/gl_FrontColor/g, 'v_color');
|
||||
source = 'attribute vec4 a_color; \n' +
|
||||
'uniform vec4 u_color; \n' +
|
||||
'uniform int u_hasColorAttrib; \n' +
|
||||
source.replace(/gl_Color/g, '(u_hasColorAttrib > 0 ? a_color : u_color)');
|
||||
}
|
||||
if (source.indexOf('gl_FogFragCoord') >= 0) {
|
||||
source = 'varying float v_fogCoord; \n' +
|
||||
|
|
@ -1243,6 +1244,7 @@ var LibraryGL = {
|
|||
enabledClientAttributes: [0, 0],
|
||||
clientAttributes: [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
|
||||
clientActiveTexture: 0,
|
||||
clientColor: null,
|
||||
|
||||
byteSizeByType: {
|
||||
0x1400: 1, // GL_BYTE
|
||||
|
|
@ -1282,7 +1284,7 @@ var LibraryGL = {
|
|||
},
|
||||
|
||||
createRenderer: function(renderer) {
|
||||
var vertexSize = 0, positionSize = 0, positionOffset = 0, textureSize = 0, textureOffset = 0, which, size;
|
||||
var vertexSize = 0, positionSize = 0, positionOffset = 0, textureSize = 0, textureOffset = 0, colorSize = 0, colorOffset = 0, which, size;
|
||||
for (var i = 0; i < renderer.length; i+=2) {
|
||||
var which = renderer[i];
|
||||
if (which == 'V') {
|
||||
|
|
@ -1302,6 +1304,9 @@ var LibraryGL = {
|
|||
} else if (which == 'N') {
|
||||
vertexSize += 4; // 1 char, + alignment
|
||||
} else if (which == 'C') {
|
||||
size = parseInt(renderer[i+1]);
|
||||
colorSize = size;
|
||||
colorOffset = vertexSize;
|
||||
vertexSize += 4; // Up to 4 chars, + alignment
|
||||
} else {
|
||||
console.log('Warning: Ignoring renderer attribute ' + which);
|
||||
|
|
@ -1315,6 +1320,8 @@ var LibraryGL = {
|
|||
var ret = {
|
||||
vertexSize: vertexSize,
|
||||
hasTexture: textureSize > 0,
|
||||
hasColor: colorSize > 0,
|
||||
|
||||
init: function() {
|
||||
if (useCurrProgram) {
|
||||
if (GL.shaderInfos[GL.programShaders[GL.currProgram][0]].type == Module.ctx.VERTEX_SHADER) {
|
||||
|
|
@ -1359,9 +1366,13 @@ var LibraryGL = {
|
|||
|
||||
this.positionLocation = Module.ctx.getAttribLocation(this.program, 'a_position');
|
||||
this.texCoordLocation = Module.ctx.getAttribLocation(this.program, 'a_texCoord0');
|
||||
this.colorLocation = Module.ctx.getAttribLocation(this.program, 'a_color');
|
||||
|
||||
this.textureLocation = Module.ctx.getUniformLocation(this.program, 'u_texture');
|
||||
this.modelViewLocation = Module.ctx.getUniformLocation(this.program, 'u_modelView');
|
||||
this.projectionLocation = Module.ctx.getUniformLocation(this.program, 'u_projection');
|
||||
this.hasColorAttribLocation = Module.ctx.getUniformLocation(this.program, 'u_hasColorAttrib');
|
||||
this.colorUniformLocation = Module.ctx.getUniformLocation(this.program, 'u_color');
|
||||
},
|
||||
|
||||
prepare: function() {
|
||||
|
|
@ -1376,7 +1387,15 @@ var LibraryGL = {
|
|||
vertexSize, textureOffset);
|
||||
Module.ctx.enableVertexAttribArray(this.texCoordLocation);
|
||||
}
|
||||
|
||||
if (this.hasColor) {
|
||||
Module.ctx.vertexAttribPointer(this.colorLocation, colorSize, Module.ctx.UNSIGNED_BYTE, true,
|
||||
vertexSize, colorOffset);
|
||||
Module.ctx.enableVertexAttribArray(this.colorLocation);
|
||||
Module.ctx.uniform1i(this.hasColorAttribLocation, 1);
|
||||
} else {
|
||||
Module.ctx.uniform1i(this.hasColorAttribLocation, 0);
|
||||
Module.ctx.uniform4fv(this.colorUniformLocation, GL.immediate.clientColor);
|
||||
}
|
||||
if (!useCurrProgram) { // otherwise, the user program will set the sampler2D binding and uniform itself
|
||||
var texture = Module.ctx.getParameter(Module.ctx.TEXTURE_BINDING_2D);
|
||||
Module.ctx.activeTexture(Module.ctx.TEXTURE0);
|
||||
|
|
@ -1390,6 +1409,9 @@ var LibraryGL = {
|
|||
if (this.hasTexture) {
|
||||
Module.ctx.disableVertexAttribArray(this.texCoordLocation);
|
||||
}
|
||||
if (this.hasColor) {
|
||||
Module.ctx.disableVertexAttribArray(this.colorLocation);
|
||||
}
|
||||
}
|
||||
};
|
||||
ret.init();
|
||||
|
|
@ -1416,6 +1438,8 @@ var LibraryGL = {
|
|||
Module.ctx.bufferData(Module.ctx.ELEMENT_ARRAY_BUFFER, this.maxElements*2, Module.ctx.DYNAMIC_DRAW);
|
||||
Module.ctx.bindBuffer(Module.ctx.ELEMENT_ARRAY_BUFFER, null);
|
||||
|
||||
this.clientColor = new Float32Array([1, 1, 1, 1]);
|
||||
|
||||
// Replace some functions with immediate-mode aware versions
|
||||
_glDrawArrays = function(mode, first, count) {
|
||||
if (GL.immediate.totalEnabledClientAttributes == 0) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,295 @@
|
|||
/*
|
||||
THIS WORK, INCLUDING THE SOURCE CODE, DOCUMENTATION
|
||||
AND RELATED MEDIA AND DATA, IS PLACED INTO THE PUBLIC DOMAIN.
|
||||
|
||||
THE ORIGINAL AUTHOR IS KYLE FOLEY.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED AS-IS WITHOUT WARRANTY
|
||||
OF ANY KIND, NOT EVEN THE IMPLIED WARRANTY OF
|
||||
MERCHANTABILITY. THE AUTHOR OF THIS SOFTWARE,
|
||||
ASSUMES _NO_ RESPONSIBILITY FOR ANY CONSEQUENCE
|
||||
RESULTING FROM THE USE, MODIFICATION, OR
|
||||
REDISTRIBUTION OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#if !EMSCRIPTEN
|
||||
#define USE_GLEW 1
|
||||
#endif
|
||||
|
||||
#if USE_GLEW
|
||||
#include "GL/glew.h"
|
||||
#endif
|
||||
|
||||
#include "SDL/SDL.h"
|
||||
#if !USE_GLEW
|
||||
#include "SDL/SDL_opengl.h"
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
|
||||
void verify() {
|
||||
int width = 640, height = 480;
|
||||
unsigned char *data = (unsigned char*)malloc(width*height*4);
|
||||
glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, data);
|
||||
int sum = 0;
|
||||
for (int x = 0; x < width*height*4; x++) {
|
||||
if (x % 4 != 3) sum += x * data[x];
|
||||
}
|
||||
#if EMSCRIPTEN
|
||||
int result = sum;
|
||||
REPORT_RESULT();
|
||||
#endif
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
SDL_Surface *screen;
|
||||
if ( SDL_Init(SDL_INIT_VIDEO) != 0 ) {
|
||||
printf("Unable to initialize SDL: %s\n", SDL_GetError());
|
||||
return 1;
|
||||
}
|
||||
|
||||
SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
|
||||
screen = SDL_SetVideoMode( 640, 480, 24, SDL_OPENGL );
|
||||
if ( !screen ) {
|
||||
printf("Unable to set video mode: %s\n", SDL_GetError());
|
||||
return 1;
|
||||
}
|
||||
|
||||
glClearColor( 0, 0, 0, 0 );
|
||||
glClear( GL_COLOR_BUFFER_BIT );
|
||||
|
||||
// Create a texture
|
||||
|
||||
GLuint texture;
|
||||
glGenTextures( 1, &texture );
|
||||
glBindTexture( GL_TEXTURE_2D, texture );
|
||||
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
|
||||
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
|
||||
GLubyte textureData[16*16*4];
|
||||
for (int x = 0; x < 16; x++) {
|
||||
for (int y = 0; y < 16; y++) {
|
||||
*((int*)&textureData[(x*16 + y) * 4]) = x*16 + ((y*16) << 8);
|
||||
}
|
||||
}
|
||||
glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0,
|
||||
GL_RGBA, GL_UNSIGNED_BYTE, textureData );
|
||||
|
||||
// Create a second texture
|
||||
|
||||
GLuint texture2;
|
||||
glGenTextures( 1, &texture2 );
|
||||
glBindTexture( GL_TEXTURE_2D, texture2 );
|
||||
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
|
||||
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
|
||||
GLubyte texture2Data[] = { 0xff, 0, 0, 0xff,
|
||||
0, 0xff, 0, 0xaa,
|
||||
0, 0, 0xff, 0x55,
|
||||
0x80, 0x90, 0x70, 0 };
|
||||
glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, 2, 2, 0,
|
||||
GL_RGBA, GL_UNSIGNED_BYTE, texture2Data );
|
||||
|
||||
// BEGIN
|
||||
|
||||
#if USE_GLEW
|
||||
glewInit();
|
||||
#endif
|
||||
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
glLoadIdentity();
|
||||
// original: glFrustum(-0.6435469817188064, 0.6435469817188064 ,-0.48266022190470925, 0.48266022190470925 ,0.5400000214576721, 2048);
|
||||
glFrustum(-0.6435469817188064, 0.1435469817188064 ,-0.48266022190470925, 0.88266022190470925 ,0.5400000214576721, 2048);
|
||||
glRotatef(-30, 1, 1, 1);
|
||||
//GLfloat pm[] = { 1.372136116027832, 0, 0, 0, 0, 0.7910231351852417, 0, 0, -0.6352481842041016, 0.29297152161598206, -1.0005275011062622, -1, 0, 0, -1.080284833908081, 0 };
|
||||
//glLoadMatrixf(pm);
|
||||
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
GLfloat matrixData[] = { -1, 0, 0, 0,
|
||||
0, 0,-1, 0,
|
||||
0, 1, 0, 0,
|
||||
0, 0, 0, 1 };
|
||||
glLoadMatrixf(matrixData);
|
||||
//glTranslated(-512,-512,-527); // XXX this should be uncommented, but if it is then nothing is shown
|
||||
|
||||
glEnable(GL_CULL_FACE);
|
||||
glEnable(GL_DEPTH_TEST);
|
||||
|
||||
glClear(GL_DEPTH_BUFFER_BIT);
|
||||
|
||||
glEnableClientState(GL_NORMAL_ARRAY);
|
||||
glEnableClientState(GL_COLOR_ARRAY);
|
||||
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
|
||||
|
||||
glActiveTexture(GL_TEXTURE0);
|
||||
|
||||
glEnableClientState(GL_VERTEX_ARRAY);
|
||||
|
||||
GLuint arrayBuffer, elementBuffer;
|
||||
glGenBuffers(1, &arrayBuffer);
|
||||
glGenBuffers(1, &elementBuffer);
|
||||
|
||||
GLubyte arrayData[] = {
|
||||
/*
|
||||
[0, 0, 0, 67] ==> 128 float
|
||||
[0, 0, 128, 67] ==> 256 float
|
||||
[0, 0, 0, 68] ==> 512 float
|
||||
[0, 0, 128, 68] ==> 1024 float
|
||||
|
||||
[vertex x ] [vertex y ] [vertex z ] [nr] [texture u ] [texture v ] [lm u ] [lm v ] [color r,g,b,a ] */
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 128, 255, 128, // 0
|
||||
0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 67, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 255, 128, // 1
|
||||
0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 67, 0, 0, 0, 67, 0, 0, 0, 0, 128, 64, 255, 128, // 2
|
||||
0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 67, 0, 0, 0, 0, 128, 128, 255, 255, // 3
|
||||
0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 67, 0, 0, 0, 0, 0, 0, 0, 0, 196, 128, 255, 128, // 4
|
||||
0, 0, 128, 68, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 128, 67, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 255, 128, // 5
|
||||
0, 0, 128, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 128, 67, 0, 0, 0, 67, 0, 0, 0, 0, 128, 128, 255, 128, // 6
|
||||
0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 67, 0, 0, 0, 67, 0, 0, 0, 0, 128, 64, 255, 0, // 7
|
||||
0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 67, 0, 0, 0, 0, 64, 128, 255, 128, // 8
|
||||
0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 67, 0, 0, 0, 67, 0, 0, 0, 0, 128, 0, 255, 128, // 9
|
||||
0, 0, 0, 68, 0, 0, 128, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 67, 0, 0, 128, 67, 0, 0, 0, 0, 128, 128, 255, 128, // 10
|
||||
0, 0, 0, 0, 0, 0, 128, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 67, 0, 0, 0, 0, 128, 128, 255, 0, // 11
|
||||
0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 67, 0, 0, 0, 67, 0, 0, 0, 0, 100, 128, 255, 128, // 12
|
||||
0, 0, 128, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 128, 67, 0, 0, 0, 67, 0, 0, 0, 0, 128, 0, 255, 128, // 13
|
||||
0, 0, 128, 68, 0, 0, 128, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 128, 67, 0, 0, 128, 67, 0, 0, 0, 0, 128, 128, 255, 128, // 14
|
||||
0, 0, 0, 68, 0, 0, 128, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 67, 0, 0, 128, 67, 0, 0, 0, 0, 128, 128, 255, 0, // 15
|
||||
|
||||
0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 128, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 128, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 128, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 128, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 128, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 128, 68, 0, 0, 0, 68, 0, 0, 128, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 128, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 128, 68, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 0, 68, 0, 0, 128, 68, 0, 0, 128, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 128, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 0, 68, 0, 0, 128, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 128, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 0, 0, 0, 0, 128, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 0, 68, 0, 0, 128, 68, 0, 0, 128, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 0, 68, 0, 0, 128, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 128, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 128, 68, 0, 0, 0, 68, 0, 0, 128, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 128, 68, 0, 0, 0, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128,
|
||||
0, 0, 128, 68, 0, 0, 128, 68, 0, 0, 0, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128
|
||||
};
|
||||
assert(sizeof(arrayData) == 1408);
|
||||
glBindBuffer(GL_ARRAY_BUFFER, arrayBuffer);
|
||||
glBufferData(GL_ARRAY_BUFFER, sizeof(arrayData), arrayData, GL_STATIC_DRAW);
|
||||
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
||||
|
||||
GLushort elementData[] = { 1, 2, 0, 2, 3, 0, 5, 6, 4, 6, 7, 4, 9, 10, 8, 10, 11, 8, 13, 14, 12, 14, 15, 12 };
|
||||
assert(sizeof(elementData) == 48);
|
||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, elementBuffer);
|
||||
glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(elementData), elementData, GL_STATIC_DRAW);
|
||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
|
||||
|
||||
glBindBuffer(GL_ARRAY_BUFFER, arrayBuffer);
|
||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, elementBuffer);
|
||||
|
||||
// sauer vertex data is apparently 0-12: V3F, 12: N1B, 16-24: T2F, 24-28: T2S, 28-32: C4B
|
||||
glVertexPointer(3, GL_FLOAT, 32, (void*)0); // all these apply to the ARRAY_BUFFER that is bound
|
||||
glTexCoordPointer(2, GL_FLOAT, 32, (void*)16);
|
||||
glClientActiveTexture(GL_TEXTURE1); // XXX seems to be ignored in native build
|
||||
glTexCoordPointer(2, GL_SHORT, 32, (void*)24);
|
||||
glClientActiveTexture(GL_TEXTURE0); // likely not needed, it is a cleanup
|
||||
glNormalPointer(GL_BYTE, 32, (void*)12);
|
||||
glColorPointer(4, GL_UNSIGNED_BYTE, 32, (void*)28);
|
||||
|
||||
glBindTexture(GL_TEXTURE_2D, texture); // diffuse?
|
||||
glActiveTexture(GL_TEXTURE0);
|
||||
glActiveTexture(GL_TEXTURE1);
|
||||
glBindTexture(GL_TEXTURE_2D, texture2); // lightmap?
|
||||
glActiveTexture(GL_TEXTURE0);
|
||||
|
||||
GLint ok;
|
||||
|
||||
const char *vertexShader = "uniform vec4 texgenscroll;\n"
|
||||
"void main(void)\n"
|
||||
"{\n"
|
||||
" gl_Position = ftransform();\n"
|
||||
" gl_TexCoord[0].xy = gl_MultiTexCoord0.xy/100.0 + texgenscroll.xy;\n" // added /100 here
|
||||
" gl_TexCoord[1] = gl_Color;\n"
|
||||
"}\n";
|
||||
const char *fragmentShader = "uniform vec4 colorparams;\n"
|
||||
"uniform sampler2D diffusemap, lightmap;\n"
|
||||
"void main(void)\n"
|
||||
"{\n"
|
||||
" vec4 diffuse = texture2D(diffusemap, gl_TexCoord[0].xy);\n"
|
||||
" vec4 lm = texture2D(lightmap, gl_TexCoord[1].xy);\n"
|
||||
" diffuse *= colorparams;\n"
|
||||
" gl_FragColor = (diffuse * lm * 0.2) + gl_TexCoord[1];\n"
|
||||
"}\n";
|
||||
|
||||
GLuint vs = glCreateShader(GL_VERTEX_SHADER);
|
||||
glShaderSource(vs, 1, &vertexShader, NULL);
|
||||
glCompileShader(vs);
|
||||
glGetShaderiv(vs, GL_COMPILE_STATUS, &ok);
|
||||
assert(ok);
|
||||
|
||||
GLuint fs = glCreateShader(GL_FRAGMENT_SHADER);
|
||||
glShaderSource(fs, 1, &fragmentShader, NULL);
|
||||
glCompileShader(fs);
|
||||
glGetShaderiv(fs, GL_COMPILE_STATUS, &ok);
|
||||
assert(ok);
|
||||
|
||||
GLuint program = glCreateProgram();
|
||||
|
||||
glAttachShader(program, vs);
|
||||
glAttachShader(program, fs);
|
||||
glLinkProgram(program);
|
||||
glGetProgramiv(program, GL_LINK_STATUS, &ok);
|
||||
assert(ok);
|
||||
|
||||
glUseProgram(program);
|
||||
|
||||
GLint lightmapLocation = glGetUniformLocation(program, "lightmap");
|
||||
assert(lightmapLocation >= 0);
|
||||
glUniform1i(lightmapLocation, 1); // sampler2D? Is it the texture unit?
|
||||
|
||||
GLint diffusemapLocation = glGetUniformLocation(program, "diffusemap");
|
||||
assert(diffusemapLocation >= 0);
|
||||
glUniform1i(diffusemapLocation, 0);
|
||||
|
||||
GLint texgenscrollLocation = glGetUniformLocation(program, "texgenscroll");
|
||||
assert(texgenscrollLocation >= 0);
|
||||
|
||||
GLint colorparamsLocation = glGetUniformLocation(program, "colorparams");
|
||||
assert(colorparamsLocation >= 0);
|
||||
|
||||
GLfloat texgenscrollData[] = { 0, 0, 0, 0 };
|
||||
glUniform4fv(texgenscrollLocation, 1, texgenscrollData);
|
||||
|
||||
GLfloat colorparamsData[] = { 2, 2, 2, 1 };
|
||||
glUniform4fv(colorparamsLocation, 1, colorparamsData);
|
||||
|
||||
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, (void*)12);
|
||||
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, (void*) 0);
|
||||
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, (void*)24);
|
||||
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, (void*)36);
|
||||
|
||||
// END
|
||||
|
||||
SDL_GL_SwapBuffers();
|
||||
|
||||
verify();
|
||||
|
||||
#if !EMSCRIPTEN
|
||||
SDL_Delay(1500);
|
||||
#endif
|
||||
|
||||
SDL_Quit();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -7259,6 +7259,9 @@ elif 'browser' in str(sys.argv):
|
|||
def test_cubegeom(self):
|
||||
self.btest('cubegeom.c', expected='188641320')
|
||||
|
||||
def test_cubegeom_color(self):
|
||||
self.btest('cubegeom_color.c', expected='588472350')
|
||||
|
||||
elif 'benchmark' in str(sys.argv):
|
||||
# Benchmarks. Run them with argument |benchmark|. To run a specific test, do
|
||||
# |benchmark.test_X|.
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче