AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-16 02:56:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

And get player animations working again.

Browse Source
This commit is contained in:
UnknownShadow200 2015-09-03 20:06:30 +10:00
parent afb758eb3e
commit 9a69dba8c5
4 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ClassicalSharp/Entities/Player.Rendering.cs
View File

@ -44,10 +44,10 @@ namespace ClassicalSharp {
Vector3 pos = Position; Vector3 pos = Position;
pos.Y += Model.NameYOffset; pos.Y += Model.NameYOffset;
api.texVerts[0] = new VertexPos3fTex2f( Utils.RotateY( x1, y1, 0, pos, cosA, sinA ), nameTex.U1, nameTex.V1 ); api.texVerts[0] = new VertexPos3fTex2f( Utils.RotateY( x1, y1, 0, cosA, sinA ) + pos, nameTex.U1, nameTex.V1 );
api.texVerts[1] = new VertexPos3fTex2f( Utils.RotateY( x2, y1, 0, pos, cosA, sinA ), nameTex.U2, nameTex.V1 ); api.texVerts[1] = new VertexPos3fTex2f( Utils.RotateY( x2, y1, 0, cosA, sinA ) + pos, nameTex.U2, nameTex.V1 );
api.texVerts[2] = new VertexPos3fTex2f( Utils.RotateY( x2, y2, 0, pos, cosA, sinA ), nameTex.U2, nameTex.V2 ); api.texVerts[2] = new VertexPos3fTex2f( Utils.RotateY( x2, y2, 0, cosA, sinA ) + pos, nameTex.U2, nameTex.V2 );
api.texVerts[3] = new VertexPos3fTex2f( Utils.RotateY( x1, y2, 0, pos, cosA, sinA ), nameTex.U1, nameTex.V2 ); api.texVerts[3] = new VertexPos3fTex2f( Utils.RotateY( x1, y2, 0, cosA, sinA ) + pos, nameTex.U1, nameTex.V2 );
api.BeginVbBatch( VertexFormat.Pos3fTex2f ); api.BeginVbBatch( VertexFormat.Pos3fTex2f );
api.DrawDynamicIndexedVb( DrawMode.Triangles, api.texVb, api.texVerts, 4, 6 ); api.DrawDynamicIndexedVb( DrawMode.Triangles, api.texVb, api.texVerts, 4, 6 );

27
ClassicalSharp/Model/IModel.cs
View File

@ -112,7 +112,7 @@ namespace ClassicalSharp.Model {
protected void DrawPart( ModelPart part ) { protected void DrawPart( ModelPart part ) {
for( int i = 0; i < part.Count; i++ ) { for( int i = 0; i < part.Count; i++ ) {
VertexPos3fTex2fCol4b vertex = vertices[part.Offset + i]; VertexPos3fTex2fCol4b vertex = vertices[part.Offset + i];
Vector3 newPos = Utils.RotateY( vertex.X, vertex.Y, vertex.Z, pos, cosA, sinA ); Vector3 newPos = Utils.RotateY( vertex.X, vertex.Y, vertex.Z, cosA, sinA ) + pos;
vertex.X = newPos.X; vertex.Y = newPos.Y; vertex.Z = newPos.Z; vertex.X = newPos.X; vertex.Y = newPos.Y; vertex.Z = newPos.Z;
cache.vertices[index++] = vertex; cache.vertices[index++] = vertex;
} }
@ -120,17 +120,22 @@ namespace ClassicalSharp.Model {
protected void DrawRotate( float x, float y, float z, float angleX, float angleY, float angleZ, ModelPart part ) { protected void DrawRotate( float x, float y, float z, float angleX, float angleY, float angleZ, ModelPart part ) {
Matrix4 mat = Matrix4.Translate( x, y, z ); Matrix4 mat = Matrix4.Translate( x, y, z );
if( angleZ != 0 ) { float cosX = (float)Math.Cos( -angleX ), sinX = (float)Math.Sin( -angleX );
mat = Matrix4.RotateZ( angleZ ) * mat; float cosY = (float)Math.Cos( -angleY ), sinY = (float)Math.Sin( -angleY );
float cosZ = (float)Math.Cos( -angleZ ), sinZ = (float)Math.Sin( -angleZ );
Vector3 offset = new Vector3( x, y, z ) + pos;
for( int i = 0; i < part.Count; i++ ) {
VertexPos3fTex2fCol4b vertex = vertices[part.Offset + i];
Vector3 loc = new Vector3( vertex.X - x, vertex.Y - y, vertex.Z - z );
loc = Utils.RotateZ( loc.X, loc.Y, loc.Z, cosZ, sinZ );
loc = Utils.RotateY( loc.X, loc.Y, loc.Z, cosY, sinY );
loc = Utils.RotateX( loc.X, loc.Y, loc.Z, cosX, sinX );
Vector3 newPos = Utils.RotateY( loc.X, loc.Y, loc.Z, cosA, sinA ) + offset;
vertex.X = newPos.X; vertex.Y = newPos.Y; vertex.Z = newPos.Z;
cache.vertices[index++] = vertex;
} }
if( angleY != 0 ) {
mat = Matrix4.RotateY( angleY ) * mat;
}
if( angleX != 0 ) {
mat = Matrix4.RotateX( angleX ) * mat;
}
mat = Matrix4.Translate( -x, -y, -z ) * mat;
DrawPart( part );
} }
} }
} }

2
ClassicalSharp/Model/PlayerModel.cs
View File

@ -52,7 +52,7 @@ namespace ClassicalSharp.Model {
} }
ModelPart MakeHead( bool _64x64 ) { ModelPart MakeHead( bool _64x64 ) {
return MakePart( 0, 0, 8, 8, 8, 8, 8, 8, -4f/16, 4f/16, 24f/16f, 2f, -4f/16, 4f/16, _64x64 ); return MakePart( 0, 0, 8, 8, 8, 8, 8, 8, -4f/16, 4f/16, 24f/16f, 32f/16f, -4f/16, 4f/16, _64x64 );
} }
ModelPart MakeTorso( bool _64x64 ) { ModelPart MakeTorso( bool _64x64 ) {

13
ClassicalSharp/Utils/Utils.cs
View File

@ -121,6 +121,7 @@ namespace ClassicalSharp {
float sinA = (float)Math.Sin( angle ); float sinA = (float)Math.Sin( angle );
return new Vector3( cosA * v.X - sinA * v.Z, v.Y, sinA * v.X + cosA * v.Z ); return new Vector3( cosA * v.X - sinA * v.Z, v.Y, sinA * v.X + cosA * v.Z );
} }
public static Vector3 RotateY( float x, float y, float z, float angle ) { public static Vector3 RotateY( float x, float y, float z, float angle ) {
float cosA = (float)Math.Cos( angle ); float cosA = (float)Math.Cos( angle );
@ -128,8 +129,16 @@ namespace ClassicalSharp {
return new Vector3( cosA * x - sinA * z, y, sinA * x + cosA * z ); return new Vector3( cosA * x - sinA * z, y, sinA * x + cosA * z );
} }
public static Vector3 RotateY( float x, float y, float z, Vector3 translate, float cosA, float sinA ) { public static Vector3 RotateX( float x, float y, float z, float cosA, float sinA ) {
return new Vector3( cosA * x - sinA * z + translate.X, y + translate.Y, sinA * x + cosA * z + translate.Z ); return new Vector3( x, cosA * y + sinA * z, -sinA * y + cosA * z );
}
public static Vector3 RotateY( float x, float y, float z, float cosA, float sinA ) {
return new Vector3( cosA * x - sinA * z, y, sinA * x + cosA * z );
}
public static Vector3 RotateZ( float x, float y, float z, float cosA, float sinA ) {
return new Vector3( cosA * x + sinA * y, -sinA * x + cosA * y, z );
} }
public static float DistanceSquared( Vector3 p1, Vector3 p2 ) { public static float DistanceSquared( Vector3 p1, Vector3 p2 ) {