PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-01 19:46:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed various rendering issue with spheres

Browse source
This commit is contained in:
Sollace 2019-02-16 21:29:51 +02:00
parent 34c924d758
commit bbcfba31b7
4 changed files with 28 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/com/minelittlepony/unicopia/model/ModelSphere.java
View file

@ -1,5 +1,6 @@
package com.minelittlepony.unicopia.model; package com.minelittlepony.unicopia.model;
import org.lwjgl.opengl.GL11;
import org.lwjgl.util.glu.GLU; import org.lwjgl.util.glu.GLU;
import org.lwjgl.util.glu.Sphere; import org.lwjgl.util.glu.Sphere;
@ -61,16 +62,10 @@ public class ModelSphere {
private void bake() { private void bake() {
displayList = GLAllocation.generateDisplayLists(1); displayList = GLAllocation.generateDisplayLists(1);
GlStateManager.glNewList(displayList, 4864); GlStateManager.glNewList(displayList, GL11.GL_COMPILE);
GlStateManager.disableTexture2D();
GlStateManager.enableAlpha();
drawShape(); drawShape();
GlStateManager.disableAlpha();
GlStateManager.enableTexture2D();
GlStateManager.glEndList(); GlStateManager.glEndList();
} }

34
src/main/java/com/minelittlepony/unicopia/particle/client/ParticleSphere.java
View file

@ -1,5 +1,6 @@
package com.minelittlepony.unicopia.particle.client; package com.minelittlepony.unicopia.particle.client;
import net.minecraft.client.Minecraft;
import net.minecraft.client.particle.Particle; import net.minecraft.client.particle.Particle;
import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
@ -7,7 +8,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.world.World; import net.minecraft.world.World;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import com.minelittlepony.unicopia.model.ModelSphere; import com.minelittlepony.unicopia.model.ModelSphere;
import com.minelittlepony.unicopia.particle.IAttachableParticle; import com.minelittlepony.unicopia.particle.IAttachableParticle;
import com.minelittlepony.unicopia.spell.ICaster; import com.minelittlepony.unicopia.spell.ICaster;
@ -25,7 +25,7 @@ public class ParticleSphere extends Particle implements IAttachableParticle {
private static final ModelSphere model = new ModelSphere(); private static final ModelSphere model = new ModelSphere();
public ParticleSphere(int id, World w, double x, double y, double z, double vX, double vY, double vZ, int... args) { public ParticleSphere(int id, World w, double x, double y, double z, double vX, double vY, double vZ, int... args) {
this(w, x, y, z, args[0] / 1000F, args[1], args[2]/255F); this(w, x, y, z, args[0] / 1000F, args[1], args[2]/100F);
this.motionX = vX; this.motionX = vX;
this.motionY = vY; this.motionY = vY;
@ -78,24 +78,28 @@ public class ParticleSphere extends Particle implements IAttachableParticle {
return; return;
} }
GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); GlStateManager.depthMask(false);
GlStateManager.shadeModel(GL11.GL_SMOOTH);
if (alpha < 1) { GlStateManager.enableBlend();
GlStateManager.depthMask(false); Minecraft.getMinecraft().entityRenderer.disableLightmap();
GlStateManager.shadeModel(GL11.GL_SMOOTH); GlStateManager.enableLighting();
GlStateManager.tryBlendFuncSeparate(
GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA,
GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
}
Color.glColor(tint, alpha); Color.glColor(tint, alpha);
GlStateManager.blendFunc(GlStateManager.SourceFactor.SRC_COLOR, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
GlStateManager.disableTexture2D();
model.setPosition(posX, posY, posZ); model.setPosition(posX, posY, posZ);
model.render(radius); model.render(radius);
GlStateManager.color(1, 1, 1, 1); GlStateManager.enableTexture2D();
GlStateManager.disableLighting();
Minecraft.getMinecraft().entityRenderer.enableLightmap();
GL11.glPopAttrib(); GlStateManager.disableBlend();
GlStateManager.depthMask(true);
GlStateManager.color(1, 1, 1, 1);
} }
@Override @Override
@ -103,6 +107,12 @@ public class ParticleSphere extends Particle implements IAttachableParticle {
if (key == 0) { if (key == 0) {
radius = (float)value; radius = (float)value;
} }
if (key == 1) {
tint = (int)value;
}
if (key == 3) {
alpha = (float)value;
}
} }
} }

6
src/main/java/com/minelittlepony/unicopia/spell/SpellDarkness.java
View file

@ -173,9 +173,9 @@ public class SpellDarkness extends AbstractAttachableSpell {
public void render(ICaster<?> source) { public void render(ICaster<?> source) {
int radius = 7 + (source.getCurrentLevel() * 3); int radius = 7 + (source.getCurrentLevel() * 3);
boolean tamed = hasTarget(); boolean tamed = !searching;
int tint = tamed ? 0xFFFFFF : getTint(); int tint = tamed ? 0xFFFFFF : 0x000000;
if (tamed) { if (tamed) {
radius /= 3; radius /= 3;
@ -231,7 +231,7 @@ public class SpellDarkness extends AbstractAttachableSpell {
double vX = (source.getWorld().rand.nextFloat() - 0.5) * particleSpeed; double vX = (source.getWorld().rand.nextFloat() - 0.5) * particleSpeed;
double vZ = (source.getWorld().rand.nextFloat() - 0.5) * particleSpeed; double vZ = (source.getWorld().rand.nextFloat() - 0.5) * particleSpeed;
Particles.instance().spawnParticle(UParticles.SPHERE, false, pos, vX, 0, vZ, (int)(size * 1000), tint, 100); Particles.instance().spawnParticle(UParticles.SPHERE, false, pos, vX, 0, vZ, (int)(size * 1000), tint, 30);
} }
} }

2
src/main/java/com/minelittlepony/unicopia/spell/SpellShield.java
View file

@ -44,7 +44,7 @@ public class SpellShield extends AbstractSpell.RangedAreaSpell {
}); });
particlEffect particlEffect
.ifMissing(source, () -> Particles.instance().spawnParticle(UParticles.SPHERE, true, source.getOriginVector(), 0, 0, 0, 1, getTint(), 30)) .ifMissing(source, () -> Particles.instance().spawnParticle(UParticles.SPHERE, true, source.getOriginVector(), 0, 0, 0, 1, getTint(), 10))
.ifPresent(p -> p.setAttribute(0, radius)); .ifPresent(p -> p.setAttribute(0, radius));
} }