fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Centralise some more particle stuff, still not fixed though :(

Browse Source
This commit is contained in:
Electroblob77
2020-06-20 13:08:55 +01:00
parent b65709fca4
commit cbc778bff7
4 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/client/particle/ParticleBuff.java
+1 -7
View File
@@ -59,13 +59,7 @@ public class ParticleBuff extends ParticleWizardry {
float rotationYZ, float rotationXY, float rotationXZ){ float rotationYZ, float rotationXY, float rotationXZ){
// Copied from ParticleWizardry, needs to be here since we're not calling super // Copied from ParticleWizardry, needs to be here since we're not calling super
updateEntityLinking(partialTicks); updateEntityLinking(viewer, partialTicks);
// I don't know why, but despite not being in any superclass renderParticle these also need to be here if we're
// not calling super
interpPosX = viewer.lastTickPosX + (viewer.posX - viewer.lastTickPosX) * (double)partialTicks;
interpPosY = viewer.lastTickPosY + (viewer.posY - viewer.lastTickPosY) * (double)partialTicks;
interpPosZ = viewer.lastTickPosZ + (viewer.posZ - viewer.lastTickPosZ) * (double)partialTicks;
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
GlStateManager.pushAttrib(); GlStateManager.pushAttrib();
src/main/java/electroblob/wizardry/client/particle/ParticleSphere.java
+1 -7
View File
@@ -41,13 +41,7 @@ public class ParticleSphere extends ParticleWizardry {
float rotationXY, float rotationXZ){ float rotationXY, float rotationXZ){
// Copied from ParticleWizardry, needs to be here since we're not calling super // Copied from ParticleWizardry, needs to be here since we're not calling super
updateEntityLinking(partialTicks); updateEntityLinking(viewer, partialTicks);
// I don't know why, but despite not being in any superclass renderParticle these also need to be here if we're
// not calling super
interpPosX = viewer.lastTickPosX + (viewer.posX - viewer.lastTickPosX) * (double)partialTicks;
interpPosY = viewer.lastTickPosY + (viewer.posY - viewer.lastTickPosY) * (double)partialTicks;
interpPosZ = viewer.lastTickPosZ + (viewer.posZ - viewer.lastTickPosZ) * (double)partialTicks;
float x = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)partialTicks); float x = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)partialTicks);
float y = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)partialTicks); float y = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)partialTicks);
src/main/java/electroblob/wizardry/client/particle/ParticleTargeted.java
+1 -7
View File
@@ -76,13 +76,7 @@ public abstract class ParticleTargeted extends ParticleWizardry {
float rotationXY, float rotationXZ){ float rotationXY, float rotationXZ){
// Copied from ParticleWizardry, needs to be here since we're not calling super // Copied from ParticleWizardry, needs to be here since we're not calling super
updateEntityLinking(partialTicks); updateEntityLinking(viewer, partialTicks);
// I don't know why, but despite not being in any superclass renderParticle these also need to be here if we're
// not calling super
interpPosX = viewer.lastTickPosX + (viewer.posX - viewer.lastTickPosX) * (double)partialTicks;
interpPosY = viewer.lastTickPosY + (viewer.posY - viewer.lastTickPosY) * (double)partialTicks;
interpPosZ = viewer.lastTickPosZ + (viewer.posZ - viewer.lastTickPosZ) * (double)partialTicks;
float x = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)partialTicks); float x = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)partialTicks);
float y = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)partialTicks); float y = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)partialTicks);
src/main/java/electroblob/wizardry/client/particle/ParticleWizardry.java
+8 -2
View File
@@ -336,7 +336,7 @@ public abstract class ParticleWizardry extends Particle {
public void renderParticle(BufferBuilder buffer, Entity viewer, float partialTicks, float lookZ, float lookY, public void renderParticle(BufferBuilder buffer, Entity viewer, float partialTicks, float lookZ, float lookY,
float lookX, float lookXY, float lookYZ){ float lookX, float lookXY, float lookYZ){
updateEntityLinking(partialTicks); updateEntityLinking(viewer, partialTicks);
if(Float.isNaN(this.yaw) || Float.isNaN(this.pitch)){ if(Float.isNaN(this.yaw) || Float.isNaN(this.pitch)){
// Normal behaviour (rotates to face the viewer) // Normal behaviour (rotates to face the viewer)
@@ -369,12 +369,18 @@ public abstract class ParticleWizardry extends Particle {
super.renderParticle(buffer, viewer, partialTicks, rotationX, rotationY, rotationZ, rotationYZ, rotationXY); super.renderParticle(buffer, viewer, partialTicks, rotationX, rotationY, rotationZ, rotationYZ, rotationXY);
} }
protected void updateEntityLinking(float partialTicks){ protected void updateEntityLinking(Entity viewer, float partialTicks){
// TODO: Still not working, it seems this bug was a thing back in 4.2.x anyway
if(this.entity != null){ if(this.entity != null){
// This is kind of cheating but we know it's always a constant velocity so it works fine // This is kind of cheating but we know it's always a constant velocity so it works fine
prevPosX = posX + entity.prevPosX - entity.posX - relativeMotionX * (1-partialTicks); prevPosX = posX + entity.prevPosX - entity.posX - relativeMotionX * (1-partialTicks);
prevPosY = posY + entity.prevPosY - entity.posY - relativeMotionY * (1-partialTicks); prevPosY = posY + entity.prevPosY - entity.posY - relativeMotionY * (1-partialTicks);
prevPosZ = posZ + entity.prevPosZ - entity.posZ - relativeMotionZ * (1-partialTicks); prevPosZ = posZ + entity.prevPosZ - entity.posZ - relativeMotionZ * (1-partialTicks);
}else if(this.getFXLayer() == 3){
// Not sure why, but when fx layer is 3, the interp pos is wrong when not linked to an entity
interpPosX = viewer.lastTickPosX + (viewer.posX - viewer.lastTickPosX) * (double)partialTicks;
interpPosY = viewer.lastTickPosY + (viewer.posY - viewer.lastTickPosY) * (double)partialTicks;
interpPosZ = viewer.lastTickPosZ + (viewer.posZ - viewer.lastTickPosZ) * (double)partialTicks;
} }
} }