Attachment 13489 Details for Bug 11174 – PATCH: fix black rendered vertices with trackballs

[patch] PATCH: fix black rendered vertices with trackballs

trackballs-1.1.4-black-vertices-fix.patch (text/plain), 2.44 KB, created by Hans de Goede on 2008-01-03 07:52:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hans de Goede

Created: 2008-01-03 07:52:20 UTC

Size: 2.44 KB

patch

obsolete

>diff -up trackballs-1.1.4/src/map.cc~ trackballs-1.1.4/src/map.cc
>--- trackballs-1.1.4/src/map.cc~	2008-01-03 14:31:28.000000000 +0100
>+++ trackballs-1.1.4/src/map.cc	2008-01-03 14:31:28.000000000 +0100
>@@ -479,7 +479,7 @@ double smoothSemiRand(int x,int y,double
> void Map::drawCell(int birdsEye,int stage,int x,int y) {
>   Coord3d normal,normal1;
>   Real texScale = 0.25;
>-  int i,draw;
>+  int i;
>   int gfx_details = Settings::settings->gfx_details;
>   double txOffset=0.0,tyOffset=0.0;
>   Cell& c = cell(x,y);
>@@ -615,7 +615,7 @@ void Map::drawCell(int birdsEye,int stag
>     
>   /* Draw south side of cell */
>   {
>-	Cell& c2 = cell(x,y-1); draw=0;
>+	Cell& c2 = cell(x,y-1);
> 	int southTransparent=c.wallColors[Cell::SOUTH+Cell::EAST][3] < 0.95 || c.wallColors[Cell::SOUTH+Cell::WEST][3] < 0.95 || 
> 	  c2.wallColors[Cell::NORTH+Cell::EAST][3] < 0.95 || c2.wallColors[Cell::NORTH+Cell::WEST][3] < 0.95;
> 	if((southTransparent && stage==1) || (!southTransparent && stage==0) || !isTransparent)
>@@ -624,11 +624,10 @@ void Map::drawCell(int birdsEye,int stag
> 		if(c2.heights[Cell::NORTH+Cell::WEST] < c.heights[Cell::SOUTH+Cell::WEST] ||
> 		   c2.heights[Cell::NORTH+Cell::EAST] < c.heights[Cell::SOUTH+Cell::EAST]) {
> 		  glNormal3f(0.0,-1.0,0.0);
>-		  draw=1;
> 		} else
> 		  glNormal3f(0.0,+1.0,0.0);
> 		
>-		if(birdsEye || draw) {
>+		{
> 		  glBegin(GL_TRIANGLE_STRIP);
> 		  glMaterialfv(GL_FRONT,GL_AMBIENT_AND_DIFFUSE,c2.wallColors[Cell::NORTH+Cell::EAST]);
> 		  glVertex3f(x+1.01,y,c2.heights[Cell::NORTH+Cell::EAST]);
>@@ -645,7 +644,7 @@ void Map::drawCell(int birdsEye,int stag
>   
>   /* Draw west side of cell */
>   {
>-	Cell& c2 = cell(x-1,y); draw=0;
>+	Cell& c2 = cell(x-1,y);
> 	int westTransparent=c.wallColors[Cell::SOUTH+Cell::WEST][3] < 0.95 || c.wallColors[Cell::NORTH+Cell::WEST][3] < 0.95 || 
> 	  c2.wallColors[Cell::SOUTH+Cell::EAST][3] < 0.95 || c2.wallColors[Cell::NORTH+Cell::EAST][3] < 0.95;
> 	if((westTransparent && stage==1) || (!westTransparent && stage==0) || !isTransparent)
>@@ -654,11 +653,10 @@ void Map::drawCell(int birdsEye,int stag
> 		if(c2.heights[Cell::SOUTH+Cell::EAST] < c.heights[Cell::SOUTH+Cell::WEST] ||
> 		   c2.heights[Cell::NORTH+Cell::EAST] < c.heights[Cell::NORTH+Cell::WEST]) {
> 		  glNormal3f(-1.0,0.0,0.0);
>-		  draw=1;
> 		} else
> 		  glNormal3f(+1.0,0.0,0.0);
> 	  
>-		if(birdsEye || draw) {
>+		{
> 		  glColor4f(0.0,0.0,0.0,1.0);
> 		  glBegin(GL_TRIANGLE_STRIP);
> 		  glMaterialfv(GL_FRONT,GL_AMBIENT_AND_DIFFUSE,c2.wallColors[Cell::SOUTH+Cell::EAST]);

Actions: View | Splinter Review

Attachments on bug 11174: 13488 | 13489

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.