commit 2aeb75aaed1edc631c4e65f4b4fbe681aeecc007 Author: Leszek Koltunski Date: Wed Jun 3 21:25:21 2020 +0100 Update Myanmar flag. diff --git a/src/main/java/org/distorted/library/effect/Effect.java b/src/main/java/org/distorted/library/effect/Effect.java index 52376e7..f1e1642 100644 --- a/src/main/java/org/distorted/library/effect/Effect.java +++ b/src/main/java/org/distorted/library/effect/Effect.java @@ -48,8 +48,8 @@ public abstract class Effect private final static float[] mUnity= new float[MAX_UNITY_DIM*NUM_EFFECTS]; private final static int[] mUnityDim = new int[NUM_EFFECTS]; - int mAssociation; - int mComponent; + int mAndAssociation; + int mEquAssociation; static boolean[] mEnabled = new boolean[NUM_EFFECTS]; @@ -68,8 +68,8 @@ public abstract class Effect mCenterDim = name.getCenterDimension(); mRegionDim = name.getRegionDimension(); - mAssociation = 0xffffffff; - mComponent = 0; + mAndAssociation = 0xffffffff; + mEquAssociation = 0; int n = name.ordinal(); float[] u = name.getUnity(); @@ -142,9 +142,9 @@ public abstract class Effect * * @y.exclude */ - public int getAssociation() + public int getAndAssociation() { - return mAssociation; + return mAndAssociation; } /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -153,9 +153,9 @@ public abstract class Effect * * @y.exclude */ - public int getComponent() + public int getEquAssociation() { - return mComponent; + return mEquAssociation; } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/library/effect/VertexEffect.java b/src/main/java/org/distorted/library/effect/VertexEffect.java index c08a981..363c577 100644 --- a/src/main/java/org/distorted/library/effect/VertexEffect.java +++ b/src/main/java/org/distorted/library/effect/VertexEffect.java @@ -192,20 +192,20 @@ public abstract class VertexEffect extends Effect /** * Set Mesh association. * - * This creates an association between this Vertex Effect and a Component of a Mesh. - * One can set the association of an Effect and of a Component, and the Effect will only be active on - * vertices of Components such that + * This creates an association between a Component of a Mesh and this Vertex Effect. + * One can set two types of associations - an 'logical and' and a 'equal' associations and the Effect + * will only be active on vertices of Components such that * - * (effect assoc) & (component assoc) != 0 || (effect component) == (mesh component) + * (effect andAssoc) & (component andAssoc) != 0 || (effect equAssoc) == (mesh equAssoc) * * (see main_vertex_shader) * * The point: this way we can configure the system so that each Vertex Effect acts only on a certain * subset of a Mesh, thus potentially significantly reducing the number of render calls. */ - public void setMeshAssociation(int component, int association) + public void setMeshAssociation(int andAssociation, int equAssociation) { - mComponent = component; - mAssociation = association; + mAndAssociation = andAssociation; + mEquAssociation = equAssociation; } } \ No newline at end of file diff --git a/src/main/java/org/distorted/library/effectqueue/EffectQueue.java b/src/main/java/org/distorted/library/effectqueue/EffectQueue.java index 608fca6..2c5e4b7 100644 --- a/src/main/java/org/distorted/library/effectqueue/EffectQueue.java +++ b/src/main/java/org/distorted/library/effectqueue/EffectQueue.java @@ -51,8 +51,8 @@ public abstract class EffectQueue implements InternalMaster.Slave long[] mCurrentDuration; Effect[] mEffects; int[] mName; - int[] mAssociation; - int[] mComponent; + int[] mAndAssociation; + int[] mEquAssociation; long mTime; private static int[] mMax = new int[EffectType.LENGTH]; @@ -143,8 +143,8 @@ public abstract class EffectQueue implements InternalMaster.Slave mCurrentDuration = new long[max]; mEffects = new Effect[max]; mName = new int[max]; - mAssociation = new int[max]; - mComponent = new int[max]; + mAndAssociation = new int[max]; + mEquAssociation = new int[max]; } for(int i=0; i0 ) { - GLES30.glUniform1iv( mNameH[variant] , mNumEffects, mName , 0); - GLES30.glUniform1iv( mAssociationH[variant], mNumEffects, mAssociation, 0); - GLES30.glUniform1iv( mComponentH[variant] , mNumEffects, mComponent , 0); - GLES30.glUniform4fv( mUniformsH[variant] ,(NUM_UNIFORMS/4)*mNumEffects, mUniforms , 0); + GLES30.glUniform1iv( mNameH[variant] , mNumEffects, mName , 0); + GLES30.glUniform1iv( mAndAssociationH[variant], mNumEffects, mAndAssociation, 0); + GLES30.glUniform1iv( mEquAssociationH[variant], mNumEffects, mEquAssociation, 0); + GLES30.glUniform4fv( mUniformsH[variant] ,(NUM_UNIFORMS/4)*mNumEffects, mUniforms , 0); } } } diff --git a/src/main/java/org/distorted/library/mesh/MeshBase.java b/src/main/java/org/distorted/library/mesh/MeshBase.java index 3fd55a4..8e8c85f 100644 --- a/src/main/java/org/distorted/library/mesh/MeshBase.java +++ b/src/main/java/org/distorted/library/mesh/MeshBase.java @@ -80,11 +80,13 @@ public abstract class MeshBase private float[] mVertAttribs1; // packed: PosX,PosY,PosZ, NorX,NorY,NorZ, InfX,InfY,InfZ private float[] mVertAttribs2; // packed: TexS,TexT, Component private float mInflate; - private int[] mAssociation; + private int[] mEquAssociation; + private int[] mAndAssociation; DeferredJobs.JobNode[] mJobNode; - private static int[] mComponentAssociationH = new int[EffectQueue.MAIN_VARIANTS]; + private static int[] mEquAssociationH = new int[EffectQueue.MAIN_VARIANTS]; + private static int[] mAndAssociationH = new int[EffectQueue.MAIN_VARIANTS]; private static class Component { @@ -122,11 +124,16 @@ public abstract class MeshBase mShowNormals= false; mInflate = 0.0f; mComponent = new ArrayList<>(); - mAssociation= new int[MAX_COMPONENTS]; + mEquAssociation= new int[MAX_COMPONENTS]; + mAndAssociation= new int[MAX_COMPONENTS]; mJobNode = new DeferredJobs.JobNode[1]; - for(int i=0; i=0 && component