From 629bc35abe3f5e416cd72a5ab8b7383629baa9a2 Mon Sep 17 00:00:00 2001 From: 106- Date: Wed, 4 Jun 2025 08:54:40 +0900 Subject: [PATCH] `Graveyard` -> `Garland`, `SinkerService` -> `AThingLeftBehindService` --- app/src/main/AndroidManifest.xml | 2 +- .../config/BlendModeManager.java | 2 +- .../config/RenderConfig.java | 4 +-- .../rendering/filters/BaseFilter.java | 14 ++++---- .../rendering/filters/ConfigurableFilter.java | 6 ++-- .../rendering/filters/LeftFilter.java | 14 ++++---- .../rendering/filters/RightFilter.java | 14 ++++---- ...dGraveyard.java => BackgroundGarland.java} | 20 ++++++------ ...enterGraveyard.java => CenterGarland.java} | 26 +++++++-------- .../objects/{Graveyard.java => Garland.java} | 20 ++++++------ ...ingGraveyard.java => RotatingGarland.java} | 32 +++++++++---------- ...vice.java => AThingLeftBehindService.java} | 24 +++++++------- 12 files changed, 89 insertions(+), 89 deletions(-) rename app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/{BackgroundGraveyard.java => BackgroundGarland.java} (74%) rename app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/{CenterGraveyard.java => CenterGarland.java} (72%) rename app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/{Graveyard.java => Garland.java} (80%) rename app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/{RotatingGraveyard.java => RotatingGarland.java} (77%) rename app/src/main/java/net/t106/sinkerglwallpaper/rendering/services/{SinkerService.java => AThingLeftBehindService.java} (87%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a533813..47a1267 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,7 +11,7 @@ android:label="@string/app_name" android:theme="@style/AppTheme" > diff --git a/app/src/main/java/net/t106/sinkerglwallpaper/config/BlendModeManager.java b/app/src/main/java/net/t106/sinkerglwallpaper/config/BlendModeManager.java index 5bcadf9..410e5ec 100644 --- a/app/src/main/java/net/t106/sinkerglwallpaper/config/BlendModeManager.java +++ b/app/src/main/java/net/t106/sinkerglwallpaper/config/BlendModeManager.java @@ -8,7 +8,7 @@ */ public class BlendModeManager { - // Blend mode constants matching SinkerService.blend_type + // Blend mode constants matching AThingLeftBehindService.blend_type public static final int BLEND_ADDITIVE = 0; public static final int BLEND_MULTIPLICATIVE = 1; public static final int BLEND_ALPHA = 2; diff --git a/app/src/main/java/net/t106/sinkerglwallpaper/config/RenderConfig.java b/app/src/main/java/net/t106/sinkerglwallpaper/config/RenderConfig.java index 5a01fba..4ad46d1 100644 --- a/app/src/main/java/net/t106/sinkerglwallpaper/config/RenderConfig.java +++ b/app/src/main/java/net/t106/sinkerglwallpaper/config/RenderConfig.java @@ -165,12 +165,12 @@ public CompleteConfig(RotationConfig rotation, ColorConfig color, } // Predefined complete configurations - public static final CompleteConfig CENTER_GRAVEYARD = new CompleteConfig( + public static final CompleteConfig CENTER_GARLAND = new CompleteConfig( RotationConfig.CENTER, ColorConfig.WHITE, TextureConfig.TEXTURE_0, GeometryConfig.STANDARD_QUAD, BlendModeManager.BLEND_ADDITIVE ); - public static final CompleteConfig BACKGROUND_GRAVEYARD = new CompleteConfig( + public static final CompleteConfig BACKGROUND_GARLAND = new CompleteConfig( RotationConfig.BACKGROUND, ColorConfig.REDDISH_BROWN, TextureConfig.TEXTURE_1, GeometryConfig.LARGE_QUAD, BlendModeManager.BLEND_ADDITIVE ); diff --git a/app/src/main/java/net/t106/sinkerglwallpaper/rendering/filters/BaseFilter.java b/app/src/main/java/net/t106/sinkerglwallpaper/rendering/filters/BaseFilter.java index f32117b..a86d424 100644 --- a/app/src/main/java/net/t106/sinkerglwallpaper/rendering/filters/BaseFilter.java +++ b/app/src/main/java/net/t106/sinkerglwallpaper/rendering/filters/BaseFilter.java @@ -6,14 +6,14 @@ import net.t106.sinkerglwallpaper.opengl.utils.ShaderUtils; import net.t106.sinkerglwallpaper.opengl.utils.BufferUtils; import net.t106.sinkerglwallpaper.opengl.shaders.ShaderLoader; -import net.t106.sinkerglwallpaper.rendering.services.SinkerService; -import net.t106.sinkerglwallpaper.rendering.objects.Graveyard; +import net.t106.sinkerglwallpaper.rendering.services.AThingLeftBehindService; +import net.t106.sinkerglwallpaper.rendering.objects.Garland; /** * Base class for all filter objects * Eliminates code duplication between LeftFilter and RightFilter */ -public abstract class BaseFilter extends Graveyard { +public abstract class BaseFilter extends Garland { protected RenderConfig.ColorConfig colorConfig; protected RenderConfig.GeometryConfig geometryConfig; @@ -47,14 +47,14 @@ private void setupGeometry() { coords = geometryConfig.texCoords; // Keep legacy buffer creation for compatibility - ab = SinkerService.makeFloatBuffer(apex); - cb = SinkerService.makeFloatBuffer(coords); + ab = AThingLeftBehindService.makeFloatBuffer(apex); + cb = AThingLeftBehindService.makeFloatBuffer(coords); } @Override protected void createShaderProgram() { // Use basic shader program for filters (no texture needed typically) - shaderProgram = ShaderLoader.Programs.createBasicProgram(SinkerService.getContext()); + shaderProgram = ShaderLoader.Programs.createBasicProgram(AThingLeftBehindService.getContext()); } @Override @@ -111,7 +111,7 @@ public void sizechange(boolean smollflg) { apex = geometryConfig.vertices; // Update buffer - ab = SinkerService.makeFloatBuffer(apex); + ab = AThingLeftBehindService.makeFloatBuffer(apex); // Recreate VAO with new vertex data if (vao != 0) { diff --git a/app/src/main/java/net/t106/sinkerglwallpaper/rendering/filters/ConfigurableFilter.java b/app/src/main/java/net/t106/sinkerglwallpaper/rendering/filters/ConfigurableFilter.java index cb9d1b0..a12c875 100644 --- a/app/src/main/java/net/t106/sinkerglwallpaper/rendering/filters/ConfigurableFilter.java +++ b/app/src/main/java/net/t106/sinkerglwallpaper/rendering/filters/ConfigurableFilter.java @@ -2,7 +2,7 @@ import net.t106.sinkerglwallpaper.config.RenderConfig; import net.t106.sinkerglwallpaper.config.BlendModeManager; -import net.t106.sinkerglwallpaper.rendering.services.SinkerService; +import net.t106.sinkerglwallpaper.rendering.services.AThingLeftBehindService; /** * Configurable filter class - replaces LeftFilter.java @@ -38,10 +38,10 @@ public void Draw(float[] viewMatrix, float[] projectionMatrix) { */ private void updateFromUserSettings() { // Update color from user settings - colorConfig = RenderConfig.ColorConfig.fromUserSettings(SinkerService.col); + colorConfig = RenderConfig.ColorConfig.fromUserSettings(AThingLeftBehindService.col); // Update blend mode from user settings - blendMode = SinkerService.blend_type; + blendMode = AThingLeftBehindService.blend_type; } @Override diff --git a/app/src/main/java/net/t106/sinkerglwallpaper/rendering/filters/LeftFilter.java b/app/src/main/java/net/t106/sinkerglwallpaper/rendering/filters/LeftFilter.java index 5a63bcb..8e937aa 100644 --- a/app/src/main/java/net/t106/sinkerglwallpaper/rendering/filters/LeftFilter.java +++ b/app/src/main/java/net/t106/sinkerglwallpaper/rendering/filters/LeftFilter.java @@ -3,14 +3,14 @@ import net.t106.sinkerglwallpaper.opengl.utils.ShaderUtils; import net.t106.sinkerglwallpaper.opengl.utils.BufferUtils; import net.t106.sinkerglwallpaper.opengl.shaders.ShaderLoader; -import net.t106.sinkerglwallpaper.rendering.services.SinkerService; -import net.t106.sinkerglwallpaper.rendering.objects.Graveyard; +import net.t106.sinkerglwallpaper.rendering.services.AThingLeftBehindService; +import net.t106.sinkerglwallpaper.rendering.objects.Garland; /** * Left filter for OpenGL ES 3.2 * Renders a customizable colored overlay with user-selectable blend modes */ -public class LeftFilter extends Graveyard { +public class LeftFilter extends Garland { private boolean isSmallSize = false; @@ -23,14 +23,14 @@ public LeftFilter() coords = new float[] { 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f }; // Keep legacy buffer creation for compatibility - ab = SinkerService.makeFloatBuffer(apex); - cb = SinkerService.makeFloatBuffer(coords); + ab = AThingLeftBehindService.makeFloatBuffer(apex); + cb = AThingLeftBehindService.makeFloatBuffer(coords); } @Override protected void createShaderProgram() { // Use color shader program for color-only rendering - shaderProgram = ShaderLoader.Programs.createColorProgram(SinkerService.getContext()); + shaderProgram = ShaderLoader.Programs.createColorProgram(AThingLeftBehindService.getContext()); } @Override @@ -71,7 +71,7 @@ public void sizechange(boolean smollflg) } // Update buffer - ab = SinkerService.makeFloatBuffer(apex); + ab = AThingLeftBehindService.makeFloatBuffer(apex); // Recreate VAO with new vertex data if (vao != 0) { diff --git a/app/src/main/java/net/t106/sinkerglwallpaper/rendering/filters/RightFilter.java b/app/src/main/java/net/t106/sinkerglwallpaper/rendering/filters/RightFilter.java index 4d81c27..ca45408 100644 --- a/app/src/main/java/net/t106/sinkerglwallpaper/rendering/filters/RightFilter.java +++ b/app/src/main/java/net/t106/sinkerglwallpaper/rendering/filters/RightFilter.java @@ -3,14 +3,14 @@ import net.t106.sinkerglwallpaper.opengl.utils.ShaderUtils; import net.t106.sinkerglwallpaper.opengl.utils.BufferUtils; import net.t106.sinkerglwallpaper.opengl.shaders.ShaderLoader; -import net.t106.sinkerglwallpaper.rendering.services.SinkerService; -import net.t106.sinkerglwallpaper.rendering.objects.Graveyard; +import net.t106.sinkerglwallpaper.rendering.services.AThingLeftBehindService; +import net.t106.sinkerglwallpaper.rendering.objects.Garland; /** * Right side filter for OpenGL ES 3.2 * Renders a vertical colored strip on the right side with invert blend mode */ -public class RightFilter extends Graveyard { +public class RightFilter extends Garland { private boolean isSmallSize = false; @@ -29,14 +29,14 @@ public RightFilter() coords = new float[] { 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f }; // Keep legacy buffer creation for compatibility - ab = SinkerService.makeFloatBuffer(apex); - cb = SinkerService.makeFloatBuffer(coords); + ab = AThingLeftBehindService.makeFloatBuffer(apex); + cb = AThingLeftBehindService.makeFloatBuffer(coords); } @Override protected void createShaderProgram() { // Use color shader program for color-only rendering - shaderProgram = ShaderLoader.Programs.createColorProgram(SinkerService.getContext()); + shaderProgram = ShaderLoader.Programs.createColorProgram(AThingLeftBehindService.getContext()); } @Override @@ -83,7 +83,7 @@ public void sizechange(boolean smollflg) } // Update buffer - ab = SinkerService.makeFloatBuffer(apex); + ab = AThingLeftBehindService.makeFloatBuffer(apex); // Recreate VAO with new vertex data if (vao != 0) { diff --git a/app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/BackgroundGraveyard.java b/app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/BackgroundGarland.java similarity index 74% rename from app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/BackgroundGraveyard.java rename to app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/BackgroundGarland.java index f9f63a8..bb872ff 100644 --- a/app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/BackgroundGraveyard.java +++ b/app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/BackgroundGarland.java @@ -6,34 +6,34 @@ import net.t106.sinkerglwallpaper.opengl.utils.BufferUtils; import net.t106.sinkerglwallpaper.opengl.utils.TextureUtils; import net.t106.sinkerglwallpaper.opengl.shaders.ShaderLoader; -import net.t106.sinkerglwallpaper.rendering.services.SinkerService; +import net.t106.sinkerglwallpaper.rendering.services.AThingLeftBehindService; /** - * Background rotating graveyard object for OpenGL ES 3.2 - * Larger than CenterGraveyard and rotates in opposite direction with color tint + * Background rotating garland object for OpenGL ES 3.2 + * Larger than CenterGarland and rotates in opposite direction with color tint */ -public class BackgroundGraveyard extends Graveyard { +public class BackgroundGarland extends Garland { private float rotation = 0.0f; private static final float ROTATION_SPEED = 0.125f; // Positive rotation (opposite to center) private static final int MAX_COUNT = 2880; - public BackgroundGraveyard() + public BackgroundGarland() { super(); - // Larger quad vertices (1.5x scale compared to CenterGraveyard) + // Larger quad vertices (1.5x scale compared to CenterGarland) apex = new float[] { -1.5f, -1.5f, 1.5f, -1.5f, -1.5f, 1.5f, 1.5f, 1.5f, }; coords = new float[] {0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, }; // Keep legacy buffer creation for compatibility - ab = SinkerService.makeFloatBuffer(apex); - cb = SinkerService.makeFloatBuffer(coords); + ab = AThingLeftBehindService.makeFloatBuffer(apex); + cb = AThingLeftBehindService.makeFloatBuffer(coords); } @Override protected void createShaderProgram() { // Use blend shader program for additive blending with color tint - shaderProgram = ShaderLoader.Programs.createBlendProgram(SinkerService.getContext()); + shaderProgram = ShaderLoader.Programs.createBlendProgram(AThingLeftBehindService.getContext()); } @Override @@ -45,7 +45,7 @@ public void Draw(float[] viewMatrix, float[] projectionMatrix) { bindShader(); // Set texture (using flipped texture) - TextureUtils.bindTexture(0, SinkerService.textures[1]); + TextureUtils.bindTexture(0, AThingLeftBehindService.textures[1]); // Set blend mode to additive (0) ShaderUtils.setUniform1i(blendModeLocation, 0); diff --git a/app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/CenterGraveyard.java b/app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/CenterGarland.java similarity index 72% rename from app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/CenterGraveyard.java rename to app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/CenterGarland.java index b7d0a50..7fe4416 100644 --- a/app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/CenterGraveyard.java +++ b/app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/CenterGarland.java @@ -6,19 +6,19 @@ import net.t106.sinkerglwallpaper.opengl.utils.BufferUtils; import net.t106.sinkerglwallpaper.opengl.utils.TextureUtils; import net.t106.sinkerglwallpaper.opengl.shaders.ShaderLoader; -import net.t106.sinkerglwallpaper.rendering.services.SinkerService; +import net.t106.sinkerglwallpaper.rendering.services.AThingLeftBehindService; /** - * Center rotating graveyard object for OpenGL ES 3.2 + * Center rotating garland object for OpenGL ES 3.2 * Migrated from OpenGL ES 1.0 fixed pipeline */ -public class CenterGraveyard extends Graveyard { +public class CenterGarland extends Garland { private float rotation = 0.0f; private static final float ROTATION_SPEED = -0.125f; private static final int MAX_COUNT = 2881; - public CenterGraveyard() + public CenterGarland() { super(); // Define quad vertices (same as original) @@ -26,31 +26,31 @@ public CenterGraveyard() coords = new float[] {0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, }; // Keep legacy buffer creation for compatibility - ab = SinkerService.makeFloatBuffer(apex); - cb = SinkerService.makeFloatBuffer(coords); + ab = AThingLeftBehindService.makeFloatBuffer(apex); + cb = AThingLeftBehindService.makeFloatBuffer(coords); } @Override protected void createShaderProgram() { // Use blend shader program for additive blending - shaderProgram = ShaderLoader.Programs.createBlendProgram(SinkerService.getContext()); + shaderProgram = ShaderLoader.Programs.createBlendProgram(AThingLeftBehindService.getContext()); } @Override public void Draw(float[] viewMatrix, float[] projectionMatrix) { - // android.util.Log.d("CenterGraveyard", "Draw() called"); + // android.util.Log.d("CenterGarland", "Draw() called"); // Debug: Check if shader and texture are valid if (shaderProgram == 0) { - android.util.Log.e("CenterGraveyard", "Shader program is 0!"); + android.util.Log.e("CenterGarland", "Shader program is 0!"); return; } - if (SinkerService.textures[0] == 0) { - android.util.Log.e("CenterGraveyard", "Texture is 0!"); + if (AThingLeftBehindService.textures[0] == 0) { + android.util.Log.e("CenterGarland", "Texture is 0!"); return; } if (vao == 0) { - android.util.Log.e("CenterGraveyard", "VAO is 0!"); + android.util.Log.e("CenterGarland", "VAO is 0!"); return; } @@ -61,7 +61,7 @@ public void Draw(float[] viewMatrix, float[] projectionMatrix) { bindShader(); // Set texture - TextureUtils.bindTexture(0, SinkerService.textures[0]); + TextureUtils.bindTexture(0, AThingLeftBehindService.textures[0]); // Set blend mode to additive (0) for beautiful color effects ShaderUtils.setUniform1i(blendModeLocation, 0); diff --git a/app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/Graveyard.java b/app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/Garland.java similarity index 80% rename from app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/Graveyard.java rename to app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/Garland.java index e1b0036..3326766 100644 --- a/app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/Graveyard.java +++ b/app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/Garland.java @@ -6,13 +6,13 @@ import net.t106.sinkerglwallpaper.opengl.utils.ShaderUtils; import net.t106.sinkerglwallpaper.opengl.utils.BufferUtils; import net.t106.sinkerglwallpaper.opengl.shaders.ShaderLoader; -import net.t106.sinkerglwallpaper.rendering.services.SinkerService; +import net.t106.sinkerglwallpaper.rendering.services.AThingLeftBehindService; /** * Abstract base class for OpenGL ES 3.2 rendering objects * Migrated from OpenGL ES 1.0 fixed pipeline to modern programmable pipeline */ -public abstract class Graveyard { +public abstract class Garland { protected float apex[], coords[]; protected FloatBuffer ab, cb; protected int cnt; @@ -33,7 +33,7 @@ public abstract class Graveyard { protected float[] modelMatrix; protected float[] mvpMatrix; - public Graveyard() { + public Garland() { modelMatrix = MatrixUtils.identity(); mvpMatrix = new float[16]; } @@ -43,14 +43,14 @@ public Graveyard() { * Must be called after OpenGL context is created */ public void initGL() { - android.util.Log.d("Graveyard", getClass().getSimpleName() + " initGL() started"); + android.util.Log.d("Garland", getClass().getSimpleName() + " initGL() started"); // Create shader program createShaderProgram(); - android.util.Log.d("Graveyard", getClass().getSimpleName() + " shader program: " + shaderProgram); + android.util.Log.d("Garland", getClass().getSimpleName() + " shader program: " + shaderProgram); if (shaderProgram == 0) { - android.util.Log.e("Graveyard", getClass().getSimpleName() + " failed to create shader program!"); + android.util.Log.e("Garland", getClass().getSimpleName() + " failed to create shader program!"); return; } @@ -60,14 +60,14 @@ public void initGL() { colorLocation = ShaderUtils.getUniformLocation(shaderProgram, "u_color"); blendModeLocation = ShaderUtils.getUniformLocation(shaderProgram, "u_blendMode"); - android.util.Log.d("Graveyard", getClass().getSimpleName() + " uniform locations: mvp=" + mvpMatrixLocation + + android.util.Log.d("Garland", getClass().getSimpleName() + " uniform locations: mvp=" + mvpMatrixLocation + ", texture=" + textureLocation + ", color=" + colorLocation + ", blend=" + blendModeLocation); // Create VAO and VBOs createBuffers(); - android.util.Log.d("Graveyard", getClass().getSimpleName() + " VAO: " + vao); + android.util.Log.d("Garland", getClass().getSimpleName() + " VAO: " + vao); - android.util.Log.d("Graveyard", getClass().getSimpleName() + " initGL() completed"); + android.util.Log.d("Garland", getClass().getSimpleName() + " initGL() completed"); } /** @@ -76,7 +76,7 @@ public void initGL() { protected void createShaderProgram() { // Default implementation uses basic shader program // Subclasses can override to use different shaders - shaderProgram = ShaderLoader.Programs.createBasicProgram(SinkerService.getContext()); + shaderProgram = ShaderLoader.Programs.createBasicProgram(AThingLeftBehindService.getContext()); } /** diff --git a/app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/RotatingGraveyard.java b/app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/RotatingGarland.java similarity index 77% rename from app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/RotatingGraveyard.java rename to app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/RotatingGarland.java index ce1ece6..5f60559 100644 --- a/app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/RotatingGraveyard.java +++ b/app/src/main/java/net/t106/sinkerglwallpaper/rendering/objects/RotatingGarland.java @@ -8,18 +8,18 @@ import net.t106.sinkerglwallpaper.opengl.utils.BufferUtils; import net.t106.sinkerglwallpaper.opengl.utils.TextureUtils; import net.t106.sinkerglwallpaper.opengl.shaders.ShaderLoader; -import net.t106.sinkerglwallpaper.rendering.services.SinkerService; +import net.t106.sinkerglwallpaper.rendering.services.AThingLeftBehindService; /** - * Unified rotating graveyard object for OpenGL ES 3.2 - * Replaces both CenterGraveyard and BackgroundGraveyard with configuration-driven behavior + * Unified rotating garland object for OpenGL ES 3.2 + * Replaces both CenterGarland and BackgroundGarland with configuration-driven behavior */ -public class RotatingGraveyard extends Graveyard { +public class RotatingGarland extends Garland { private final RenderConfig.CompleteConfig config; private float rotation = 0.0f; - public RotatingGraveyard(RenderConfig.CompleteConfig config) { + public RotatingGarland(RenderConfig.CompleteConfig config) { super(); this.config = config; @@ -28,25 +28,25 @@ public RotatingGraveyard(RenderConfig.CompleteConfig config) { coords = config.geometry.texCoords; // Keep legacy buffer creation for compatibility - ab = SinkerService.makeFloatBuffer(apex); - cb = SinkerService.makeFloatBuffer(coords); + ab = AThingLeftBehindService.makeFloatBuffer(apex); + cb = AThingLeftBehindService.makeFloatBuffer(coords); } /** * Factory methods for common configurations */ - public static RotatingGraveyard createCenter() { - return new RotatingGraveyard(RenderConfig.CompleteConfig.CENTER_GRAVEYARD); + public static RotatingGarland createCenter() { + return new RotatingGarland(RenderConfig.CompleteConfig.CENTER_GARLAND); } - public static RotatingGraveyard createBackground() { - return new RotatingGraveyard(RenderConfig.CompleteConfig.BACKGROUND_GRAVEYARD); + public static RotatingGarland createBackground() { + return new RotatingGarland(RenderConfig.CompleteConfig.BACKGROUND_GARLAND); } @Override protected void createShaderProgram() { // Use blend shader program for texture rendering with color tinting - shaderProgram = ShaderLoader.Programs.createBlendProgram(SinkerService.getContext()); + shaderProgram = ShaderLoader.Programs.createBlendProgram(AThingLeftBehindService.getContext()); } @Override @@ -59,7 +59,7 @@ public void Draw(float[] viewMatrix, float[] projectionMatrix) { // Set texture if enabled if (config.texture.useTexture) { - TextureUtils.bindTexture(0, SinkerService.textures[config.texture.textureIndex]); + TextureUtils.bindTexture(0, AThingLeftBehindService.textures[config.texture.textureIndex]); } ShaderUtils.setUniform1i(textureLocation, 0); @@ -118,9 +118,9 @@ public RenderConfig.CompleteConfig getConfig() { } /** - * Creates a custom rotating graveyard with specific parameters + * Creates a custom rotating garland with specific parameters */ - public static RotatingGraveyard createCustom( + public static RotatingGarland createCustom( float rotationSpeed, int maxCount, boolean clockwise, @@ -141,6 +141,6 @@ public static RotatingGraveyard createCustom( RenderConfig.CompleteConfig config = new RenderConfig.CompleteConfig( rotation, color, texture, geometry, BlendModeManager.BLEND_ADDITIVE); - return new RotatingGraveyard(config); + return new RotatingGarland(config); } } \ No newline at end of file diff --git a/app/src/main/java/net/t106/sinkerglwallpaper/rendering/services/SinkerService.java b/app/src/main/java/net/t106/sinkerglwallpaper/rendering/services/AThingLeftBehindService.java similarity index 87% rename from app/src/main/java/net/t106/sinkerglwallpaper/rendering/services/SinkerService.java rename to app/src/main/java/net/t106/sinkerglwallpaper/rendering/services/AThingLeftBehindService.java index 7b9af82..7962b44 100644 --- a/app/src/main/java/net/t106/sinkerglwallpaper/rendering/services/SinkerService.java +++ b/app/src/main/java/net/t106/sinkerglwallpaper/rendering/services/AThingLeftBehindService.java @@ -15,14 +15,14 @@ import android.view.SurfaceHolder; import net.rbgrn.android.glwallpaperservice.GLWallpaperServiceES32; import net.t106.sinkerglwallpaper.R; -import net.t106.sinkerglwallpaper.rendering.objects.CenterGraveyard; -import net.t106.sinkerglwallpaper.rendering.objects.BackgroundGraveyard; +import net.t106.sinkerglwallpaper.rendering.objects.CenterGarland; +import net.t106.sinkerglwallpaper.rendering.objects.BackgroundGarland; import net.t106.sinkerglwallpaper.rendering.filters.LeftFilter; import net.t106.sinkerglwallpaper.rendering.filters.RightFilter; import net.t106.sinkerglwallpaper.opengl.utils.MatrixUtils; import net.t106.sinkerglwallpaper.opengl.utils.TextureUtils; -public class SinkerService extends GLWallpaperServiceES32{ +public class AThingLeftBehindService extends GLWallpaperServiceES32{ public static int[] textures = new int[2]; public static int blend_type; public static int[] col = new int[4]; @@ -33,7 +33,7 @@ public static Context getContext() { return context; } - public class SinkerEngine extends GLWallpaperServiceES32.GLEngine{ + public class AThingLeftBehindEngine extends GLWallpaperServiceES32.GLEngine{ @Override public void onCreate(SurfaceHolder surfaceHolder) { @@ -45,8 +45,8 @@ public void onCreate(SurfaceHolder surfaceHolder) { } public class MyRenderer implements GLWallpaperServiceES32.Renderer { - private CenterGraveyard cgy; - private BackgroundGraveyard bgy; + private CenterGarland cgy; + private BackgroundGarland bgy; private RightFilter rf; private LeftFilter lf; @@ -57,8 +57,8 @@ public class MyRenderer implements GLWallpaperServiceES32.Renderer { public MyRenderer() { - cgy = new CenterGraveyard(); - bgy = new BackgroundGraveyard(); + cgy = new CenterGarland(); + bgy = new BackgroundGarland(); rf = new RightFilter(); lf = new LeftFilter(); @@ -86,7 +86,7 @@ public void onDrawFrame(javax.microedition.khronos.opengles.GL10 gl) { lf.Update(deltaTime); rf.Update(deltaTime); - // Draw objects - filters first, then graveyards + // Draw objects - filters first, then garlands bgy.Draw(viewMatrix, projectionMatrix); cgy.Draw(viewMatrix, projectionMatrix); lf.Draw(viewMatrix, projectionMatrix); @@ -182,9 +182,9 @@ public void onSurfaceCreated(javax.microedition.khronos.opengles.GL10 gl, javax. if (newTextures != null) { textures[0] = newTextures[0]; // Original texture textures[1] = newTextures[1]; // Flipped texture - android.util.Log.d("SinkerService", "Textures loaded: " + textures[0] + ", " + textures[1]); + android.util.Log.d("AThingLeftBehindService", "Textures loaded: " + textures[0] + ", " + textures[1]); } else { - android.util.Log.e("SinkerService", "Failed to load textures!"); + android.util.Log.e("AThingLeftBehindService", "Failed to load textures!"); } // Set background color @@ -202,7 +202,7 @@ public void onSurfaceCreated(javax.microedition.khronos.opengles.GL10 gl, javax. public Engine onCreateEngine() { context = this; - return new SinkerEngine(); + return new AThingLeftBehindEngine(); } //頂点の配列をバッファーに変換するメソッド