AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-24 05:10:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed entity model bobbing. (Thanks Mrrockman888)

Browse Source
This commit is contained in:
UnknownShadow200 2017-02-07 14:26:29 +11:00
parent 42d1f63db7
commit 862690993f
3 changed files with 107 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ClassicalSharp/Entities/Entity.cs
View File

@ -92,8 +92,7 @@ namespace ClassicalSharp.Entities {
return game.World.SafeGetBlock(Vector3I.Floor(coords));
}
internal Matrix4 TransformMatrix(float scale) {
Vector3 pos = Position;
internal Matrix4 TransformMatrix(float scale, Vector3 pos) {
return
Matrix4.RotateZ(-RotZ * Utils.Deg2Rad) *
Matrix4.RotateX(-RotX * Utils.Deg2Rad) *

2
ClassicalSharp/Entities/Model/IModel.cs
View File

@ -106,7 +106,7 @@ namespace ClassicalSharp.Model {
game.Graphics.SetBatchFormat(VertexFormat.P3fT2fC4b);
game.Graphics.PushMatrix();
Matrix4 m = p.TransformMatrix(p.ModelScale);
Matrix4 m = p.TransformMatrix(p.ModelScale, pos);
game.Graphics.MultiplyMatrix(ref m);
DrawModel(p);
game.Graphics.PopMatrix();

105
ClassicalSharp/MeshBuilder/NormalBlockBuilder.cs Normal file
View File

@ -0,0 +1,105 @@
// Copyright 2014-2017 ClassicalSharp | Licensed under BSD-3
using System;
using ClassicalSharp.GraphicsAPI;
using OpenTK;
namespace ClassicalSharp {
public unsafe sealed class NormalBlockBuilder {
public BlockInfo info;
public int elementsPerAtlas1D;
public float invVerElementSize;
public byte curBlock;
public bool tinted;
public Vector3 minBB, maxBB;
public float x1, y1, z1, x2, y2, z2;
public void DrawLeftFace(int count, int col, int texId, VertexP3fT2fC4b[] vertices, ref int index) {
float vOrigin = (texId % elementsPerAtlas1D) * invVerElementSize;
float u1 = minBB.Z, u2 = (count - 1) + maxBB.Z * 15.99f/16f;
float v1 = vOrigin + maxBB.Y * invVerElementSize;
float v2 = vOrigin + minBB.Y * invVerElementSize * 15.99f/16f;
if (tinted) col = TintBlock(curBlock, col);
vertices[index++] = new VertexP3fT2fC4b(x1, y2, z2 + (count - 1), u2, v1, col);
vertices[index++] = new VertexP3fT2fC4b(x1, y2, z1, u1, v1, col);
vertices[index++] = new VertexP3fT2fC4b(x1, y1, z1, u1, v2, col);
vertices[index++] = new VertexP3fT2fC4b(x1, y1, z2 + (count - 1), u2, v2, col);
}
public void DrawRightFace(int count, int col, int texId, VertexP3fT2fC4b[] vertices, ref int index) {
float vOrigin = (texId % elementsPerAtlas1D) * invVerElementSize;
float u1 = (count - minBB.Z), u2 = (1 - maxBB.Z) * 15.99f/16f;
float v1 = vOrigin + maxBB.Y * invVerElementSize;
float v2 = vOrigin + minBB.Y * invVerElementSize * 15.99f/16f;
if (tinted) col = TintBlock(curBlock, col);
vertices[index++] = new VertexP3fT2fC4b(x2, y2, z1, u1, v1, col);
vertices[index++] = new VertexP3fT2fC4b(x2, y2, z2 + (count - 1), u2, v1, col);
vertices[index++] = new VertexP3fT2fC4b(x2, y1, z2 + (count - 1), u2, v2, col);
vertices[index++] = new VertexP3fT2fC4b(x2, y1, z1, u1, v2, col);
}
public void DrawFrontFace(int count, int col, int texId, VertexP3fT2fC4b[] vertices, ref int index) {
float vOrigin = (texId % elementsPerAtlas1D) * invVerElementSize;
float u1 = (count - minBB.X), u2 = (1 - maxBB.X) * 15.99f/16f;
float v1 = vOrigin + maxBB.Y * invVerElementSize;
float v2 = vOrigin + minBB.Y * invVerElementSize * 15.99f/16f;
if (tinted) col = TintBlock(curBlock, col);
vertices[index++] = new VertexP3fT2fC4b(x2 + (count - 1), y1, z1, u2, v2, col);
vertices[index++] = new VertexP3fT2fC4b(x1, y1, z1, u1, v2, col);
vertices[index++] = new VertexP3fT2fC4b(x1, y2, z1, u1, v1, col);
vertices[index++] = new VertexP3fT2fC4b(x2 + (count - 1), y2, z1, u2, v1, col);
}
public void DrawBackFace(int count, int col, int texId, VertexP3fT2fC4b[] vertices, ref int index) {
float vOrigin = (texId % elementsPerAtlas1D) * invVerElementSize;
float u1 = minBB.X, u2 = (count - 1) + maxBB.X * 15.99f/16f;
float v1 = vOrigin + maxBB.Y * invVerElementSize;
float v2 = vOrigin + minBB.Y * invVerElementSize * 15.99f/16f;
if (tinted) col = TintBlock(curBlock, col);
vertices[index++] = new VertexP3fT2fC4b(x2 + (count - 1), y2, z2, u2, v1, col);
vertices[index++] = new VertexP3fT2fC4b(x1, y2, z2, u1, v1, col);
vertices[index++] = new VertexP3fT2fC4b(x1, y1, z2, u1, v2, col);
vertices[index++] = new VertexP3fT2fC4b(x2 + (count - 1), y1, z2, u2, v2, col);
}
public void DrawBottomFace(int count, int col, int texId, VertexP3fT2fC4b[] vertices, ref int index) {
float vOrigin = (texId % elementsPerAtlas1D) * invVerElementSize;
float u1 = minBB.X, u2 = (count - 1) + maxBB.X * 15.99f/16f;
float v1 = vOrigin + minBB.Z * invVerElementSize;
float v2 = vOrigin + maxBB.Z * invVerElementSize * 15.99f/16f;
if (tinted) col = TintBlock(curBlock, col);
vertices[index++] = new VertexP3fT2fC4b(x2 + (count - 1), y1, z2, u2, v2, col);
vertices[index++] = new VertexP3fT2fC4b(x1, y1, z2, u1, v2, col);
vertices[index++] = new VertexP3fT2fC4b(x1, y1, z1, u1, v1, col);
vertices[index++] = new VertexP3fT2fC4b(x2 + (count - 1), y1, z1, u2, v1, col);
}
public void DrawTopFace(int count, int col, int texId, VertexP3fT2fC4b[] vertices, ref int index) {
float vOrigin = (texId % elementsPerAtlas1D) * invVerElementSize;
float u1 = minBB.X, u2 = (count - 1) + maxBB.X * 15.99f/16f;
float v1 = vOrigin + minBB.Z * invVerElementSize;
float v2 = vOrigin + maxBB.Z * invVerElementSize * 15.99f/16f;
if (tinted) col = TintBlock(curBlock, col);
vertices[index++] = new VertexP3fT2fC4b(x2 + (count - 1), y2, z1, u2, v1, col);
vertices[index++] = new VertexP3fT2fC4b(x1, y2, z1, u1, v1, col);
vertices[index++] = new VertexP3fT2fC4b(x1, y2, z2, u1, v2, col);
vertices[index++] = new VertexP3fT2fC4b(x2 + (count - 1), y2, z2, u2, v2, col);
}
int TintBlock(byte curBlock, int col) {
FastColour fogCol = info.FogColour[curBlock];
FastColour newCol = FastColour.Unpack(col);
newCol *= fogCol;
return newCol.Pack();
}
}
}