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

Fix some particle weirdness (somehow the interp pos is wrong by the time it gets to fx layer 3)

Browse Source
This commit is contained in:
Electroblob77
2020-06-18 17:42:16 +01:00
parent 3bc2ff2853
commit 7afcdce21e
4 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/client/particle/ParticleBuff.java
+6
View File
@@ -60,6 +60,12 @@ public class ParticleBuff extends ParticleWizardry {
// 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(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
+6
View File
@@ -43,6 +43,12 @@ public class ParticleSphere extends ParticleWizardry {
// 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(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);
float z = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)partialTicks); float z = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)partialTicks);
src/main/java/electroblob/wizardry/client/particle/ParticleSummon.java
+6
View File
@@ -53,6 +53,12 @@ public class ParticleSummon extends ParticleWizardry {
// 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(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/ParticleTargeted.java
+6
View File
@@ -78,6 +78,12 @@ public abstract class ParticleTargeted extends ParticleWizardry {
// 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(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);
float z = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)partialTicks); float z = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)partialTicks);