X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FPerson.h;h=f37a0ee310ba561e0b6a7bc4aeb4c5a617b75742;hb=26debbd380c6922e5a0b60d99567c6374a4fef9a;hp=60cc8616754fda39e805f17468912f6dbbf03bac;hpb=46cff1de1e828cb8c04a5dc5377bc07baae57858;p=lugaru.git

diff --git a/Source/Person.h b/Source/Person.h
index 60cc861..f37a0ee 100644
--- a/Source/Person.h
+++ b/Source/Person.h
@@ -93,15 +93,15 @@ class Person
 		bool immobile;
 		
 		float velspeed;
-		float targetrotation;
+		float targetyaw;
 		float targetrot;
 		float rot;
 		float oldrot;
-		float lookrotation;
-		float lookrotation2;
-		float rotation;
-		float rotation2;
-		float lowrotation;
+		float lookyaw;
+		float lookpitch;
+		float yaw;
+		float pitch;
+		float lowyaw;
 		float tilt;
 		float targettilt;
 		float tilt2;
@@ -138,8 +138,8 @@ class Person
 		int direction;
 		float texupdatedelay;
 		
-		float headrotation,headrotation2;
-		float targetheadrotation,targetheadrotation2;
+		float headyaw,headpitch;
+		float targetheadyaw,targetheadpitch;
 		
 		bool onterrain;
 		bool pause;
@@ -412,12 +412,9 @@ class Person
 		void DoHead();
 		void DoMipmaps()
 		{
-		  glBindTexture(GL_TEXTURE_2D, skeleton.drawmodel.textureptr);
-		  gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGB,
-				    skeleton.skinsize,
-				    skeleton.skinsize,
-				    GL_RGB, GL_UNSIGNED_BYTE,
-				    &skeleton.skinText[0]);
+		  skeleton.drawmodel.textureptr.bind();
+          glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
+		  glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, skeleton.skinsize, skeleton.skinsize, 0, GL_RGB, GL_UNSIGNED_BYTE, &skeleton.skinText[0]);
 		}
 
 		int SphereCheck(XYZ *p1,float radius, XYZ *p, XYZ *move, float *rotate, Model *model);