rpms/trackballs/devel trackballs-1.1.4-black-vertices-fix.patch, NONE, 1.1 trackballs.spec, 1.6, 1.7

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/trackballs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12783

Modified Files:
	trackballs.spec 
Added Files:
	trackballs-1.1.4-black-vertices-fix.patch 
Log Message:
* Thu Jan  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.4-4
- Fix black vertices on ATI cards with OSS drivers


trackballs-1.1.4-black-vertices-fix.patch:

--- NEW FILE trackballs-1.1.4-black-vertices-fix.patch ---
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]);


Index: trackballs.spec
===================================================================
RCS file: /cvs/extras/rpms/trackballs/devel/trackballs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- trackballs.spec	25 Sep 2007 07:07:27 -0000	1.6
+++ trackballs.spec	3 Jan 2008 15:17:01 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           trackballs
 Version:        1.1.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Steer a marble ball through a labyrinth
 Group:          Amusements/Games
 License:        GPLv2+
@@ -8,6 +8,7 @@
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
 Patch0:         trackballs-1.1.4-destdir.patch
+Patch1:         trackballs-1.1.4-black-vertices-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  guile-devel libGLU-devel zlib-devel desktop-file-utils
 BuildRequires:  SDL_ttf-devel SDL_mixer-devel SDL_image-devel
@@ -22,6 +23,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 iconv -f ISO-8859-1 -t UTF8 share/%{name}.6 > share/%{name}.6.tmp
 mv share/%{name}.6.tmp share/%{name}.6
 # the install script does a chgrp to 'games', this doesn't work while
@@ -79,6 +81,9 @@
 
 
 %changelog
+* Thu Jan  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.4-4
+- Fix black vertices on ATI cards with OSS drivers
+
 * Tue Sep 25 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.4-3
 - Use opengl-games-utils wrapper to show error dialog when DRI is missing