Mirrors/WarsmashModEngine
1
0
Fork 0
mirror of https://github.com/Retera/WarsmashModEngine.git synced 2022-07-31 17:38:59 +02:00
Code Issues Projects Releases Wiki Activity

Fix head and tail particles to emit a particle with both a head and tail

Browse Source
This commit is contained in:
Retera 2022-06-08 02:11:34 -04:00
parent 0a6fdba9da
commit 602fa3cd2a
3 changed files with 51 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
core/src/com/etheller/warsmash/viewer5/handlers/mdx/GeometryEmitterFuncs.java
View File

@ -18,6 +18,7 @@ import com.etheller.warsmash.viewer5.gl.ClientBuffer;
import com.etheller.warsmash.viewer5.gl.DataTexture;
import com.etheller.warsmash.viewer5.handlers.EmitterObject;
import com.etheller.warsmash.viewer5.handlers.w3x.W3xSceneLightManager;
import com.hiveworkshop.rms.parsers.mdlx.MdlxParticleEmitter2.HeadOrTail;
//The total storage that emitted objects can use.
//This is enough to support all of the MDX geometry emitters.
@ -86,14 +87,17 @@ public class GeometryEmitterFuncs {
for (int objectIndex = 0; objectIndex < emitter.alive; objectIndex++) {
final Particle2 object = objects.get(objectIndex);
final int byteOffset = offset * BYTES_PER_OBJECT;
final int floatOffset = offset * FLOATS_PER_OBJECT;
final int p0Offset = floatOffset + FLOAT_OFFSET_P0;
Vector3 location = object.location;
final Vector3 scale = object.scale;
final int tail = object.tail;
final HeadOrTail tailness = HeadOrTail.fromId(object.tail);
final boolean tail = tailness.isIncludesTail();
final boolean head = tailness.isIncludesHead();
if (head) {
final int byteOffset = offset * BYTES_PER_OBJECT;
final int floatOffset = offset * FLOATS_PER_OBJECT;
final int p0Offset = floatOffset + FLOAT_OFFSET_P0;
Vector3 location = object.location;
final Vector3 scale = object.scale;
if (tail == HEAD) {
// If this is a model space emitter, the location is in local space, so convert
// it to world space.
if (modelSpace != 0) {
@ -113,8 +117,25 @@ public class GeometryEmitterFuncs {
floatView.put(p0Offset + 3, 0);
floatView.put(p0Offset + 4, 0);
}
floatView.put(p0Offset + 6, scale.x);
floatView.put(p0Offset + 7, scale.y);
floatView.put(p0Offset + 8, scale.z);
floatView.put(floatOffset + FLOAT_OFFSET_HEALTH, object.health);
byteView.put(byteOffset + BYTE_OFFSET_TAIL, (byte) 0);
byteView.put(byteOffset + BYTE_OFFSET_TEAM_COLOR, (byte) 0);
offset += 1;
}
else {
if (tail) {
final int byteOffset = offset * BYTES_PER_OBJECT;
final int floatOffset = offset * FLOATS_PER_OBJECT;
final int p0Offset = floatOffset + FLOAT_OFFSET_P0;
final Vector3 location = object.location;
final Vector3 scale = object.scale;
final Vector3 velocity = object.velocity;
final Vector3 start = startHeap;
Vector3 end = location;
@ -136,18 +157,19 @@ public class GeometryEmitterFuncs {
floatView.put(p0Offset + 3, end.x);
floatView.put(p0Offset + 4, end.y);
floatView.put(p0Offset + 5, end.z);
floatView.put(p0Offset + 6, scale.x);
floatView.put(p0Offset + 7, scale.y);
floatView.put(p0Offset + 8, scale.z);
floatView.put(floatOffset + FLOAT_OFFSET_HEALTH, object.health);
byteView.put(byteOffset + BYTE_OFFSET_TAIL, (byte) 1);
byteView.put(byteOffset + BYTE_OFFSET_TEAM_COLOR, (byte) 0);
offset += 1;
}
floatView.put(p0Offset + 6, scale.x);
floatView.put(p0Offset + 7, scale.y);
floatView.put(p0Offset + 8, scale.z);
floatView.put(floatOffset + FLOAT_OFFSET_HEALTH, object.health);
byteView.put(byteOffset + BYTE_OFFSET_TAIL, (byte) tail);
byteView.put(byteOffset + BYTE_OFFSET_TEAM_COLOR, (byte) 0);
offset += 1;
}
}
@ -214,7 +236,7 @@ public class GeometryEmitterFuncs {
shader.setUniform3fv("u_scaling", emitterObject.scaling, 0, 3);
if (emitterObject.head) {
if (emitterObject.headOrTail.isIncludesHead()) {
shader.setUniform3fv("u_vertices[0]", asFloatArray(vectors[0]), 0, 3);
shader.setUniform3fv("u_vertices[1]", asFloatArray(vectors[1]), 0, 3);
shader.setUniform3fv("u_vertices[2]", asFloatArray(vectors[2]), 0, 3);
@ -399,7 +421,13 @@ public class GeometryEmitterFuncs {
final EmitterObject emitterObject = emitter.emitterObject;
final int emitterType = emitterObject.getGeometryEmitterType();
if (emitterType == EMITTER_RIBBON) {
if (emitterType == EMITTER_PARTICLE2) {
final ParticleEmitter2Object emitterObject2 = ((ParticleEmitter2) emitter).emitterObject;
if (emitterObject2.headOrTail.isIncludesHead() && emitterObject2.headOrTail.isIncludesTail()) {
alive *= 2;
}
}
else if (emitterType == EMITTER_RIBBON) {
alive -= 1;
}
else if (emitterType == EMITTER_SPN) {

9
core/src/com/etheller/warsmash/viewer5/handlers/mdx/ParticleEmitter2.java
View File

@ -39,14 +39,7 @@ public class ParticleEmitter2 extends MdxEmitter<MdxComplexInstance, ParticleEmi
@Override
protected void emit() {
if (this.emitterObject.head) {
this.emitObject(0);
}
if (this.emitterObject.tail) {
this.emitObject(1);
}
emitObject(this.emitterObject.headOrTail.ordinal());
}
@Override

6
core/src/com/etheller/warsmash/viewer5/handlers/mdx/ParticleEmitter2Object.java
View File

@ -24,8 +24,7 @@ public class ParticleEmitter2Object extends GenericObject implements EmitterObje
public int teamColored = 0;
public Texture internalTexture;
public long replaceableId;
public boolean head;
public boolean tail;
public HeadOrTail headOrTail;
public float cellWidth;
public float cellHeight;
public float[][] colors;
@ -72,8 +71,7 @@ public class ParticleEmitter2Object extends GenericObject implements EmitterObje
final HeadOrTail headOrTail = emitter.getHeadOrTail();
this.head = headOrTail.isIncludesHead();
this.tail = headOrTail.isIncludesTail();
this.headOrTail = headOrTail;
this.cellWidth = 1f / emitter.getColumns();
this.cellHeight = 1f / emitter.getRows();