tavli

diff src/mesh.cc @ 15:b1a195c3ee16

added shaders
author John Tsiombikas <nuclear@member.fsf.org>
date Sun, 28 Jun 2015 08:34:24 +0300
parents a8e26f163f99
children d6209903454b
line diff
     1.1 --- a/src/mesh.cc	Sun Jun 28 07:44:23 2015 +0300
     1.2 +++ b/src/mesh.cc	Sun Jun 28 08:34:24 2015 +0300
     1.3 @@ -8,6 +8,7 @@
     1.4  
     1.5  #define USE_OLDGL
     1.6  
     1.7 +bool Mesh::use_custom_sdr_attr = true;
     1.8  int Mesh::global_sdr_loc[NUM_MESH_ATTR] = { 0, 1, 2, 3, 4, 5, 6 };
     1.9  /*
    1.10  	(int)SDR_ATTR_VERTEX,
    1.11 @@ -574,7 +575,7 @@
    1.12  		return;
    1.13  	}
    1.14  
    1.15 -	if(cur_sdr) {
    1.16 +	if(cur_sdr && use_custom_sdr_attr) {
    1.17  		// rendering with shaders
    1.18  		if(global_sdr_loc[MESH_ATTR_VERTEX] == -1) {
    1.19  			fprintf(stderr, "%s: shader attribute location for vertices unset\n", __FUNCTION__);
    1.20 @@ -623,7 +624,7 @@
    1.21  		glDrawArrays(GL_TRIANGLES, 0, nverts);
    1.22  	}
    1.23  
    1.24 -	if(cur_sdr) {
    1.25 +	if(cur_sdr && use_custom_sdr_attr) {
    1.26  		// rendered with shaders
    1.27  		for(int i=0; i<NUM_MESH_ATTR; i++) {
    1.28  			int loc = global_sdr_loc[i];
    1.29 @@ -729,7 +730,7 @@
    1.30  	}
    1.31  
    1.32  	glBegin(GL_LINES);
    1.33 -	if(cur_sdr) {
    1.34 +	if(cur_sdr && use_custom_sdr_attr) {
    1.35  		int vert_loc = global_sdr_loc[MESH_ATTR_VERTEX];
    1.36  		if(vert_loc < 0) {
    1.37  			glEnd();
    1.38 @@ -765,7 +766,7 @@
    1.39  	}
    1.40  
    1.41  	glBegin(GL_LINES);
    1.42 -	if(cur_sdr) {
    1.43 +	if(cur_sdr && use_custom_sdr_attr) {
    1.44  		int vert_loc = global_sdr_loc[MESH_ATTR_VERTEX];
    1.45  		if(vert_loc < 0) {
    1.46  			glEnd();