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

Merge pull request #626 from UnknownShadow200/CustomParticles

Browse Source 
Add CustomParticles CPE
This commit is contained in:
Goodlyay 2020-02-22 17:27:49 -08:00 committed by GitHub
commit cb47bc4f52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 199 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
src/Particle.c
View File

@ -148,7 +148,7 @@ static void RainParticle_Render(struct Particle* p, float t, VertexP3fT2fC4b* ve
int x, y, z;
Vec3_Lerp(&pos, &p->lastPos, &p->nextPos, t);
size.X = (float)p->size * 0.015625f; size.Y = size.X;
size.X = p->size * 0.015625f; size.Y = size.X;
x = Math_Floor(pos.X); y = Math_Floor(pos.Y); z = Math_Floor(pos.Z);
col = World_Contains(x, y, z) ? Lighting_Col(x, y, z) : Env.SunCol;
@ -218,7 +218,7 @@ static void TerrainParticle_Render(struct TerrainParticle* p, float t, VertexP3f
int x, y, z;
Vec3_Lerp(&pos, &p->base.lastPos, &p->base.nextPos, t);
size.X = (float)p->base.size * 0.015625f; size.Y = size.X;
size.X = p->base.size * 0.015625f; size.Y = size.X;
if (!Blocks.FullBright[p->block]) {
x = Math_Floor(pos.X); y = Math_Floor(pos.Y); z = Math_Floor(pos.Z);
@ -293,12 +293,90 @@ static void Terrain_Tick(double delta) {
}
}
/*########################################################################################################################*
*-------------------------------------------------------Custom particle---------------------------------------------------*
*#########################################################################################################################*/
struct CustomParticle {
struct Particle base;
int effectId;
float totalLifespan;
};
struct CustomParticleEffect Particles_CustomEffects[256];
static struct CustomParticle custom_particles[PARTICLES_MAX];
static int custom_count;
static cc_bool CustomParticle_Tick(struct CustomParticle* p, double delta) {
struct CustomParticleEffect* e = &Particles_CustomEffects[p->effectId];
particle_hitTerrain = false;
return Particle_PhysicsTick(&p->base, e->gravity, false, delta)
|| (particle_hitTerrain && e->expireUponTouchingGround);
}
static void CustomParticle_Render(struct CustomParticle* p, float t, VertexP3fT2fC4b* vertices) {
struct CustomParticleEffect* e = &Particles_CustomEffects[p->effectId];
Vec3 pos;
Vec2 size;
PackedCol col;
TextureRec rec = e->rec;
int x, y, z;
float time_lived = p->totalLifespan - p->base.lifetime;
int curFrame = Math_Floor(e->frameCount * (time_lived / p->totalLifespan));
float shiftU = curFrame * (rec.U2 - rec.U1);
rec.U1 += shiftU;// * 0.0078125f;
rec.U2 += shiftU;// * 0.0078125f;
Vec3_Lerp(&pos, &p->base.lastPos, &p->base.nextPos, t);
size.X = p->base.size; size.Y = size.X;
x = Math_Floor(pos.X); y = Math_Floor(pos.Y); z = Math_Floor(pos.Z);
col = e->fullBright ? PACKEDCOL_WHITE : (World_Contains(x, y, z) ? Lighting_Col(x, y, z) : Env.SunCol);
col = PackedCol_Tint(col, e->tintCol);
Particle_DoRender(&size, &pos, &rec, col, vertices);
}
static void Custom_Render(float t) {
VertexP3fT2fC4b* data;
int i;
if (!custom_count) return;
data = (VertexP3fT2fC4b*)Gfx_LockDynamicVb(Particles_VB, VERTEX_FORMAT_P3FT2FC4B, custom_count * 4);
for (i = 0; i < custom_count; i++) {
CustomParticle_Render(&custom_particles[i], t, data);
data += 4;
}
Gfx_BindTexture(Particles_TexId);
Gfx_UnlockDynamicVb(Particles_VB);
Gfx_DrawVb_IndexedTris(custom_count * 4);
}
static void Custom_RemoveAt(int i) {
for (; i < custom_count - 1; i++) {
custom_particles[i] = custom_particles[i + 1];
}
custom_count--;
}
static void Custom_Tick(double delta) {
int i;
for (i = 0; i < custom_count; i++) {
if (CustomParticle_Tick(&custom_particles[i], delta)) {
Custom_RemoveAt(i); i--;
}
}
}
/*########################################################################################################################*
*--------------------------------------------------------Particles--------------------------------------------------------*
*#########################################################################################################################*/
void Particles_Render(float t) {
if (!terrain_count && !rain_count) return;
if (!terrain_count && !rain_count && !custom_count) return;
if (Gfx.LostContext) return;
Gfx_SetTexturing(true);
@ -307,6 +385,7 @@ void Particles_Render(float t) {
Gfx_SetVertexFormat(VERTEX_FORMAT_P3FT2FC4B);
Terrain_Render(t);
Rain_Render(t);
Custom_Render(t);
Gfx_SetAlphaTest(false);
Gfx_SetTexturing(false);
@ -315,6 +394,7 @@ void Particles_Render(float t) {
void Particles_Tick(struct ScheduledTask* task) {
Terrain_Tick(task->Interval);
Rain_Tick(task->Interval);
Custom_Tick(task->Interval);
}
void Particles_BreakBlockEffect(IVec3 coords, BlockID old, BlockID now) {
@ -392,7 +472,7 @@ void Particles_BreakBlockEffect(IVec3 coords, BlockID old, BlockID now) {
p->texLoc = loc;
p->block = old;
type = Random_Next(&rnd, 30);
p->base.size = (cc_uint8)(type >= 28 ? 12 : (type >= 25 ? 10 : 8));
p->base.size = type >= 28 ? 12 : (type >= 25 ? 10 : 8);
}
}
}
@ -418,7 +498,56 @@ void Particles_RainSnowEffect(float x, float y, float z) {
p->lifetime = 40.0f;
type = Random_Next(&rnd, 30);
p->size = (cc_uint8)(type >= 28 ? 2 : (type >= 25 ? 4 : 3));
p->size = type >= 28 ? 2 : (type >= 25 ? 4 : 3);
}
}
void Particles_CustomEffect(int effectID, float x, float y, float z, float originX, float originY, float originZ) {
struct CustomParticle* p;
struct CustomParticleEffect* e = &Particles_CustomEffects[effectID];
int i, count = e->particleCount;
Vec3 offset;
float d;
for (i = 0; i < count; i++) {
if (custom_count == PARTICLES_MAX) Custom_RemoveAt(0);
p = &custom_particles[custom_count++];
p->effectId = effectID;
offset.X = Random_Float(&rnd) - 0.5f;
offset.Y = Random_Float(&rnd) - 0.5f;
offset.Z = Random_Float(&rnd) - 0.5f;
Vec3_Normalize(&offset, &offset);
d = Random_Float(&rnd);
d = Math_Exp(Math_Log(d) / 3.0); /* d^1/3 for better distribution */
d *= e->spread;
p->base.lastPos.X = x + offset.X * d;
p->base.lastPos.Y = y + offset.Y * d;
p->base.lastPos.Z = z + offset.Z * d;
Vec3 origin = { originX, originY, originZ };
if (Vec3_Equals(&origin, &p->base.lastPos)) {
p->base.velocity.X = 0;
p->base.velocity.Y = 0;
p->base.velocity.Z = 0;
}
else {
Vec3 diff;
Vec3_Sub(&diff, &p->base.lastPos, &origin);
Vec3_Normalize(&diff, &diff);
p->base.velocity.X = diff.X * e->speed;
p->base.velocity.Y = diff.Y * e->speed;
p->base.velocity.Z = diff.Z * e->speed;
}
p->base.nextPos = p->base.lastPos;
p->base.lifetime = e->baseLifetime + (e->baseLifetime * e->lifetimeVariation) * ((Random_Float(&rnd) - 0.5f) * 2);
p->totalLifespan = p->base.lifetime;
p->base.size = e->size + (e->size * e->sizeVariation) * ((Random_Float(&rnd) - 0.5f) * 2);
}
}
@ -463,7 +592,7 @@ static void Particles_Free(void) {
Event_UnregisterVoid(&GfxEvents.ContextRecreated, NULL, OnContextRecreated);
}
static void Particles_Reset(void) { rain_count = 0; terrain_count = 0; }
static void Particles_Reset(void) { rain_count = 0; terrain_count = 0; custom_count = 0; }
struct IGameComponent Particles_Component = {
Particles_Init, /* Init */

21
src/Particle.h
View File

@ -14,13 +14,32 @@ struct Particle {
Vec3 velocity;
float lifetime;
Vec3 lastPos, nextPos;
cc_uint8 size;
float size;
};
struct CustomParticleEffect {
TextureRec rec;
PackedCol tintCol;
cc_uint8 frameCount;
cc_uint8 particleCount;
cc_bool expireUponTouchingGround;
cc_bool fullBright;
float size;
float sizeVariation;
float spread; /* how far from the spawnpoint their location can vary */
float speed; /* how fast they move away/towards the origin */
float gravity;
float baseLifetime; /* how long (in seconds) the particle lives for */
float lifetimeVariation;
};
extern struct CustomParticleEffect Particles_CustomEffects[256];
/* http://www.opengl-tutorial.org/intermediate-tutorials/billboards-particles/billboards/ */
void Particle_DoRender(const Vec2* size, const Vec3* pos, const TextureRec* rec, PackedCol col, VertexP3fT2fC4b* vertices);
void Particles_Render(float t);
void Particles_Tick(struct ScheduledTask* task);
void Particles_BreakBlockEffect(IVec3 coords, BlockID oldBlock, BlockID block);
void Particles_RainSnowEffect(float x, float y, float z);
void Particles_CustomEffect(int effectID, float x, float y, float z, float originX, float originY, float originZ);
#endif

45
src/Protocol.c
View File

@ -24,6 +24,7 @@
#include "Errors.h"
#include "Camera.h"
#include "Window.h"
#include "Particle.h"
cc_uint16 Net_PacketSizes[OPCODE_COUNT];
Net_Handler Net_Handlers[OPCODE_COUNT];
@ -726,13 +727,13 @@ static void Classic_Tick(void) {
/*########################################################################################################################*
*------------------------------------------------------CPE protocol-------------------------------------------------------*
*#########################################################################################################################*/
static const char* cpe_clientExtensions[33] = {
static const char* cpe_clientExtensions[34] = {
"ClickDistance", "CustomBlocks", "HeldBlock", "EmoteFix", "TextHotKey", "ExtPlayerList",
"EnvColors", "SelectionCuboid", "BlockPermissions", "ChangeModel", "EnvMapAppearance",
"EnvWeatherType", "MessageTypes", "HackControl", "PlayerClick", "FullCP437", "LongerMessages",
"BlockDefinitions", "BlockDefinitionsExt", "BulkBlockUpdate", "TextColors", "EnvMapAspect",
"EntityProperty", "ExtEntityPositions", "TwoWayPing", "InventoryOrder", "InstantMOTD", "FastMap", "SetHotbar",
"SetSpawnpoint", "VelocityControl",
"SetSpawnpoint", "VelocityControl", "CustomParticles",
/* NOTE: These must be placed last for when EXTENDED_TEXTURES or EXTENDED_BLOCKS are not defined */
"ExtendedTextures", "ExtendedBlocks"
};
@ -1339,6 +1340,44 @@ static void CPE_VelocityControl(cc_uint8* data) {
CalcVelocity(&p->Base.Velocity.Z, data + 8, data[14]);
}
static void CPE_DefineEffect(cc_uint8* data) {
struct CustomParticleEffect* e = &Particles_CustomEffects[data[0]];
/* e.g. bounds of 0,0, 15,15 gives an 8x8 icon in the default 128x128 particles.png */
e->rec.U1 = data[1] / 256.0f;
e->rec.V1 = data[2] / 256.0f;
e->rec.U2 = (data[3] + 1) / 256.0f;
e->rec.V2 = (data[4] + 1) / 256.0f;
e->tintCol = PackedCol_Make(data[5], data[6], data[7], 255);
e->frameCount = data[8];
e->particleCount = data[9];
e->size = data[10] / 32.0f; /* 32 units per block */
e->sizeVariation = (int)Stream_GetU32_BE(data + 11) / 10000.0f;
e->spread = Stream_GetU16_BE(data + 15) / 32.0f;
e->speed = (int)Stream_GetU32_BE(data + 17) / 10000.0f;
e->gravity = (int)Stream_GetU32_BE(data + 21) / 10000.0f;
e->baseLifetime = (int)Stream_GetU32_BE(data + 25) / 10000.0f;
e->lifetimeVariation = (int)Stream_GetU32_BE(data + 29) / 10000.0f;
e->expireUponTouchingGround = data[33];
e->fullBright = data[34];
}
static void CPE_SpawnEffect(cc_uint8* data) {
float x, y, z, originX, originY, originZ;
x = (int)Stream_GetU32_BE(data + 1) / 32.0f;
y = (int)Stream_GetU32_BE(data + 5) / 32.0f;
z = (int)Stream_GetU32_BE(data + 9) / 32.0f;
originX = (int)Stream_GetU32_BE(data + 13) / 32.0f;
originY = (int)Stream_GetU32_BE(data + 17) / 32.0f;
originZ = (int)Stream_GetU32_BE(data + 21) / 32.0f;
Particles_CustomEffect(data[0], x, y, z, originX, originY, originZ);
}
static void CPE_Reset(void) {
cpe_serverExtensionsCount = 0; cpe_pingTicks = 0;
cpe_sendHeldBlock = false; cpe_useMessageTypes = false;
@ -1379,6 +1418,8 @@ static void CPE_Reset(void) {
Net_Set(OPCODE_SET_HOTBAR, CPE_SetHotbar, 3);
Net_Set(OPCODE_SET_SPAWNPOINT, CPE_SetSpawnPoint, 9);
Net_Set(OPCODE_VELOCITY_CONTROL, CPE_VelocityControl, 16);
Net_Set(OPCODE_DEFINE_EFFECT, CPE_DefineEffect, 36);
Net_Set(OPCODE_SPAWN_EFFECT, CPE_SpawnEffect, 26);
}
static void CPE_Tick(void) {

1
src/Protocol.h
View File

@ -33,6 +33,7 @@ enum OPCODE_ {
OPCODE_SET_ENTITY_PROPERTY, OPCODE_TWO_WAY_PING,
OPCODE_SET_INVENTORY_ORDER, OPCODE_SET_HOTBAR,
OPCODE_SET_SPAWNPOINT, OPCODE_VELOCITY_CONTROL,
OPCODE_DEFINE_EFFECT, OPCODE_SPAWN_EFFECT,
OPCODE_COUNT
};