AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-17 11:35:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace expireUponTouchingGround with collideFlags

Browse Source 
flags: expireUponTouchingGround, collidesSolid, collidesLiquid,
collidesLeaves
This commit is contained in:
Goodlyay 2020-02-28 03:05:14 -08:00
parent 3662056c25
commit 4f7adbc937
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Particle.c
View File

@ -307,13 +307,33 @@ struct CustomParticle {
struct CustomParticleEffect Particles_CustomEffects[256]; struct CustomParticleEffect Particles_CustomEffects[256];
static struct CustomParticle custom_particles[PARTICLES_MAX]; static struct CustomParticle custom_particles[PARTICLES_MAX];
static int custom_count; static int custom_count;
static cc_uint8 collideFlags;
#define EXPIRES_UPON_TOUCHING_GROUND (1 << 0)
#define SOLID_COLLIDES (1 << 1)
#define LIQUID_COLLIDES (1 << 2)
#define LEAF_COLLIDES (1 << 3)
static cc_bool CustomParticle_CanPass(BlockID block) {
cc_uint8 draw = Blocks.Draw[block];
if (draw == DRAW_TRANSPARENT_THICK && !(collideFlags & LEAF_COLLIDES)) {
return true;
}
cc_uint8 collide = Blocks.Collide[block];
if (collide == COLLIDE_SOLID && (collideFlags & SOLID_COLLIDES)) {
return false;
}
if (collide == COLLIDE_LIQUID && (collideFlags & LIQUID_COLLIDES)) {
return false;
}
return true;
}
static cc_bool CustomParticle_Tick(struct CustomParticle* p, double delta) { static cc_bool CustomParticle_Tick(struct CustomParticle* p, double delta) {
struct CustomParticleEffect* e = &Particles_CustomEffects[p->effectId]; struct CustomParticleEffect* e = &Particles_CustomEffects[p->effectId];
particle_hitTerrain = false; particle_hitTerrain = false;
collideFlags = e->collideFlags;
return Particle_PhysicsTick(&p->base, e->gravity, RainParticle_CanPass, delta) return Particle_PhysicsTick(&p->base, e->gravity, CustomParticle_CanPass, delta)
|| (particle_hitTerrain && e->expireUponTouchingGround); || (particle_hitTerrain && e->collideFlags & EXPIRES_UPON_TOUCHING_GROUND);
} }
static void CustomParticle_Render(struct CustomParticle* p, float t, VertexP3fT2fC4b* vertices) { static void CustomParticle_Render(struct CustomParticle* p, float t, VertexP3fT2fC4b* vertices) {

2
src/Particle.h
View File

@ -22,7 +22,7 @@ struct CustomParticleEffect {
PackedCol tintCol; PackedCol tintCol;
cc_uint8 frameCount; cc_uint8 frameCount;
cc_uint8 particleCount; cc_uint8 particleCount;
cc_bool expireUponTouchingGround; cc_uint8 collideFlags;
cc_bool fullBright; cc_bool fullBright;
float size; float size;
float sizeVariation; float sizeVariation;

4
src/Protocol.c
View File

@ -1361,8 +1361,8 @@ static void CPE_DefineEffect(cc_uint8* data) {
e->baseLifetime = (int)Stream_GetU32_BE(data + 25) / 10000.0f; e->baseLifetime = (int)Stream_GetU32_BE(data + 25) / 10000.0f;
e->lifetimeVariation = (int)Stream_GetU32_BE(data + 29) / 10000.0f; e->lifetimeVariation = (int)Stream_GetU32_BE(data + 29) / 10000.0f;
e->expireUponTouchingGround = data[33]; e->collideFlags = data[33];
e->fullBright = data[34]; e->fullBright = data[34];
} }
static void CPE_SpawnEffect(cc_uint8* data) { static void CPE_SpawnEffect(cc_uint8* data) {