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

Particle size is less hardcoded.

Browse Source
This commit is contained in:
UnknownShadow200 2017-11-16 23:56:01 +11:00
parent 945fa5d2ba
commit 43d7b35231
4 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ClassicalSharp/Particles/Particle.cs
View File

@ -17,7 +17,8 @@ namespace ClassicalSharp.Particles {
public Vector3 Velocity;
public float Lifetime;
protected Vector3 lastPos, nextPos;
protected bool hitTerrain = false, throughLiquids = true;
protected bool hitTerrain = false;
public byte Size;
// http://www.opengl-tutorial.org/intermediate-tutorials/billboards-particles/billboards/
public static void DoRender(Game g, ref Vector2 size, ref Vector3 pos, ref TextureRec rec,
@ -49,13 +50,13 @@ namespace ClassicalSharp.Particles {
hitTerrain = false;
}
protected bool Tick(Game game, float gravity, double delta) {
protected bool Tick(Game game, float gravity, bool throughLiquids, double delta) {
hitTerrain = false;
lastPos = nextPos;
BlockID curBlock = GetBlock(game, (int)nextPos.X, (int)nextPos.Y, (int)nextPos.Z);
float minY = Utils.Floor(nextPos.Y) + BlockInfo.MinBB[curBlock].Y;
float maxY = Utils.Floor(nextPos.Y) + BlockInfo.MaxBB[curBlock].Y;
if (!CanPassThrough(game, curBlock) && nextPos.Y >= minY && nextPos.Y < maxY && CollideHor(game, curBlock))
if (!CanPassThrough(game, curBlock, throughLiquids) && nextPos.Y >= minY && nextPos.Y < maxY && CollideHor(game, curBlock))
return true;
Velocity.Y -= gravity * (float)delta;
@ -65,16 +66,16 @@ namespace ClassicalSharp.Particles {
if (Velocity.Y > 0) {
// don't test block we are already in
for (int y = startY + 1; y <= endY && TestY(game, y, false); y++);
for (int y = startY + 1; y <= endY && TestY(game, y, false, throughLiquids); y++);
} else {
for (int y = startY; y >= endY && TestY(game, y, true); y--);
for (int y = startY; y >= endY && TestY(game, y, true, throughLiquids); y--);
}
Lifetime -= (float)delta;
return Lifetime < 0;
}
bool TestY(Game game, int y, bool topFace) {
bool TestY(Game game, int y, bool topFace, bool throughLiquids) {
if (y < 0) {
nextPos.Y = lastPos.Y = 0 + Entity.Adjustment;
Velocity = Vector3.Zero;
@ -83,7 +84,7 @@ namespace ClassicalSharp.Particles {
}
BlockID block = GetBlock(game, (int)nextPos.X, y, (int)nextPos.Z);
if (CanPassThrough(game, block)) return true;
if (CanPassThrough(game, block, throughLiquids)) return true;
Vector3 minBB = BlockInfo.MinBB[block];
Vector3 maxBB = BlockInfo.MaxBB[block];
float collideY = y + (topFace ? maxBB.Y : minBB.Y);
@ -99,7 +100,7 @@ namespace ClassicalSharp.Particles {
return true;
}
bool CanPassThrough(Game game, BlockID block) {
bool CanPassThrough(Game game, BlockID block, bool throughLiquids) {
byte draw = BlockInfo.Draw[block];
return draw == DrawType.Gas || draw == DrawType.Sprite
|| (throughLiquids && BlockInfo.IsLiquid(block));
@ -127,24 +128,16 @@ namespace ClassicalSharp.Particles {
}
public sealed class RainParticle : Particle {
static Vector2 bigSize = new Vector2(1/16f, 1/16f);
static Vector2 smallSize = new Vector2(0.75f/16f, 0.75f/16f);
static Vector2 tinySize = new Vector2(0.5f/16f, 0.5f/16f);
static TextureRec rec = new TextureRec(2/128f, 14/128f, 3/128f, 2/128f);
public RainParticle() { throughLiquids = false; }
public bool Big, Tiny;
public bool Tick(Game game, double delta) {
bool dies = Tick(game, 3.5f, delta);
bool dies = Tick(game, 3.5f, false, delta);
return hitTerrain ? true : dies;
}
public void Render(Game game, float t, VertexP3fT2fC4b[] vertices, ref int index) {
Vector3 pos = Vector3.Lerp(lastPos, nextPos, t);
Vector2 size = Big ? bigSize : (Tiny ? tinySize : smallSize);
Vector2 size; size.X = Size * 0.015625f; size.Y = size.X;
int x = Utils.Floor(pos.X), y = Utils.Floor(pos.Y), z = Utils.Floor(pos.Z);
int col = game.World.IsValidPos(x, y, z) ? game.Lighting.LightCol(x, y, z) : game.Lighting.Outside;
@ -153,18 +146,18 @@ namespace ClassicalSharp.Particles {
}
public sealed class TerrainParticle : Particle {
static Vector2 terrainSize = new Vector2(1/8f, 1/8f);
internal TextureRec rec;
internal byte texLoc;
internal BlockID block;
internal BlockID block;
public bool Tick(Game game, double delta) {
return Tick(game, 5.4f, delta);
return Tick(game, 5.4f, true, delta);
}
public void Render(Game game, float t, VertexP3fT2fC4b[] vertices, ref int index) {
Vector3 pos = Vector3.Lerp(lastPos, nextPos, t);
Vector3 pos = Vector3.Lerp(lastPos, nextPos, t);
Vector2 size; size.X = Size * 0.015625f; size.Y = size.X;
int col = FastColour.WhitePacked;
if (!BlockInfo.FullBright[block]) {
int x = Utils.Floor(pos.X), y = Utils.Floor(pos.Y), z = Utils.Floor(pos.Z);
@ -177,7 +170,7 @@ namespace ClassicalSharp.Particles {
newCol *= fogCol;
col = newCol.Pack();
}
DoRender(game, ref terrainSize, ref pos, ref rec, col, vertices, ref index);
DoRender(game, ref size, ref pos, ref rec, col, vertices, ref index);
}
}
}

5
ClassicalSharp/Particles/ParticleManager.cs
View File

@ -217,6 +217,7 @@ namespace ClassicalSharp.Particles {
p.texLoc = (byte)texLoc;
p.block = block;
p.Size = 8;
}
}
@ -248,8 +249,8 @@ namespace ClassicalSharp.Particles {
double life = 40;
RainParticle p = GetRainParticle();
p.ResetState(pos, velocity, life);
p.Big = rnd.Next(0, 20) >= 18;
p.Tiny = rnd.Next(0, 30) >= 28;
int type = rnd.Next(0, 30);
p.Size = (byte)(type >= 28 ? 2 : (type >= 25 ? 4 : 3));
}
}

19
src/Client/Particle.c
View File

@ -125,28 +125,26 @@ bool RainParticle_Tick(RainParticle* p, Real64 delta) {
return p->Base.HitTerrain || dies;
}
Vector2 Rain_Big = { 1.00f / 16.0f, 1.00f / 16.0f };
Vector2 Rain_Small = { 0.75f / 16.0f, 0.75f / 16.0f };
Vector2 Rain_Tiny = { 0.50f / 16.0f, 0.50f / 16.0f };
TextureRec Rain_Rec = { 2.0f / 128.0f, 14.0f / 128.0f, 3.0f / 128.0f, 2.0f / 128.0f };
void RainParticle_Render(RainParticle* p, Real32 t, VertexP3fT2fC4b** vertices) {
Vector3 pos;
Vector3_Lerp(&pos, &p->Base.LastPos, &p->Base.NextPos, t);
Vector2* size = p->Big ? &Rain_Big : (p->Tiny ? &Rain_Tiny : &Rain_Small);
Vector2 size; size.X = (Real32)p->Base.Size * 0.015625f; size.Y = size.X;
Int32 x = Math_Floor(pos.X), y = Math_Floor(pos.Y), z = Math_Floor(pos.Z);
PackedCol col = World_IsValidPos(x, y, z) ? Lighting_Col(x, y, z) : Lighting_Outside;
Particle_DoRender(size, &pos, &Rain_Rec, col, vertices);
Particle_DoRender(&size, &pos, &Rain_Rec, col, vertices);
}
bool TerrainParticle_Tick(TerrainParticle* p, Real64 delta) {
return Particle_PhysicsTick(&p->Base, 5.4f, true, delta);
}
Vector2 Terrain_Size = { 1.0f / 8.0f, 1.0f / 8.0f };
void TerrainParticle_Render(TerrainParticle* p, Real32 t, VertexP3fT2fC4b** vertices) {
Vector3 pos;
Vector3_Lerp(&pos, &p->Base.LastPos, &p->Base.NextPos, t);
Vector2 size; size.X = (Real32)p->Base.Size * 0.015625f; size.Y = size.X;
PackedCol col = PACKEDCOL_WHITE;
if (!Block_FullBright[p->Block]) {
Int32 x = Math_Floor(pos.X), y = Math_Floor(pos.Y), z = Math_Floor(pos.Z);
@ -159,7 +157,7 @@ void TerrainParticle_Render(TerrainParticle* p, Real32 t, VertexP3fT2fC4b** vert
col.G = (UInt8)(col.G * tintCol.G / 255);
col.B = (UInt8)(col.B * tintCol.B / 255);
}
Particle_DoRender(&Terrain_Size, &pos, &p->Rec, col, vertices);
Particle_DoRender(&size, &pos, &p->Rec, col, vertices);
}
@ -388,6 +386,7 @@ void Particles_BreakBlockEffect(Vector3I coords, BlockID oldBlock, BlockID block
p->Rec = rec;
p->TexLoc = (TextureLoc)texLoc;
p->Block = block;
p->Base.Size = 8;
}
}
@ -410,8 +409,8 @@ void Particles_RainSnowEffect(Vector3 pos) {
Rain_Count++;
Vector3_Add(&pos, &startPos, &offset);
Particle_Reset(&p->Base, pos, velocity, 40.0f);
p->Big = Random_Range(&rnd, 0, 20) >= 18;
p->Tiny = Random_Range(&rnd, 0, 30) >= 28;
Particle_Reset(&p->Base, pos, velocity, 40.0f);
Int32 type = Random_Range(&rnd, 0, 30);
p->Base.Size = (UInt8)(type >= 28 ? 2 : (type >= 25 ? 4 : 3));
}
}

2
src/Client/Particle.h
View File

@ -15,6 +15,7 @@ typedef struct Particle_ {
Real32 Lifetime;
Vector3 LastPos, NextPos;
bool HitTerrain;
UInt8 Size;
} Particle;
/* http://www.opengl-tutorial.org/intermediate-tutorials/billboards-particles/billboards/ */
@ -24,7 +25,6 @@ bool Particle_PhysicsTick(Particle* p, Real32 gravity, bool throughLiquids, Real
typedef struct RainParticle_ {
Particle Base;
bool Big, Tiny;
} RainParticle;
bool RainParticle_Tick(RainParticle* p, Real64 delta);