Skip to content

Optimize loops #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SCratORS merged 2 commits into from
Feb 4, 2024
Merged

Optimize loops #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e28cb5
Optimize loops
Doctoror Feb 4, 2024
58fe355
Reuse transform matrix to avoid allocations
Doctoror Feb 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions java/com/scrat/everchanging/Background.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,13 @@ public void createObject(int season) {
int textureIndex = textureManager.getTextureIndex(textureList[0][season]);
TextureManager.Texture texture = textureManager.getTexture(textureIndex);

if (objects.size()>0) for (Object object : objects) object.setTexture(texture, scale);
if (!objects.isEmpty()) {
final int objectsSize = objects.size();
for (int i = 0; i < objectsSize; i++) {
objects.get(i).setTexture(texture, scale);
}
}

else {
Object object = new Object(texture, scale);
object.setObjectScale(1.0f);
Expand All @@ -53,6 +59,10 @@ public void createObject(int season) {
public void update(int season, int timesOfDay) {
int s = season == 5 ? 4:season;
if (currentSeason != s) createObject(s);
for (Object object : objects) object.setColorTransform(colorTransformValues[season][timesOfDay]);

final int objectsSize = objects.size();
for (int i = 0; i < objectsSize; i++) {
objects.get(i).setColorTransform(colorTransformValues[season][timesOfDay]);
}
}
}
10 changes: 8 additions & 2 deletions java/com/scrat/everchanging/Bat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,9 @@ public void update(boolean createObject) {
frameCounter = (frameCounter+1) % maxFrames;
if (createObject && (frameCounter==2)) createObject();

for (Object object : objects) {
final int objectsSize = objects.size();
for (int i = 0; i < objectsSize; i++) {
final Object object = objects.get(i);
if (object.frameCounter < matrixTransform.length) {
object.resetMatrix();
object.setTexture(textureManager.getTexture(textureManager.getTextureIndex(textureList[0][spriteTable[object.animCounter]])), 1.0f);
Expand All @@ -176,7 +178,11 @@ public void update(boolean createObject) {
else removeObjects.add(object);
}
}
for (Object object : removeObjects) objects.remove(object);

final int removeObjectsSize = removeObjects.size();
for (int i = 0; i < removeObjectsSize; i++) {
objects.remove(removeObjects.get(i));
}
removeObjects.clear();
}

Expand Down
10 changes: 8 additions & 2 deletions java/com/scrat/everchanging/Blick.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,14 +987,20 @@ void objectAnimate(Object object) {

public void update(boolean createObject) {
if (createObject) createObject();
for (Object object : objects) {
final int objectsSize = objects.size();
for (int i = 0; i < objectsSize; i++) {
final Object object = objects.get(i);
object.resetMatrix();
objectAnimate(object);
object.setTransform(matrixTransform[spriteIndex[object.index]][object.frameCounter]);
object.frameCounter = (object.frameCounter+1) % matrixTransform[spriteIndex[object.index]].length;
if (!createObject && (object.frameCounter == 0)) removeObjects.add(object);
}
for (Object object : removeObjects) objects.remove(object);

final int removeObjectsSize = removeObjects.size();
for (int i = 0; i < removeObjectsSize; i++) {
objects.remove(removeObjects.get(i));
}
removeObjects.clear();
}
}
10 changes: 8 additions & 2 deletions java/com/scrat/everchanging/ButterFlie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1061,7 +1061,9 @@ public void update(boolean createObject) {

if (frameCounter == 2) if (createObject) createObject();

for (Object object : objects) {
final int objectsSize = objects.size();
for (int i = 0; i < objectsSize; i++) {
final Object object = objects.get(i);
if (object.frameCounter < matrixTransform[object.index].length) {
object.resetMatrix();
object.setTexture(textureManager.getTexture(textureManager.getTextureIndex(textureList[0][object.animCounter++ % textureList[0].length])), 1.0f);
Expand All @@ -1070,7 +1072,11 @@ public void update(boolean createObject) {
object.frameCounter++;
} else removeObjects.add(object);
}
for (Object object : removeObjects) objects.remove(object);

final int removeObjectsSize = removeObjects.size();
for (int i = 0; i < removeObjectsSize; i++) {
objects.remove(removeObjects.get(i));
}
removeObjects.clear();
}

Expand Down
10 changes: 8 additions & 2 deletions java/com/scrat/everchanging/Crystal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ public void createObject(float[] transform, float[] translate) {
public void update(boolean createObject) {
frameCounter = (frameCounter+1) % maxFrames;
if (createObject && (frameCounter == 1)) createObject();
for (Object object : objects) {
final int objectsSize = objects.size();
for (int i = 0; i < objectsSize; i++) {
final Object object = objects.get(i);
if (object.frameCounter < matrixTransform.length) {
object.resetMatrix();
object.setColorTransform(colorTransform[object.frameCounter]);
Expand All @@ -130,7 +132,11 @@ public void update(boolean createObject) {
removeObjects.add(object);
}
}
for (Object object : removeObjects) objects.remove(object);

final int removeObjectsSize = removeObjects.size();
for (int i = 0; i < removeObjectsSize; i++) {
objects.remove(removeObjects.get(i));
}
removeObjects.clear();
}
}
10 changes: 8 additions & 2 deletions java/com/scrat/everchanging/Dandelion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,9 @@ public void update(boolean createObject) {
init = createObject;
if (createObject && frameCounter==2) createObject();

for (Object object : objects) {
final int objectsSize = objects.size();
for (int i = 0; i < objectsSize; i++) {
final Object object = objects.get(i);
object.resetMatrix();
object.setTexture(textureManager.getTexture(textureManager.getTextureIndex(textureList[0][object.animCounter])), 1.0f);
object.setTransform(animationStartPosition);
Expand All @@ -288,7 +290,11 @@ public void update(boolean createObject) {
object.animCounter = (object.animCounter+1) % textureList[0].length;
if (!createObject && (object.frameCounter == 0)) removeObjects.add(object);
}
for (Object object : removeObjects) objects.remove(object);

final int removeObjectsSize = removeObjects.size();
for (int i = 0; i < removeObjectsSize; i++) {
objects.remove(removeObjects.get(i));
}
removeObjects.clear();
}
}
12 changes: 9 additions & 3 deletions java/com/scrat/everchanging/EverchangingRender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,9 @@ public void onSurfaceChanged(GL10 gl, int width, int height) {
GLES20.glViewport(0, 0, width, height);
float scaleImageHeight = surfaceHeight / 320f;
//todo setup position
for (Scene scene : scenes) {
final int scenesSize = scenes.size();
for (int i = 0; i < scenesSize; i++) {
final Scene scene = scenes.get(i);
switch (scene.sceneType) {
case BG: ((BackgroundScene) scene).setupPosition(surfaceWidth, surfaceHeight, scaleImageHeight, displayRotation); break; /*complete 100% 640/480+ */
case CB: ((CrystalBlickScene) scene).setupPosition(surfaceWidth, surfaceHeight, scaleImageHeight, displayRotation); break; /*complete 100% 640/480+ */
Expand Down Expand Up @@ -197,7 +199,9 @@ private Scene.ShortTypes getAnim() {
void update() {
// todo update
Scene.ShortTypes currentScene = getAnim();
for (Scene scene : scenes) {
final int scenesSize = scenes.size();
for (int i = 0; i < scenesSize; i++) {
final Scene scene = scenes.get(i);
boolean createObject = scene.sceneType == currentScene;
switch (scene.sceneType) {
case BG: ((BackgroundScene) scene).update(); break;
Expand All @@ -222,7 +226,9 @@ void update() {
void render(){
GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
//todo draw
for (Scene scene : scenes) {
final int scenesSize = scenes.size();
for (int i = 0; i < scenesSize; i++) {
final Scene scene = scenes.get(i);
switch (scene.sceneType) {
case BG: ((BackgroundScene) scene).render(); break;
case E: ((EyesScene) scene).render(); break;
Expand Down
10 changes: 8 additions & 2 deletions java/com/scrat/everchanging/Eye.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ public void update(boolean createObject) {
init = createObject;
if (frameCounter == 2) if (createObject) createObject();

for (Object object : objects) {
final int objectsSize = objects.size();
for (int i = 0; i < objectsSize; i++) {
final Object object = objects.get(i);
if (object.animCounter == 0) {
object.frameCounter++;
if (object.frameCounter < Frames.length) {
Expand All @@ -87,7 +89,11 @@ public void update(boolean createObject) {
}
object.animCounter--;
}
for (Object object : removeObjects) objects.remove(object);

final int removeObjectsSize = removeObjects.size();
for (int i = 0; i < removeObjectsSize; i++) {
objects.remove(removeObjects.get(i));
}
removeObjects.clear();
}
}
22 changes: 16 additions & 6 deletions java/com/scrat/everchanging/Fairy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,13 +290,19 @@ private void createObject(int index) {
}

private void updateCreator() {
for (Creator creator : creatorObjects) {
final int objectsSize = creatorObjects.size();
for (int i = 0; i < objectsSize; i++) {
final Creator creator = creatorObjects.get(i);
if (creator.frame == 0) createObject(creator.animIndex);
if (creator.maxFrame == 0) removeCreatorObjects.add(creator);
creator.frame --;
creator.maxFrame --;
}
for (Creator creator : removeCreatorObjects) creatorObjects.remove(creator);

final int removeCreatorObjectsSize = removeCreatorObjects.size();
for (int i = 0; i < removeCreatorObjectsSize; i++) {
creatorObjects.remove(removeCreatorObjects.get(i));
}
removeCreatorObjects.clear();
}

Expand All @@ -308,7 +314,9 @@ public void update(boolean createObject) {

updateCreator();

for (Object object : objects) {
final int objectsSize = objects.size();
for (int i = 0; i < objectsSize; i++) {
final Object object = objects.get(i);
if (object.frameCounter < matrixTransform[object.index].length) {
object.resetMatrix();
object.setTransform(matrixTransform[object.index][object.frameCounter][object.animCounter]);
Expand All @@ -324,10 +332,12 @@ public void update(boolean createObject) {
object.frameCounter++;
} else removeObjects.add(object);
}
for (Object object : removeObjects) objects.remove(object);
removeObjects.clear();


final int removeObjectsSize = removeObjects.size();
for (int i = 0; i < removeObjectsSize; i++) {
objects.remove(removeObjects.get(i));
}
removeObjects.clear();
}

private static class Creator {
Expand Down
10 changes: 8 additions & 2 deletions java/com/scrat/everchanging/FireFlie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,9 @@ public void update(boolean createObject) {
init = createObject;
if (createObject && frameCounter==2) createObject();

for (Object object : objects) {
final int objectsSize = objects.size();
for (int i = 0; i < objectsSize; i++) {
final Object object = objects.get(i);
if (object.frameCounter < matrixTransform.length) {
object.resetMatrix();
object.setColorTransform(colorTransform[object.frameCounter]);
Expand All @@ -221,7 +223,11 @@ public void update(boolean createObject) {
else removeObjects.add(object);
}
}
for (Object object : removeObjects) objects.remove(object);

final int removeObjectsSize = removeObjects.size();
for (int i = 0; i < removeObjectsSize; i++) {
objects.remove(removeObjects.get(i));
}
removeObjects.clear();
}
}
10 changes: 8 additions & 2 deletions java/com/scrat/everchanging/FireWork.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ public void update(boolean createObject) {

if ((createObject) && (frameCounter==2) && (random.nextInt(3) == 0)) createObject();

for (Object object : objects) {
final int objectsSize = objects.size();
for (int i = 0; i < objectsSize; i++) {
final Object object = objects.get(i);
if (object.frameCounter < spriteTable.length) {
object.resetMatrix();
object.setTexture(textureManager.getTexture(textureManager.getTextureIndex(textureList[0][spriteTable[object.frameCounter]])), 1.0f);
Expand All @@ -102,7 +104,11 @@ public void update(boolean createObject) {
else removeObjects.add(object);
}
}
for (Object object : removeObjects) objects.remove(object);

final int removeObjectsSize = removeObjects.size();
for (int i = 0; i < removeObjectsSize; i++) {
objects.remove(removeObjects.get(i));
}
removeObjects.clear();
}
}
10 changes: 8 additions & 2 deletions java/com/scrat/everchanging/Fly.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,9 @@ public void createObject(float[] transform, float[] translate, int xscale, int i
objects.add(object);
}
public void update() {
for (Object object : objects) {
final int objectsSize = objects.size();
for (int i = 0; i < objectsSize; i++) {
final Object object = objects.get(i);
if (object.frameCounter < matrixTransform[object.index].length) {
creatorCallback.callingCrystallCreatorCallback(object.transformMatrix, object.ViewTranslate);
TextureManager.Texture texture = textureManager.getTexture(textureManager.getTextureIndex(textureList[0][object.animCounter]));
Expand All @@ -141,7 +143,11 @@ public void update() {
removeObjects.add(object);
}
}
for (Object object : removeObjects) objects.remove(object);

final int removeObjectsSize = removeObjects.size();
for (int i = 0; i < removeObjectsSize; i++) {
objects.remove(removeObjects.get(i));
}
removeObjects.clear();
}

Expand Down
16 changes: 12 additions & 4 deletions java/com/scrat/everchanging/Foreground.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,17 @@ public void update(int foregroundIndex, int timesOfDay) {
resetMatrix();
createObjects();
}
for (Object object : objects) object.setColorTransform(colorTransformValues[current][timesOfDay]);

final int objectsSize = objects.size();
for (int i = 0; i < objectsSize; i++) {
objects.get(i).setColorTransform(colorTransformValues[current][timesOfDay]);
}
}

private void createObjects() {
for (String texture : textureList[current]) {
int textureIndex = textureManager.getTextureIndex(texture);
final int textureListCurrentLength = textureList[current].length;
for (int i = 0; i < textureListCurrentLength; i++) {
int textureIndex = textureManager.getTextureIndex(textureList[current][i]);
Object object = new Object(textureManager.getTexture(textureIndex), scale);
object.resetViewMatrix();
object.setObjectScale(1.0f);
Expand All @@ -73,7 +78,10 @@ private void createObjects() {
private void setObjectsPosition() {
float deltaHeight = height;
int index = 0;
for (Object object: objects) {

final int objectsSize = objects.size();
for (int i = 0; i < objectsSize; i++) {
final Object object = objects.get(i);
float spriteWidth = object.texture.width * scale;
float spriteHeight = object.texture.height * scale;
float y = deltaHeight - spriteHeight + offsetValues[current][index][0];
Expand Down
13 changes: 8 additions & 5 deletions java/com/scrat/everchanging/Leave.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,9 @@ public void update(boolean createObject) {
if (!init && createObject) numClips = get0703()?maxObjects:(minObjects + random.nextInt(maxObjects - 4));
init = createObject;
if (createObject && (frameCounter == 2)) createObject();
for (Object object : objects) {
final int objectsSize = objects.size();
for (int i = 0; i < objectsSize; i++) {
final Object object = objects.get(i);
object.resetMatrix();

if (object.remove) {
Expand All @@ -457,10 +459,11 @@ public void update(boolean createObject) {
else removeObjects.add(object);
}
}
for (Object object : removeObjects) objects.remove(object);
removeObjects.clear();


final int removeObjectsSize = removeObjects.size();
for (int i = 0; i < removeObjectsSize; i++) {
objects.remove(removeObjects.get(i));
}
removeObjects.clear();
}

}
Loading