appClass, SparkleInit init, String... args) {
+ return Lifecycle.launch(appClass, init, args, DefaultAppContext::createHeadless, true);
+ }
+
+ /**
+ * Launches a Sparkle app, using the directly calling class as the app class.
+ *
+ * @param init the init configuration
+ * @param args optional command-line arguments
+ * @return the launched app instance
+ * @throws ClassCastException if caller class is not a {@code SparkleApp}
+ */
+ public static SparkleApp launch(SparkleInit init, String... args) {
+ return Lifecycle.launch(callerAsAppClass(STACK_WALKER.getCallerClass()), init, args, DefaultAppContext::createWithDefaults, false);
+ }
+
+ /**
+ * Launches a headless Sparkle app, using the directly calling class as the app class.
+ *
+ * @param init the init configuration
+ * @param args optional command-line arguments
+ * @return the launched app instance
+ * @throws ClassCastException if caller class is not a {@code SparkleApp}
+ */
+ public static SparkleApp launchHeadless(SparkleInit init, String... args) {
+ return Lifecycle.launch(callerAsAppClass(STACK_WALKER.getCallerClass()), init, args, DefaultAppContext::createHeadless, true);
+ }
+
+ /**
+ * Attempts to gracefully terminate execution of this app.
+ * @throws InterruptedException if interrupted while waiting
+ * @throws IllegalStateException if this app hasn't been started yet
+ * @see State
+ */
+ public final void terminate() throws InterruptedException {
+ if (state == State.NEW || state == State.INITIALIZED) {
+ throw new IllegalStateException("App hasn't started yet");
+ }
+ if (state == State.RUNNING) {
+ Lifecycle.terminate(this);
+ }
+ }
+
+ /**
+ * The app state.
+ */
+ public enum State {
+ /**
+ * The app instance was just created. Calling {@link SparkleApp#terminate()} at this state is illegal.
+ */
+ NEW,
+ /**
+ * The app instance has been initialized and is about to start. Calling {@link SparkleApp#terminate()} at this state is illegal.
+ */
+ INITIALIZED,
+ /**
+ * The app instance is running. Calling {@link SparkleApp#terminate()} at this state will cause graceful exit.
+ */
+ RUNNING,
+ /**
+ * The app instance is being terminated. Calling {@link SparkleApp#terminate()} at this state does nothing.
+ */
+ TERMINATING,
+ /**
+ * The app instance is terminated. Calling {@link SparkleApp#terminate()} at this state does nothing.
+ */
+ TERMINATED
+ }
+
+
+ private static Class extends SparkleApp> callerAsAppClass(Class> caller) {
+ // We take caller as argument, because if we do STACK_WALKER.getCallerClass() here, we will always get SparkleApp.class
+ if (!SparkleApp.class.isAssignableFrom(caller)) {
+ throw new ClassCastException("Caller class is not an instance of SparkleApp: " + caller);
+ }
+ return caller.asSubclass(SparkleApp.class);
+ }
+}
diff --git a/src/main/java/net/fokinatorr/sparkle/SparkleInit.java b/src/main/java/net/fokinatorr/sparkle/SparkleInit.java
new file mode 100644
index 0000000..fd0ad23
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/SparkleInit.java
@@ -0,0 +1,49 @@
+package net.fokinatorr.sparkle;
+
+import lombok.*;
+import org.slf4j.event.Level;
+import net.fokinatorr.sparkle.context.AppContextHolder;
+import net.fokinatorr.sparkle.util.Global;
+
+import java.nio.file.Path;
+
+/**
+ * Initialization configuration for Sparkle.
+ */
+@Builder(toBuilder = true)
+@With
+@Value
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class SparkleInit {
+ /**
+ * Default configuration instance. This is optimal for development and testing environments.
+ */
+ public static final SparkleInit DEFAULT = SparkleInit.builder().build();
+
+ /**
+ * Minimal log level ({@code null} to disable logging). Default is {@link Level#DEBUG}; recommended to increase
+ * for production.
+ */
+ @Builder.Default
+ Level logLevel = Level.DEBUG;
+
+ /**
+ * Whether debug mode should be enabled for native libraries. Disabled by default, since this heavily impacts performance.
+ */
+ @Builder.Default
+ boolean nativeDebug = false;
+
+ /**
+ * Whether to initialize global context in {@link AppContextHolder}. Enabled by default.
+ * When enabled, the {@link Global} class will properly function.
+ */
+ @Builder.Default
+ boolean setGlobalContext = true;
+
+ /**
+ * Path to extract native libraries into (must be a directory). Default is {@code null} (extracts into a temporary directory).
+ * Recommended to change for production.
+ */
+ @Builder.Default
+ Path nativeExtractPath = null;
+}
diff --git a/src/main/java/ru/fokinatorr/sparkle/assets/Assets.java b/src/main/java/net/fokinatorr/sparkle/assets/Assets.java
similarity index 98%
rename from src/main/java/ru/fokinatorr/sparkle/assets/Assets.java
rename to src/main/java/net/fokinatorr/sparkle/assets/Assets.java
index 8ad6c42..64df4a6 100644
--- a/src/main/java/ru/fokinatorr/sparkle/assets/Assets.java
+++ b/src/main/java/net/fokinatorr/sparkle/assets/Assets.java
@@ -1,7 +1,7 @@
-package ru.fokinatorr.sparkle.assets;
+package net.fokinatorr.sparkle.assets;
import it.unimi.dsi.fastutil.objects.Object2IntFunction;
-import ru.fokinatorr.sparkle.util.Constants;
+import net.fokinatorr.sparkle.util.Constants;
import java.io.IOException;
import java.io.UncheckedIOException;
diff --git a/src/main/java/ru/fokinatorr/sparkle/assets/DefaultAssets.java b/src/main/java/net/fokinatorr/sparkle/assets/DefaultAssets.java
similarity index 95%
rename from src/main/java/ru/fokinatorr/sparkle/assets/DefaultAssets.java
rename to src/main/java/net/fokinatorr/sparkle/assets/DefaultAssets.java
index 426ab8a..1560f71 100644
--- a/src/main/java/ru/fokinatorr/sparkle/assets/DefaultAssets.java
+++ b/src/main/java/net/fokinatorr/sparkle/assets/DefaultAssets.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.assets;
+package net.fokinatorr.sparkle.assets;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.objects.Object2IntMaps;
@@ -7,7 +7,7 @@ import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import java.util.List;
import java.util.Objects;
-import static ru.fokinatorr.sparkle.util.Constants.ROOT;
+import static net.fokinatorr.sparkle.util.Constants.ROOT;
/**
* Default implementation of {@link Assets}.
diff --git a/src/main/java/ru/fokinatorr/sparkle/audio/AudioManager.java b/src/main/java/net/fokinatorr/sparkle/audio/AudioManager.java
similarity index 97%
rename from src/main/java/ru/fokinatorr/sparkle/audio/AudioManager.java
rename to src/main/java/net/fokinatorr/sparkle/audio/AudioManager.java
index 5110d1d..c53b509 100644
--- a/src/main/java/ru/fokinatorr/sparkle/audio/AudioManager.java
+++ b/src/main/java/net/fokinatorr/sparkle/audio/AudioManager.java
@@ -1,9 +1,9 @@
-package ru.fokinatorr.sparkle.audio;
+package net.fokinatorr.sparkle.audio;
import it.unimi.dsi.fastutil.Pair;
-import ru.fokinatorr.sparkle.audio.io.SoundDecoder;
-import ru.fokinatorr.sparkle.stage.sprite.Sprite;
-import ru.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
+import net.fokinatorr.sparkle.audio.io.SoundDecoder;
+import net.fokinatorr.sparkle.stage.sprite.Sprite;
+import net.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
import java.io.IOException;
import java.nio.file.Path;
diff --git a/src/main/java/ru/fokinatorr/sparkle/audio/SoundInstance.java b/src/main/java/net/fokinatorr/sparkle/audio/SoundInstance.java
similarity index 97%
rename from src/main/java/ru/fokinatorr/sparkle/audio/SoundInstance.java
rename to src/main/java/net/fokinatorr/sparkle/audio/SoundInstance.java
index 255e71f..f10e389 100644
--- a/src/main/java/ru/fokinatorr/sparkle/audio/SoundInstance.java
+++ b/src/main/java/net/fokinatorr/sparkle/audio/SoundInstance.java
@@ -1,7 +1,7 @@
-package ru.fokinatorr.sparkle.audio;
+package net.fokinatorr.sparkle.audio;
-import ru.fokinatorr.sparkle.effect.EffectMap;
-import ru.fokinatorr.sparkle.effect.sounds.SoundEffect;
+import net.fokinatorr.sparkle.effect.EffectMap;
+import net.fokinatorr.sparkle.effect.sounds.SoundEffect;
import java.util.Objects;
diff --git a/src/main/java/ru/fokinatorr/sparkle/audio/impl/BaseSoundSource.java b/src/main/java/net/fokinatorr/sparkle/audio/impl/BaseSoundSource.java
similarity index 90%
rename from src/main/java/ru/fokinatorr/sparkle/audio/impl/BaseSoundSource.java
rename to src/main/java/net/fokinatorr/sparkle/audio/impl/BaseSoundSource.java
index 475c756..91e0b8f 100644
--- a/src/main/java/ru/fokinatorr/sparkle/audio/impl/BaseSoundSource.java
+++ b/src/main/java/net/fokinatorr/sparkle/audio/impl/BaseSoundSource.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.audio.impl;
+package net.fokinatorr.sparkle.audio.impl;
import lombok.AccessLevel;
import lombok.Getter;
@@ -6,18 +6,19 @@ import lombok.RequiredArgsConstructor;
import lombok.experimental.FieldDefaults;
//import lombok.extern.lwjgl.ALCheckError;
import lombok.extern.slf4j.Slf4j;
-import ru.fokinatorr.sparkle.audio.SoundInstance;
-import ru.fokinatorr.sparkle.effect.EffectMap;
-import ru.fokinatorr.sparkle.effect.sounds.SoundEffect;
-import ru.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
+import net.fokinatorr.sparkle.audio.SoundInstance;
+import net.fokinatorr.sparkle.effect.EffectMap;
+import net.fokinatorr.sparkle.effect.sounds.SoundEffect;
+import net.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
import java.nio.FloatBuffer;
import java.util.Objects;
+import static org.lwjgl.openal.ALC10.alcMakeContextCurrent;
import static ru.fokinatorr.lwjgl.util.openal.AL10errchk.*;
import static org.lwjgl.system.MemoryUtil.memAllocFloat;
import static org.lwjgl.system.MemoryUtil.memDuplicate;
-import static ru.fokinatorr.sparkle.util.BufferUtils.*;
+import static net.fokinatorr.sparkle.util.BufferUtils.*;
/**
* Base interface for managing OpenAL sound sources.
@@ -30,13 +31,12 @@ import static ru.fokinatorr.sparkle.util.BufferUtils.*;
public abstract class BaseSoundSource> implements NonThrowingAutoCloseable, SoundInstance {
/**
- * The OpenAL source ID.
- * -- GETTER --
- *
Returns the OpenAL source ID.
- *
- * @return the source ID
+ * The ALC context handle.
+ */
+ protected final long alcContext; // pointer
+ /**
+ * The OpenAL source ID.
*/
- @SuppressWarnings("JavadocDeclaration") // @return used by getter
protected final int sourceId;
/**
* The attached sound effect map that will be listened. Ignored if {@code null}.
@@ -46,7 +46,9 @@ public abstract class BaseSoundSource> implem
/**
* Constructor for subclasses to call.
*/
- protected BaseSoundSource(int sourceId) {
+ protected BaseSoundSource(long alcContext, int sourceId) {
+ alcMakeContextCurrent(alcContext);
+ this.alcContext = alcContext;
this.sourceId = sourceId;
alSourcei(sourceId, AL_SOURCE_RELATIVE, AL_FALSE);
alSource3f(sourceId, AL_POSITION, 0.0f, 0.0f, 0.0f);
@@ -115,6 +117,7 @@ public abstract class BaseSoundSource> implem
*/
@Override
public void play() {
+ alcMakeContextCurrent(alcContext);
// alSourcePlay applied to a stopped sound changes the state
// firstly to initial, then to playing, so allow for potential rewind() overrides
if (getALState() == SourceState.STOPPED) {
@@ -133,6 +136,7 @@ public abstract class BaseSoundSource> implem
*/
@Override
public void pause() {
+ alcMakeContextCurrent(alcContext);
alSourcePause(sourceId);
}
@@ -142,6 +146,7 @@ public abstract class BaseSoundSource> implem
*/
@Override
public void stop() {
+ alcMakeContextCurrent(alcContext);
alSourceStop(sourceId);
}
@@ -152,6 +157,7 @@ public abstract class BaseSoundSource> implem
*/
@Override
public void rewind() {
+ alcMakeContextCurrent(alcContext);
// alSourceRewind applied to a playing or paused sound changes the state
// firstly to stopped, then to initial, so allow for potential stop() overrides
SourceState alState = getALState();
@@ -166,6 +172,7 @@ public abstract class BaseSoundSource> implem
* @return the source state
*/
public SourceState getALState() {
+ alcMakeContextCurrent(alcContext);
return SourceState.valueOf(alGetSourcei(sourceId, AL_SOURCE_STATE));
}
@@ -185,6 +192,7 @@ public abstract class BaseSoundSource> implem
* @return this sound source
*/
public SELF alPitch(float newPitch) {
+ alcMakeContextCurrent(alcContext);
alSourcef(sourceId, AL_PITCH, newPitch);
return self();
}
@@ -196,6 +204,7 @@ public abstract class BaseSoundSource> implem
* @return this sound source
*/
public SELF alGain(float newGain) {
+ alcMakeContextCurrent(alcContext);
alSourcef(sourceId, AL_GAIN, newGain);
return self();
}
@@ -209,6 +218,7 @@ public abstract class BaseSoundSource> implem
* @return this sound source
*/
public SELF alPosition(float x, float y, float z) {
+ alcMakeContextCurrent(alcContext);
alSource3f(
sourceId, AL_POSITION,
x, y, z
@@ -291,6 +301,7 @@ public abstract class BaseSoundSource> implem
* {@return the pitch of this sound source}
*/
public float alPitch() {
+ alcMakeContextCurrent(alcContext);
return alGetSourcef(sourceId, AL_PITCH);
}
@@ -298,6 +309,7 @@ public abstract class BaseSoundSource> implem
* {@return the gain of this sound source}
*/
public float alGain() {
+ alcMakeContextCurrent(alcContext);
return alGetSourcef(sourceId, AL_GAIN);
}
@@ -310,6 +322,7 @@ public abstract class BaseSoundSource> implem
* @return the position of this sound source
*/
public float[] alPosition() {
+ alcMakeContextCurrent(alcContext);
FloatBuffer pos = memAllocFloat(3);
try (var _ = freeing(pos)) {
alGetSource3f(
@@ -327,6 +340,7 @@ public abstract class BaseSoundSource> implem
* Ticks this source. This method is executed repeatedly for each {@link SourceState#PLAYING playing} sound source in the audio engine loop.
*/
public void tick() {
+ alcMakeContextCurrent(alcContext);
if (attachedEffects != null) {
//noinspection resource
copyPropertiesFrom(attachedEffects);
diff --git a/src/main/java/ru/fokinatorr/sparkle/audio/impl/OpenALAudioManager.java b/src/main/java/net/fokinatorr/sparkle/audio/impl/OpenALAudioManager.java
similarity index 92%
rename from src/main/java/ru/fokinatorr/sparkle/audio/impl/OpenALAudioManager.java
rename to src/main/java/net/fokinatorr/sparkle/audio/impl/OpenALAudioManager.java
index c4b12be..2de2b45 100644
--- a/src/main/java/ru/fokinatorr/sparkle/audio/impl/OpenALAudioManager.java
+++ b/src/main/java/net/fokinatorr/sparkle/audio/impl/OpenALAudioManager.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.audio.impl;
+package net.fokinatorr.sparkle.audio.impl;
import it.unimi.dsi.fastutil.Pair;
import it.unimi.dsi.fastutil.ints.Int2IntMap;
@@ -11,12 +11,12 @@ import lombok.extern.slf4j.Slf4j;
import org.lwjgl.BufferUtils;
import org.lwjgl.openal.AL;
import org.lwjgl.openal.ALCCapabilities;
-import ru.fokinatorr.sparkle.audio.AudioManager;
-import ru.fokinatorr.sparkle.audio.impl.bufferprovider.SoundBufferProvider;
-import ru.fokinatorr.sparkle.audio.impl.io.ParsedSoundImpl;
-import ru.fokinatorr.sparkle.audio.io.SoundDecoder;
-import ru.fokinatorr.sparkle.context.AppContext;
-import ru.fokinatorr.sparkle.util.GUID;
+import net.fokinatorr.sparkle.audio.AudioManager;
+import net.fokinatorr.sparkle.audio.impl.bufferprovider.SoundBufferProvider;
+import net.fokinatorr.sparkle.audio.impl.io.ParsedSoundImpl;
+import net.fokinatorr.sparkle.audio.io.SoundDecoder;
+import net.fokinatorr.sparkle.context.AppContext;
+import net.fokinatorr.sparkle.util.GUID;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -31,7 +31,7 @@ import static org.lwjgl.openal.ALC.*;
import static org.lwjgl.openal.ALC10.*;
import static org.lwjgl.system.MemoryUtil.NULL;
import static ru.fokinatorr.lwjgl.util.openal.AL10errchk.*;
-import static ru.fokinatorr.sparkle.audio.impl.BaseSoundSource.SourceState.PLAYING;
+import static net.fokinatorr.sparkle.audio.impl.BaseSoundSource.SourceState.PLAYING;
/**
* The entry point for creating an OpenAL audio engine.
@@ -63,7 +63,7 @@ public class OpenALAudioManager implements AudioManager {
/**
- * Creates a new audio engine that opens the default audio device.
+ * Creates a new audio manager that opens the default audio device.
*
* @param appContext the application context (used to get sound decoders)
* @throws IllegalStateException if initialization fails for any reason
@@ -103,9 +103,10 @@ public class OpenALAudioManager implements AudioManager {
IOException ex = null;
ParsedSoundImpl newSound = null;
if (device != NULL && alcContext != NULL) {
+ alcMakeContextCurrent(alcContext);
for (SoundDecoder decoder : appContext.getAll(SoundDecoder.class)) {
try {
- newSound = ParsedSoundImpl.fromPublicAPI(decoder.parseFile(path));
+ newSound = ParsedSoundImpl.fromPublicAPI(alcContext, decoder.parseFile(path));
if (decoder.getSupportedExtensions().stream().noneMatch(ext -> path.getFileName().toString().endsWith(ext))) {
logWrongFilenameExt(decoder.getFormatName(), decoder.getSupportedExtensions(), path);
}
@@ -161,7 +162,7 @@ public class OpenALAudioManager implements AudioManager {
@Override
public Pair createStaticSoundInstance(Path path) {
ensureOpen();
- ensureContext();
+ alcMakeContextCurrent(alcContext);
ParsedSoundImpl parsed = getParsedSound(path);
SoundBuffer buffer = parsed.createStandAloneBuffer();
@@ -198,12 +199,12 @@ public class OpenALAudioManager implements AudioManager {
*/
public Pair createStreamingSoundInstance(Path path, int maxBufferSize, boolean loop) {
ensureOpen();
- ensureContext();
+ alcMakeContextCurrent(alcContext);
ParsedSoundImpl parsed = getParsedSound(path);
SoundBufferProvider provider = parsed.createProvider(maxBufferSize, loop);
String id = GUID.generate();
- StreamingSoundSource source = new StreamingSoundSource(provider, 3);
+ StreamingSoundSource source = new StreamingSoundSource(alcContext, provider, 3);
sources.put(id, source);
return new ObjectObjectImmutablePair<>(id, source);
}
@@ -230,8 +231,8 @@ public class OpenALAudioManager implements AudioManager {
@Override
public void destroySoundInstance(String id) {
ensureOpen();
- ensureContext();
if (sources.containsKey(id)) {
+ alcMakeContextCurrent(alcContext);
BaseSoundSource> source = sources.remove(id);
// The source is stopped in close() in all current implementations,
// but maybe a new one will appear, and we'll forget about adding stop() there
@@ -250,7 +251,7 @@ public class OpenALAudioManager implements AudioManager {
@Override
public void tick() {
ensureOpen();
- ensureContext();
+ alcMakeContextCurrent(alcContext);
for (BaseSoundSource> source : sources.values()) {
if (source.getALState() == PLAYING) source.tick();
}
@@ -261,6 +262,7 @@ public class OpenALAudioManager implements AudioManager {
*/
@Override
public void close() {
+ alcMakeContextCurrent(alcContext);
parsedSounds.values().forEach(ParsedSoundImpl::close);
parsedSounds.clear();
sources.values().forEach(BaseSoundSource::close);
@@ -285,12 +287,6 @@ public class OpenALAudioManager implements AudioManager {
}
}
- private void ensureContext() {
- if (alcContext != NULL && alcGetCurrentContext() == NULL) {
- alcMakeContextCurrent(alcContext);
- }
- }
-
private ParsedSoundImpl getParsedSound(Path path) {
if (hasLoadedSound(path)) {
return parsedSounds.get(path);
diff --git a/src/main/java/ru/fokinatorr/sparkle/audio/impl/PitchConversion.java b/src/main/java/net/fokinatorr/sparkle/audio/impl/PitchConversion.java
similarity index 91%
rename from src/main/java/ru/fokinatorr/sparkle/audio/impl/PitchConversion.java
rename to src/main/java/net/fokinatorr/sparkle/audio/impl/PitchConversion.java
index 4b29782..3fad80b 100644
--- a/src/main/java/ru/fokinatorr/sparkle/audio/impl/PitchConversion.java
+++ b/src/main/java/net/fokinatorr/sparkle/audio/impl/PitchConversion.java
@@ -1,6 +1,7 @@
-package ru.fokinatorr.sparkle.audio.impl;
+package net.fokinatorr.sparkle.audio.impl;
import lombok.experimental.UtilityClass;
+import net.fokinatorr.sparkle.effect.sounds.SoundEffect;
/**
* Sound effect value conversion utils.
@@ -29,7 +30,7 @@ class PitchConversion {
private final double LOG_TO_PITCH_SCALE = Math.log(2) / STEPS_PER_OCTAVE;
/**
- * Converts the given {@link ru.fokinatorr.sparkle.effect.sounds.SoundEffect#PITCH pitch sound effect} value to a valid OpenAL pitch.
+ * Converts the given {@link SoundEffect#PITCH pitch sound effect} value to a valid OpenAL pitch.
* @param pitch the pitch effect value
* @return the corresponding OpenAL pitch value
* @throws IllegalArgumentException if the given argument is infinite or NaN
diff --git a/src/main/java/ru/fokinatorr/sparkle/audio/impl/SoundBuffer.java b/src/main/java/net/fokinatorr/sparkle/audio/impl/SoundBuffer.java
similarity index 87%
rename from src/main/java/ru/fokinatorr/sparkle/audio/impl/SoundBuffer.java
rename to src/main/java/net/fokinatorr/sparkle/audio/impl/SoundBuffer.java
index 8be96b2..00ba2a7 100644
--- a/src/main/java/ru/fokinatorr/sparkle/audio/impl/SoundBuffer.java
+++ b/src/main/java/net/fokinatorr/sparkle/audio/impl/SoundBuffer.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.audio.impl;
+package net.fokinatorr.sparkle.audio.impl;
import lombok.AccessLevel;
import lombok.Getter;
@@ -7,11 +7,12 @@ import lombok.experimental.FieldDefaults;
import lombok.experimental.NonFinal;
//import lombok.extern.lwjgl.ALCheckError;
import lombok.extern.slf4j.Slf4j;
-import ru.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
+import net.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
import java.nio.ShortBuffer;
import java.util.Objects;
+import static org.lwjgl.openal.ALC10.alcMakeContextCurrent;
import static ru.fokinatorr.lwjgl.util.openal.AL10errchk.*;
import static org.lwjgl.system.MemoryUtil.*;
@@ -22,6 +23,12 @@ import static org.lwjgl.system.MemoryUtil.*;
@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
//@ALCheckError
public class SoundBuffer implements NonThrowingAutoCloseable {
+
+ /**
+ * The OpenAL context handle.
+ */
+ @Getter
+ long alcContext;
/**
* The OpenAL buffer ID.
*/
@@ -39,7 +46,9 @@ public class SoundBuffer implements NonThrowingAutoCloseable {
* @param frequency the data frequency, in Hz
* @throws NullPointerException if any argument is {@code null}
*/
- public SoundBuffer(ShortBuffer pcmData, DataFormat format, int frequency) {
+ public SoundBuffer(long alcContext, ShortBuffer pcmData, DataFormat format, int frequency) {
+ alcMakeContextCurrent(alcContext);
+ this.alcContext = alcContext;
this.bufferId = alGenBuffers();
this.pcm = memDuplicate(Objects.requireNonNull(pcmData, "PCM data"));
alBufferData(
@@ -66,6 +75,7 @@ public class SoundBuffer implements NonThrowingAutoCloseable {
@Override
public void close() {
if (open) {
+ alcMakeContextCurrent(alcContext);
try {
alDeleteBuffers(bufferId);
} finally {
diff --git a/src/main/java/ru/fokinatorr/sparkle/audio/impl/StaticSoundSource.java b/src/main/java/net/fokinatorr/sparkle/audio/impl/StaticSoundSource.java
similarity index 86%
rename from src/main/java/ru/fokinatorr/sparkle/audio/impl/StaticSoundSource.java
rename to src/main/java/net/fokinatorr/sparkle/audio/impl/StaticSoundSource.java
index 7697fcb..1997db6 100644
--- a/src/main/java/ru/fokinatorr/sparkle/audio/impl/StaticSoundSource.java
+++ b/src/main/java/net/fokinatorr/sparkle/audio/impl/StaticSoundSource.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.audio.impl;
+package net.fokinatorr.sparkle.audio.impl;
import lombok.AccessLevel;
import lombok.experimental.FieldDefaults;
@@ -6,6 +6,7 @@ import lombok.experimental.FieldDefaults;
import java.util.Objects;
+import static org.lwjgl.openal.ALC10.alcMakeContextCurrent;
import static ru.fokinatorr.lwjgl.util.openal.AL10errchk.*;
/**
@@ -25,7 +26,8 @@ public class StaticSoundSource extends BaseSoundSource {
* @throws NullPointerException if the buffer is {@code null}
*/
public StaticSoundSource(SoundBuffer buffer) {
- super(alGenSources());
+ alcMakeContextCurrent(buffer.getAlcContext());
+ super(buffer.getAlcContext(), alGenSources());
this.buffer = Objects.requireNonNull(buffer);
alSourcei(sourceId, AL_BUFFER, buffer.getBufferId());
}
@@ -48,6 +50,7 @@ public class StaticSoundSource extends BaseSoundSource {
* @return this sound source
*/
public StaticSoundSource looping(boolean newLooping) {
+ alcMakeContextCurrent(alcContext);
alSourcei(sourceId, AL_LOOPING, newLooping ? AL_TRUE : AL_FALSE);
return this;
}
@@ -59,6 +62,7 @@ public class StaticSoundSource extends BaseSoundSource {
* @return whether this sound source is looping
*/
public boolean looping() {
+ alcMakeContextCurrent(alcContext);
return alGetSourcei(sourceId, AL_LOOPING) == AL_TRUE;
}
@@ -68,6 +72,7 @@ public class StaticSoundSource extends BaseSoundSource {
@Override
public void close() {
if (open) {
+ alcMakeContextCurrent(alcContext);
stop();
try {
alDeleteSources(sourceId);
diff --git a/src/main/java/ru/fokinatorr/sparkle/audio/impl/StreamingSoundSource.java b/src/main/java/net/fokinatorr/sparkle/audio/impl/StreamingSoundSource.java
similarity index 88%
rename from src/main/java/ru/fokinatorr/sparkle/audio/impl/StreamingSoundSource.java
rename to src/main/java/net/fokinatorr/sparkle/audio/impl/StreamingSoundSource.java
index e8e594e..c1b8def 100644
--- a/src/main/java/ru/fokinatorr/sparkle/audio/impl/StreamingSoundSource.java
+++ b/src/main/java/net/fokinatorr/sparkle/audio/impl/StreamingSoundSource.java
@@ -1,20 +1,23 @@
-package ru.fokinatorr.sparkle.audio.impl;
+package net.fokinatorr.sparkle.audio.impl;
import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import lombok.AccessLevel;
import lombok.experimental.FieldDefaults;
//import lombok.extern.lwjgl.ALCheckError;
-import ru.fokinatorr.sparkle.audio.impl.bufferprovider.*;
+import net.fokinatorr.sparkle.audio.impl.bufferprovider.IterableSoundBufferProvider;
+import net.fokinatorr.sparkle.audio.impl.bufferprovider.SamplesSoundBufferProvider;
+import net.fokinatorr.sparkle.audio.impl.bufferprovider.SoundBufferProvider;
import java.nio.IntBuffer;
import java.util.Arrays;
import java.util.Objects;
import java.util.stream.Stream;
+import static org.lwjgl.openal.ALC10.alcMakeContextCurrent;
import static ru.fokinatorr.lwjgl.util.openal.AL10errchk.*;
import static org.lwjgl.system.MemoryUtil.memAllocInt;
-import static ru.fokinatorr.sparkle.util.BufferUtils.*;
+import static net.fokinatorr.sparkle.util.BufferUtils.*;
/**
* Manages a streaming OpenAL sound source. The buffers should be queued.
@@ -49,8 +52,9 @@ public class StreamingSoundSource extends BaseSoundSource
* @param provider the provider to use for getting buffers
* @throws NullPointerException if the given buffer array is {@code null}
*/
- public StreamingSoundSource(SoundBufferProvider provider, int enqueueStart) {
- super(alGenSources());
+ public StreamingSoundSource(long alcContext, SoundBufferProvider provider, int enqueueStart) {
+ alcMakeContextCurrent(alcContext);
+ super(alcContext, alGenSources());
this.provider = provider;
this.bufferItr = provider.iterator();
this.enqueueStart = enqueueStart;
@@ -74,6 +78,7 @@ public class StreamingSoundSource extends BaseSoundSource
.filter(Objects::nonNull)
.toArray(SoundBuffer[]::new);
if (queue.length > 0) {
+ alcMakeContextCurrent(alcContext);
alSourceQueueBuffers(sourceId,
Arrays.stream(queue)
.peek(buf -> bufferQueue.put(buf.getBufferId(), buf))
@@ -94,6 +99,7 @@ public class StreamingSoundSource extends BaseSoundSource
private SoundBuffer[] dequeueBuffers(int count) {
IntBuffer bufferIds = memAllocInt(count);
try (var _ = freeing(bufferIds)) {
+ alcMakeContextCurrent(alcContext);
alSourceUnqueueBuffers(sourceId, bufferIds);
return stream(bufferIds)
.mapToObj(bufferQueue::remove)
@@ -108,6 +114,7 @@ public class StreamingSoundSource extends BaseSoundSource
@Override
public void close() {
if (open) {
+ alcMakeContextCurrent(alcContext);
stop();
try {
dequeueBuffers(alGetSourcei(sourceId, AL_BUFFERS_QUEUED));
@@ -149,6 +156,7 @@ public class StreamingSoundSource extends BaseSoundSource
public void tick() {
super.tick();
if (--requeueWaitTicks <= 0) {
+ alcMakeContextCurrent(alcContext);
requeueWaitTicks = WAIT_BEFORE_UPDATE_TICKS;
dequeueBuffers(alGetSourcei(sourceId, AL_BUFFERS_PROCESSED));
//noinspection resource
diff --git a/src/main/java/ru/fokinatorr/sparkle/audio/impl/bufferprovider/IterableSoundBufferProvider.java b/src/main/java/net/fokinatorr/sparkle/audio/impl/bufferprovider/IterableSoundBufferProvider.java
similarity index 92%
rename from src/main/java/ru/fokinatorr/sparkle/audio/impl/bufferprovider/IterableSoundBufferProvider.java
rename to src/main/java/net/fokinatorr/sparkle/audio/impl/bufferprovider/IterableSoundBufferProvider.java
index 93f608e..c1b13d8 100644
--- a/src/main/java/ru/fokinatorr/sparkle/audio/impl/bufferprovider/IterableSoundBufferProvider.java
+++ b/src/main/java/net/fokinatorr/sparkle/audio/impl/bufferprovider/IterableSoundBufferProvider.java
@@ -1,10 +1,10 @@
-package ru.fokinatorr.sparkle.audio.impl.bufferprovider;
+package net.fokinatorr.sparkle.audio.impl.bufferprovider;
import lombok.AccessLevel;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.experimental.FieldDefaults;
-import ru.fokinatorr.sparkle.audio.impl.SoundBuffer;
+import net.fokinatorr.sparkle.audio.impl.SoundBuffer;
/**
* A {@link SoundBufferProvider} backed by an {@link Iterable}.
diff --git a/src/main/java/ru/fokinatorr/sparkle/audio/impl/bufferprovider/SamplesSoundBufferProvider.java b/src/main/java/net/fokinatorr/sparkle/audio/impl/bufferprovider/SamplesSoundBufferProvider.java
similarity index 92%
rename from src/main/java/ru/fokinatorr/sparkle/audio/impl/bufferprovider/SamplesSoundBufferProvider.java
rename to src/main/java/net/fokinatorr/sparkle/audio/impl/bufferprovider/SamplesSoundBufferProvider.java
index 46f5c77..079be70 100644
--- a/src/main/java/ru/fokinatorr/sparkle/audio/impl/bufferprovider/SamplesSoundBufferProvider.java
+++ b/src/main/java/net/fokinatorr/sparkle/audio/impl/bufferprovider/SamplesSoundBufferProvider.java
@@ -1,11 +1,11 @@
-package ru.fokinatorr.sparkle.audio.impl.bufferprovider;
+package net.fokinatorr.sparkle.audio.impl.bufferprovider;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
import lombok.experimental.FieldDefaults;
import lombok.experimental.NonFinal;
import lombok.extern.slf4j.Slf4j;
-import ru.fokinatorr.sparkle.audio.impl.SoundBuffer;
+import net.fokinatorr.sparkle.audio.impl.SoundBuffer;
import java.nio.ShortBuffer;
import java.util.LinkedList;
@@ -22,6 +22,10 @@ import static org.lwjgl.system.MemoryUtil.memDuplicate;
@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
@RequiredArgsConstructor
public final class SamplesSoundBufferProvider implements SoundBufferProvider {
+ /**
+ * The ALC context handle.
+ */
+ long alcContext; // pointer
/**
* The parsed PCM samples.
*/
@@ -72,6 +76,7 @@ public final class SamplesSoundBufferProvider implements SoundBufferProvider {
segment.put(samples.get());
}
itr.add(new SoundBuffer(
+ alcContext,
segment.flip(),
dataFormat,
frequency
diff --git a/src/main/java/ru/fokinatorr/sparkle/audio/impl/bufferprovider/SoundBufferProvider.java b/src/main/java/net/fokinatorr/sparkle/audio/impl/bufferprovider/SoundBufferProvider.java
similarity index 90%
rename from src/main/java/ru/fokinatorr/sparkle/audio/impl/bufferprovider/SoundBufferProvider.java
rename to src/main/java/net/fokinatorr/sparkle/audio/impl/bufferprovider/SoundBufferProvider.java
index 1ed1abf..44b5336 100644
--- a/src/main/java/ru/fokinatorr/sparkle/audio/impl/bufferprovider/SoundBufferProvider.java
+++ b/src/main/java/net/fokinatorr/sparkle/audio/impl/bufferprovider/SoundBufferProvider.java
@@ -1,8 +1,8 @@
-package ru.fokinatorr.sparkle.audio.impl.bufferprovider;
+package net.fokinatorr.sparkle.audio.impl.bufferprovider;
-import ru.fokinatorr.sparkle.audio.impl.SoundBuffer;
-import ru.fokinatorr.sparkle.audio.impl.StreamingSoundSource;
-import ru.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
+import net.fokinatorr.sparkle.audio.impl.SoundBuffer;
+import net.fokinatorr.sparkle.audio.impl.StreamingSoundSource;
+import net.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
import java.util.NoSuchElementException;
diff --git a/src/main/java/ru/fokinatorr/sparkle/audio/impl/bufferprovider/StandardJavaProviderIterator.java b/src/main/java/net/fokinatorr/sparkle/audio/impl/bufferprovider/StandardJavaProviderIterator.java
similarity index 92%
rename from src/main/java/ru/fokinatorr/sparkle/audio/impl/bufferprovider/StandardJavaProviderIterator.java
rename to src/main/java/net/fokinatorr/sparkle/audio/impl/bufferprovider/StandardJavaProviderIterator.java
index e3ae10e..ba61e8b 100644
--- a/src/main/java/ru/fokinatorr/sparkle/audio/impl/bufferprovider/StandardJavaProviderIterator.java
+++ b/src/main/java/net/fokinatorr/sparkle/audio/impl/bufferprovider/StandardJavaProviderIterator.java
@@ -1,9 +1,9 @@
-package ru.fokinatorr.sparkle.audio.impl.bufferprovider;
+package net.fokinatorr.sparkle.audio.impl.bufferprovider;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
import lombok.experimental.FieldDefaults;
-import ru.fokinatorr.sparkle.audio.impl.SoundBuffer;
+import net.fokinatorr.sparkle.audio.impl.SoundBuffer;
import java.util.Iterator;
diff --git a/src/main/java/ru/fokinatorr/sparkle/audio/impl/io/ParsedSoundImpl.java b/src/main/java/net/fokinatorr/sparkle/audio/impl/io/ParsedSoundImpl.java
similarity index 91%
rename from src/main/java/ru/fokinatorr/sparkle/audio/impl/io/ParsedSoundImpl.java
rename to src/main/java/net/fokinatorr/sparkle/audio/impl/io/ParsedSoundImpl.java
index e473a17..2159dac 100644
--- a/src/main/java/ru/fokinatorr/sparkle/audio/impl/io/ParsedSoundImpl.java
+++ b/src/main/java/net/fokinatorr/sparkle/audio/impl/io/ParsedSoundImpl.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.audio.impl.io;
+package net.fokinatorr.sparkle.audio.impl.io;
import lombok.AccessLevel;
import lombok.Getter;
@@ -7,11 +7,11 @@ import lombok.RequiredArgsConstructor;
import lombok.experimental.FieldDefaults;
import lombok.experimental.NonFinal;
import org.lwjgl.system.MemoryUtil;
-import ru.fokinatorr.sparkle.audio.impl.SoundBuffer;
-import ru.fokinatorr.sparkle.audio.impl.bufferprovider.SamplesSoundBufferProvider;
-import ru.fokinatorr.sparkle.audio.impl.bufferprovider.SoundBufferProvider;
-import ru.fokinatorr.sparkle.audio.io.ParsedSound;
-import ru.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
+import net.fokinatorr.sparkle.audio.impl.SoundBuffer;
+import net.fokinatorr.sparkle.audio.impl.bufferprovider.SamplesSoundBufferProvider;
+import net.fokinatorr.sparkle.audio.impl.bufferprovider.SoundBufferProvider;
+import net.fokinatorr.sparkle.audio.io.ParsedSound;
+import net.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
import java.nio.Buffer;
import java.nio.ShortBuffer;
@@ -36,6 +36,10 @@ import static org.lwjgl.system.MemoryUtil.memFree;
@Getter
public class ParsedSoundImpl implements NonThrowingAutoCloseable {
+ /**
+ * The ALC context handle.
+ */
+ long alcContext; // pointer
/**
* The raw sound data samples.
*/
@@ -62,10 +66,11 @@ public class ParsedSoundImpl implements NonThrowingAutoCloseable {
/**
* Converts a {@link ParsedSound} record to a {@code ParsedSoundImpl} instance.
+ * @param alcContext the ALC context handle
* @param ps the source object
* @return a new {@code ParsedSoundImpl} instance
*/
- public static ParsedSoundImpl fromPublicAPI(ParsedSound ps) {
+ public static ParsedSoundImpl fromPublicAPI(long alcContext, ParsedSound ps) {
Objects.requireNonNull(ps, "source object");
SoundBuffer.DataFormat format = switch (ps.dataFormat()) {
case MONO_8BIT -> SoundBuffer.DataFormat.MONO_8BIT;
@@ -74,6 +79,7 @@ public class ParsedSoundImpl implements NonThrowingAutoCloseable {
case STEREO_16BIT -> SoundBuffer.DataFormat.STEREO_16BIT;
};
return new ParsedSoundImpl(
+ alcContext,
ps.pcm(),
ps.freePcm(),
format,
@@ -95,7 +101,7 @@ public class ParsedSoundImpl implements NonThrowingAutoCloseable {
ShortBuffer clone = memAllocShort(orig.remaining())
.put(orig)
.flip();
- return new SoundBuffer(clone, dataFormat, frequency);
+ return new SoundBuffer(alcContext, clone, dataFormat, frequency);
}
@@ -162,6 +168,7 @@ public class ParsedSoundImpl implements NonThrowingAutoCloseable {
break;
}
list.add(new SoundBuffer(
+ alcContext,
buf.flip(),
dataFormat,
frequency
@@ -179,6 +186,7 @@ public class ParsedSoundImpl implements NonThrowingAutoCloseable {
*/
public SoundBufferProvider createProvider(int maxBufferSize, boolean mustLoop) {
return new SamplesSoundBufferProvider(
+ alcContext,
getPcmData(),
dataFormat,
frequency,
diff --git a/src/main/java/ru/fokinatorr/sparkle/audio/impl/io/VorbisSoundDecoder.java b/src/main/java/net/fokinatorr/sparkle/audio/impl/io/VorbisSoundDecoder.java
similarity index 95%
rename from src/main/java/ru/fokinatorr/sparkle/audio/impl/io/VorbisSoundDecoder.java
rename to src/main/java/net/fokinatorr/sparkle/audio/impl/io/VorbisSoundDecoder.java
index 5fa8ddf..518cade 100644
--- a/src/main/java/ru/fokinatorr/sparkle/audio/impl/io/VorbisSoundDecoder.java
+++ b/src/main/java/net/fokinatorr/sparkle/audio/impl/io/VorbisSoundDecoder.java
@@ -1,9 +1,8 @@
-package ru.fokinatorr.sparkle.audio.impl.io;
+package net.fokinatorr.sparkle.audio.impl.io;
import org.lwjgl.stb.STBVorbisInfo;
-import ru.fokinatorr.sparkle.audio.impl.SoundBuffer;
-import ru.fokinatorr.sparkle.audio.io.ParsedSound;
-import ru.fokinatorr.sparkle.audio.io.SoundDecoder;
+import net.fokinatorr.sparkle.audio.io.ParsedSound;
+import net.fokinatorr.sparkle.audio.io.SoundDecoder;
import java.io.FileNotFoundException;
import java.io.IOException;
diff --git a/src/main/java/ru/fokinatorr/sparkle/audio/io/ParsedSound.java b/src/main/java/net/fokinatorr/sparkle/audio/io/ParsedSound.java
similarity index 98%
rename from src/main/java/ru/fokinatorr/sparkle/audio/io/ParsedSound.java
rename to src/main/java/net/fokinatorr/sparkle/audio/io/ParsedSound.java
index 1a168ff..f7babad 100644
--- a/src/main/java/ru/fokinatorr/sparkle/audio/io/ParsedSound.java
+++ b/src/main/java/net/fokinatorr/sparkle/audio/io/ParsedSound.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.audio.io;
+package net.fokinatorr.sparkle.audio.io;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
diff --git a/src/main/java/ru/fokinatorr/sparkle/audio/io/SoundDecoder.java b/src/main/java/net/fokinatorr/sparkle/audio/io/SoundDecoder.java
similarity index 95%
rename from src/main/java/ru/fokinatorr/sparkle/audio/io/SoundDecoder.java
rename to src/main/java/net/fokinatorr/sparkle/audio/io/SoundDecoder.java
index a141728..13bb2e0 100644
--- a/src/main/java/ru/fokinatorr/sparkle/audio/io/SoundDecoder.java
+++ b/src/main/java/net/fokinatorr/sparkle/audio/io/SoundDecoder.java
@@ -1,7 +1,7 @@
-package ru.fokinatorr.sparkle.audio.io;
+package net.fokinatorr.sparkle.audio.io;
-import ru.fokinatorr.sparkle.context.AppContextHolder;
-import ru.fokinatorr.sparkle.util.BufferUtils;
+import net.fokinatorr.sparkle.context.AppContextHolder;
+import net.fokinatorr.sparkle.util.BufferUtils;
import java.io.IOException;
import java.io.InputStream;
diff --git a/src/main/java/ru/fokinatorr/sparkle/context/AppContext.java b/src/main/java/net/fokinatorr/sparkle/context/AppContext.java
similarity index 98%
rename from src/main/java/ru/fokinatorr/sparkle/context/AppContext.java
rename to src/main/java/net/fokinatorr/sparkle/context/AppContext.java
index c11b99c..069e03d 100644
--- a/src/main/java/ru/fokinatorr/sparkle/context/AppContext.java
+++ b/src/main/java/net/fokinatorr/sparkle/context/AppContext.java
@@ -1,9 +1,9 @@
-package ru.fokinatorr.sparkle.context;
+package net.fokinatorr.sparkle.context;
import java.util.Collection;
import java.util.function.Function;
import java.util.function.Supplier;
-import ru.fokinatorr.sparkle.util.Global;
+import net.fokinatorr.sparkle.util.Global;
/**
* Represents a lightweight runtime environment for an application.
@@ -15,6 +15,7 @@ import ru.fokinatorr.sparkle.util.Global;
*/
public interface AppContext extends AutoCloseable {
// Not using Spring context; it's too heavy and loads slowly - this is unacceptable for desktop app development, especially games
+ // TODO add TypeReference support later?
// Accessors
diff --git a/src/main/java/ru/fokinatorr/sparkle/context/AppContextHolder.java b/src/main/java/net/fokinatorr/sparkle/context/AppContextHolder.java
similarity index 92%
rename from src/main/java/ru/fokinatorr/sparkle/context/AppContextHolder.java
rename to src/main/java/net/fokinatorr/sparkle/context/AppContextHolder.java
index 416d982..aa3cc68 100644
--- a/src/main/java/ru/fokinatorr/sparkle/context/AppContextHolder.java
+++ b/src/main/java/net/fokinatorr/sparkle/context/AppContextHolder.java
@@ -1,7 +1,7 @@
-package ru.fokinatorr.sparkle.context;
+package net.fokinatorr.sparkle.context;
import lombok.experimental.UtilityClass;
-import ru.fokinatorr.sparkle.util.Global;
+import net.fokinatorr.sparkle.util.Global;
import java.util.Objects;
@@ -48,8 +48,7 @@ public class AppContextHolder {
*/
public void initContext(AppContext ctx) {
if (CONTEXT.get() == null) {
- Objects.requireNonNull(ctx, "app context");
- CONTEXT.set(ctx);
+ CONTEXT.set(Objects.requireNonNull(ctx, "app context"));
} else {
throw new IllegalStateException("AppContext is already initialized for " + Thread.currentThread());
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/context/DefaultAppContext.java b/src/main/java/net/fokinatorr/sparkle/context/DefaultAppContext.java
similarity index 92%
rename from src/main/java/ru/fokinatorr/sparkle/context/DefaultAppContext.java
rename to src/main/java/net/fokinatorr/sparkle/context/DefaultAppContext.java
index 5a68571..5ed4dda 100644
--- a/src/main/java/ru/fokinatorr/sparkle/context/DefaultAppContext.java
+++ b/src/main/java/net/fokinatorr/sparkle/context/DefaultAppContext.java
@@ -1,20 +1,20 @@
-package ru.fokinatorr.sparkle.context;
+package net.fokinatorr.sparkle.context;
import lombok.*;
import lombok.experimental.FieldDefaults;
import lombok.extern.slf4j.Slf4j;
-import ru.fokinatorr.sparkle.audio.AudioManager;
-import ru.fokinatorr.sparkle.audio.impl.OpenALAudioManager;
-import ru.fokinatorr.sparkle.audio.impl.io.VorbisSoundDecoder;
-import ru.fokinatorr.sparkle.audio.io.SoundDecoder;
-import ru.fokinatorr.sparkle.event.dispatcher.EventDispatcher;
-import ru.fokinatorr.sparkle.graphics.GraphicsManager;
-import ru.fokinatorr.sparkle.graphics.font.FontProvider;
-import ru.fokinatorr.sparkle.graphics.impl.OpenGLGraphicsManager;
-import ru.fokinatorr.sparkle.graphics.render.renderer.RendererRegistry;
-import ru.fokinatorr.sparkle.util.GUID;
-import ru.fokinatorr.sparkle.util.concurrent.ContextInheritingThreadFactory;
-import ru.fokinatorr.sparkle.util.concurrent.ThreadType;
+import net.fokinatorr.sparkle.audio.AudioManager;
+import net.fokinatorr.sparkle.audio.impl.OpenALAudioManager;
+import net.fokinatorr.sparkle.audio.impl.io.VorbisSoundDecoder;
+import net.fokinatorr.sparkle.audio.io.SoundDecoder;
+import net.fokinatorr.sparkle.event.dispatcher.EventDispatcher;
+import net.fokinatorr.sparkle.graphics.GraphicsManager;
+import net.fokinatorr.sparkle.graphics.font.FontProvider;
+import net.fokinatorr.sparkle.graphics.impl.OpenGLGraphicsManager;
+import net.fokinatorr.sparkle.graphics.render.renderer.RendererRegistry;
+import net.fokinatorr.sparkle.util.GUID;
+import net.fokinatorr.sparkle.util.concurrent.ContextInheritingThreadFactory;
+import net.fokinatorr.sparkle.util.concurrent.ThreadType;
import java.lang.ref.Cleaner;
import java.lang.reflect.Modifier;
@@ -66,7 +66,6 @@ public class DefaultAppContext implements AppContext {
T result = entries.stream()
.map(e -> e.get(this))
.findFirst().orElseThrow();
- log.trace("[DefaultAppContext id={}] Resolved '{}' -> {}", id, type.getSimpleName(), result);
return result;
}
@@ -81,7 +80,6 @@ public class DefaultAppContext implements AppContext {
List result = entries.stream()
.map(e -> e.get(this))
.collect(Collectors.toList());
- log.trace("[DefaultAppContext id={}] Resolved all '{}' -> {}", id, type.getSimpleName(), result);
return result;
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/effect/EffectMap.java b/src/main/java/net/fokinatorr/sparkle/effect/EffectMap.java
similarity index 98%
rename from src/main/java/ru/fokinatorr/sparkle/effect/EffectMap.java
rename to src/main/java/net/fokinatorr/sparkle/effect/EffectMap.java
index 40acabf..3f95113 100644
--- a/src/main/java/ru/fokinatorr/sparkle/effect/EffectMap.java
+++ b/src/main/java/net/fokinatorr/sparkle/effect/EffectMap.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.effect;
+package net.fokinatorr.sparkle.effect;
import it.unimi.dsi.fastutil.doubles.AbstractDoubleCollection;
import it.unimi.dsi.fastutil.doubles.AbstractDoubleIterator;
@@ -7,7 +7,7 @@ import it.unimi.dsi.fastutil.doubles.DoubleIterator;
import it.unimi.dsi.fastutil.objects.*;
import lombok.Data;
import lombok.NonNull;
-import ru.fokinatorr.sparkle.util.concurrent.atomic.AtomicDoubleArray;
+import net.fokinatorr.sparkle.util.concurrent.atomic.AtomicDoubleArray;
import java.util.NoSuchElementException;
import java.util.Objects;
@@ -53,7 +53,7 @@ public abstract class EffectMap extends AbstractOb
values = new AtomicDoubleArray(effects.length);
this.effects = effects;
//noinspection unchecked
- kClass = (Class) effects.getClass().componentType();
+ kClass = (Class) effects.getClass().getComponentType();
clear(); // Set all values to default
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/effect/NormalizableEffect.java b/src/main/java/net/fokinatorr/sparkle/effect/NormalizableEffect.java
similarity index 94%
rename from src/main/java/ru/fokinatorr/sparkle/effect/NormalizableEffect.java
rename to src/main/java/net/fokinatorr/sparkle/effect/NormalizableEffect.java
index f3f1445..c955fdf 100644
--- a/src/main/java/ru/fokinatorr/sparkle/effect/NormalizableEffect.java
+++ b/src/main/java/net/fokinatorr/sparkle/effect/NormalizableEffect.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.effect;
+package net.fokinatorr.sparkle.effect;
/**
* An effect that supports normalizing its values.
diff --git a/src/main/java/ru/fokinatorr/sparkle/effect/graphics/GraphicEffect.java b/src/main/java/net/fokinatorr/sparkle/effect/graphics/GraphicEffect.java
similarity index 90%
rename from src/main/java/ru/fokinatorr/sparkle/effect/graphics/GraphicEffect.java
rename to src/main/java/net/fokinatorr/sparkle/effect/graphics/GraphicEffect.java
index 1a18bc4..b82629c 100644
--- a/src/main/java/ru/fokinatorr/sparkle/effect/graphics/GraphicEffect.java
+++ b/src/main/java/net/fokinatorr/sparkle/effect/graphics/GraphicEffect.java
@@ -1,11 +1,11 @@
-package ru.fokinatorr.sparkle.effect.graphics;
+package net.fokinatorr.sparkle.effect.graphics;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.experimental.FieldDefaults;
-import ru.fokinatorr.sparkle.effect.NormalizableEffect;
-import ru.fokinatorr.sparkle.util.Mth;
+import net.fokinatorr.sparkle.effect.NormalizableEffect;
+import net.fokinatorr.sparkle.util.Mth;
/**
* A graphic effect.
@@ -52,10 +52,10 @@ public enum GraphicEffect implements NormalizableEffect {
*/
BRIGHTNESS(-100, 100, false),
/**
- * The opacity graphic effect.
+ * The fade graphic effect. {@code 0} - fully opaque, {@code 100} - fully transparent.
* Note for Scratchers: This effect is similar to the "ghost" effect in Scratch.
*/
- OPACITY(0, 100, false);
+ FADE(0, 100, false);
/**
* The minimal value of this effect.
diff --git a/src/main/java/ru/fokinatorr/sparkle/effect/graphics/GraphicEffectMap.java b/src/main/java/net/fokinatorr/sparkle/effect/graphics/GraphicEffectMap.java
similarity index 80%
rename from src/main/java/ru/fokinatorr/sparkle/effect/graphics/GraphicEffectMap.java
rename to src/main/java/net/fokinatorr/sparkle/effect/graphics/GraphicEffectMap.java
index 6a5d86d..13c2a46 100644
--- a/src/main/java/ru/fokinatorr/sparkle/effect/graphics/GraphicEffectMap.java
+++ b/src/main/java/net/fokinatorr/sparkle/effect/graphics/GraphicEffectMap.java
@@ -1,7 +1,7 @@
-package ru.fokinatorr.sparkle.effect.graphics;
+package net.fokinatorr.sparkle.effect.graphics;
-import ru.fokinatorr.sparkle.effect.EffectMap;
-import ru.fokinatorr.sparkle.graphics.render.renderer.Renderable;
+import net.fokinatorr.sparkle.effect.EffectMap;
+import net.fokinatorr.sparkle.graphics.render.renderer.Renderable;
/**
* An effect map that stores a {@link Renderable}'s graphic effects.
diff --git a/src/main/java/ru/fokinatorr/sparkle/effect/graphics/GraphicEffectMap.java.bak b/src/main/java/net/fokinatorr/sparkle/effect/graphics/GraphicEffectMap.java.bak
similarity index 99%
rename from src/main/java/ru/fokinatorr/sparkle/effect/graphics/GraphicEffectMap.java.bak
rename to src/main/java/net/fokinatorr/sparkle/effect/graphics/GraphicEffectMap.java.bak
index 3b02dc6..40f04d3 100644
--- a/src/main/java/ru/fokinatorr/sparkle/effect/graphics/GraphicEffectMap.java.bak
+++ b/src/main/java/net/fokinatorr/sparkle/effect/graphics/GraphicEffectMap.java.bak
@@ -6,7 +6,7 @@ import it.unimi.dsi.fastutil.doubles.DoubleCollection;
import it.unimi.dsi.fastutil.doubles.DoubleIterator;
import it.unimi.dsi.fastutil.objects.*;
import lombok.Data;
-import ru.fokinatorr.sparkle.util.concurrent.atomic.AtomicDoubleArray;
+import atomic.concurrent.util.net.fokinatorr.sparkle.AtomicDoubleArray;
import java.util.Map;
import java.util.NoSuchElementException;
diff --git a/src/main/java/ru/fokinatorr/sparkle/effect/sounds/SoundEffect.java b/src/main/java/net/fokinatorr/sparkle/effect/sounds/SoundEffect.java
similarity index 90%
rename from src/main/java/ru/fokinatorr/sparkle/effect/sounds/SoundEffect.java
rename to src/main/java/net/fokinatorr/sparkle/effect/sounds/SoundEffect.java
index 89ecfba..e7af1cb 100644
--- a/src/main/java/ru/fokinatorr/sparkle/effect/sounds/SoundEffect.java
+++ b/src/main/java/net/fokinatorr/sparkle/effect/sounds/SoundEffect.java
@@ -1,11 +1,11 @@
-package ru.fokinatorr.sparkle.effect.sounds;
+package net.fokinatorr.sparkle.effect.sounds;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.experimental.FieldDefaults;
-import ru.fokinatorr.sparkle.effect.NormalizableEffect;
-import ru.fokinatorr.sparkle.util.Mth;
+import net.fokinatorr.sparkle.effect.NormalizableEffect;
+import net.fokinatorr.sparkle.util.Mth;
/**
* A sound effect.
diff --git a/src/main/java/ru/fokinatorr/sparkle/effect/sounds/SoundEffectMap.java b/src/main/java/net/fokinatorr/sparkle/effect/sounds/SoundEffectMap.java
similarity index 86%
rename from src/main/java/ru/fokinatorr/sparkle/effect/sounds/SoundEffectMap.java
rename to src/main/java/net/fokinatorr/sparkle/effect/sounds/SoundEffectMap.java
index 4e2cf77..e0664fc 100644
--- a/src/main/java/ru/fokinatorr/sparkle/effect/sounds/SoundEffectMap.java
+++ b/src/main/java/net/fokinatorr/sparkle/effect/sounds/SoundEffectMap.java
@@ -1,6 +1,6 @@
-package ru.fokinatorr.sparkle.effect.sounds;
+package net.fokinatorr.sparkle.effect.sounds;
-import ru.fokinatorr.sparkle.effect.EffectMap;
+import net.fokinatorr.sparkle.effect.EffectMap;
/**
* An effect map that stores sound effects.
diff --git a/src/main/java/ru/fokinatorr/sparkle/event/AbstractCancellableEvent.java b/src/main/java/net/fokinatorr/sparkle/event/AbstractCancellableEvent.java
similarity index 95%
rename from src/main/java/ru/fokinatorr/sparkle/event/AbstractCancellableEvent.java
rename to src/main/java/net/fokinatorr/sparkle/event/AbstractCancellableEvent.java
index f5416d2..a327bae 100644
--- a/src/main/java/ru/fokinatorr/sparkle/event/AbstractCancellableEvent.java
+++ b/src/main/java/net/fokinatorr/sparkle/event/AbstractCancellableEvent.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.event;
+package net.fokinatorr.sparkle.event;
/**
* This class provides the functionality of a cancellable event.
diff --git a/src/main/java/ru/fokinatorr/sparkle/event/BackdropChangeEvent.java b/src/main/java/net/fokinatorr/sparkle/event/BackdropChangeEvent.java
similarity index 97%
rename from src/main/java/ru/fokinatorr/sparkle/event/BackdropChangeEvent.java
rename to src/main/java/net/fokinatorr/sparkle/event/BackdropChangeEvent.java
index 6b4d6cf..b5e0ca5 100644
--- a/src/main/java/ru/fokinatorr/sparkle/event/BackdropChangeEvent.java
+++ b/src/main/java/net/fokinatorr/sparkle/event/BackdropChangeEvent.java
@@ -1,10 +1,10 @@
-package ru.fokinatorr.sparkle.event;
+package net.fokinatorr.sparkle.event;
import lombok.EqualsAndHashCode;
import lombok.NonNull;
import lombok.Value;
import lombok.experimental.NonFinal;
-import ru.fokinatorr.sparkle.stage.Stage;
+import net.fokinatorr.sparkle.stage.Stage;
import java.util.Objects;
diff --git a/src/main/java/ru/fokinatorr/sparkle/event/CancellableEvent.java b/src/main/java/net/fokinatorr/sparkle/event/CancellableEvent.java
similarity index 76%
rename from src/main/java/ru/fokinatorr/sparkle/event/CancellableEvent.java
rename to src/main/java/net/fokinatorr/sparkle/event/CancellableEvent.java
index 9e962ae..c249f78 100644
--- a/src/main/java/ru/fokinatorr/sparkle/event/CancellableEvent.java
+++ b/src/main/java/net/fokinatorr/sparkle/event/CancellableEvent.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.event;
+package net.fokinatorr.sparkle.event;
/**
* Represents a cancellable event.
@@ -12,8 +12,8 @@ public interface CancellableEvent extends Event {
boolean isCancelled();
/**
- * Cancels this event. After that, the {@link #isCancelled()} method should not return {@code false} for this
- * event instance ever again.
+ * Cancels this event. After that, the {@link #isCancelled()} method should never return {@code false} for this
+ * event instance again.
*/
void cancel();
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/event/Event.java b/src/main/java/net/fokinatorr/sparkle/event/Event.java
similarity index 88%
rename from src/main/java/ru/fokinatorr/sparkle/event/Event.java
rename to src/main/java/net/fokinatorr/sparkle/event/Event.java
index ec6fc8a..7cf8ee8 100644
--- a/src/main/java/ru/fokinatorr/sparkle/event/Event.java
+++ b/src/main/java/net/fokinatorr/sparkle/event/Event.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.event;
+package net.fokinatorr.sparkle.event;
/**
* Marker interface for all events, like starting or keyboard/mouse events.
diff --git a/src/main/java/ru/fokinatorr/sparkle/event/MessageEvent.java b/src/main/java/net/fokinatorr/sparkle/event/MessageEvent.java
similarity index 72%
rename from src/main/java/ru/fokinatorr/sparkle/event/MessageEvent.java
rename to src/main/java/net/fokinatorr/sparkle/event/MessageEvent.java
index 02cb5bf..32f9229 100644
--- a/src/main/java/ru/fokinatorr/sparkle/event/MessageEvent.java
+++ b/src/main/java/net/fokinatorr/sparkle/event/MessageEvent.java
@@ -1,11 +1,11 @@
-package ru.fokinatorr.sparkle.event;
+package net.fokinatorr.sparkle.event;
import lombok.NonNull;
import java.util.Optional;
/**
- * This event is fired when a message is broadcasted.
+ * This event is fired when a message is broadcasted (from user code).
*
Note for Scratchers: This event is similar to "when I receive [ v]" event in Scratch.
*
* @param messageId the message's ID. Not necessary to be registered, unlike in Scratch.
@@ -17,8 +17,8 @@ public record MessageEvent(
) implements Event {
/**
- * Creates a new {@code MessageEvent}. This is an alternative constructor which constructs an {@link Optional}
- * by itself.
+ * Creates a new {@code MessageEvent}. This is an alternate constructor which constructs an {@link Optional}
+ * fron the given received data object.
* @param messageId the message's ID
* @param receivedData the received data; may be {@code null}
* @throws NullPointerException if message ID is {@code null}
@@ -35,4 +35,12 @@ public record MessageEvent(
public MessageEvent(String messageId) {
this(messageId, Optional.empty());
}
+
+ /**
+ *
+ * @return
+ */
+ public boolean hasReceivedData() {
+ return receivedData.isPresent();
+ }
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/event/annotation/EventListener.java b/src/main/java/net/fokinatorr/sparkle/event/annotation/EventListener.java
similarity index 91%
rename from src/main/java/ru/fokinatorr/sparkle/event/annotation/EventListener.java
rename to src/main/java/net/fokinatorr/sparkle/event/annotation/EventListener.java
index 77347ed..22aaa0d 100644
--- a/src/main/java/ru/fokinatorr/sparkle/event/annotation/EventListener.java
+++ b/src/main/java/net/fokinatorr/sparkle/event/annotation/EventListener.java
@@ -1,7 +1,7 @@
-package ru.fokinatorr.sparkle.event.annotation;
+package net.fokinatorr.sparkle.event.annotation;
-import ru.fokinatorr.sparkle.event.Event;
-import ru.fokinatorr.sparkle.event.dispatcher.EventDispatcher;
+import net.fokinatorr.sparkle.event.Event;
+import net.fokinatorr.sparkle.event.dispatcher.EventDispatcher;
import java.lang.annotation.*;
import java.lang.reflect.InaccessibleObjectException;
diff --git a/src/main/java/ru/fokinatorr/sparkle/event/dispatcher/EventDispatcher.java b/src/main/java/net/fokinatorr/sparkle/event/dispatcher/EventDispatcher.java
similarity index 94%
rename from src/main/java/ru/fokinatorr/sparkle/event/dispatcher/EventDispatcher.java
rename to src/main/java/net/fokinatorr/sparkle/event/dispatcher/EventDispatcher.java
index 68e8ad6..56c540a 100644
--- a/src/main/java/ru/fokinatorr/sparkle/event/dispatcher/EventDispatcher.java
+++ b/src/main/java/net/fokinatorr/sparkle/event/dispatcher/EventDispatcher.java
@@ -1,10 +1,10 @@
-package ru.fokinatorr.sparkle.event.dispatcher;
+package net.fokinatorr.sparkle.event.dispatcher;
-import ru.fokinatorr.sparkle.event.Event;
-import ru.fokinatorr.sparkle.event.annotation.EventListener;
-import ru.fokinatorr.sparkle.event.dispatcher.impl.DefaultEventDispatcher;
-import ru.fokinatorr.sparkle.event.input.MouseEvent;
-import ru.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
+import net.fokinatorr.sparkle.event.Event;
+import net.fokinatorr.sparkle.event.annotation.EventListener;
+import net.fokinatorr.sparkle.event.dispatcher.impl.DefaultEventDispatcher;
+import net.fokinatorr.sparkle.event.input.MouseEvent;
+import net.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
import java.lang.reflect.InaccessibleObjectException;
import java.util.concurrent.CompletableFuture;
diff --git a/src/main/java/ru/fokinatorr/sparkle/event/dispatcher/ListenerRemover.java b/src/main/java/net/fokinatorr/sparkle/event/dispatcher/ListenerRemover.java
similarity index 96%
rename from src/main/java/ru/fokinatorr/sparkle/event/dispatcher/ListenerRemover.java
rename to src/main/java/net/fokinatorr/sparkle/event/dispatcher/ListenerRemover.java
index dddabbe..cb9b73f 100644
--- a/src/main/java/ru/fokinatorr/sparkle/event/dispatcher/ListenerRemover.java
+++ b/src/main/java/net/fokinatorr/sparkle/event/dispatcher/ListenerRemover.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.event.dispatcher;
+package net.fokinatorr.sparkle.event.dispatcher;
import java.util.Objects;
diff --git a/src/main/java/ru/fokinatorr/sparkle/event/dispatcher/impl/DefaultEventDispatcher.java b/src/main/java/net/fokinatorr/sparkle/event/dispatcher/impl/DefaultEventDispatcher.java
similarity index 94%
rename from src/main/java/ru/fokinatorr/sparkle/event/dispatcher/impl/DefaultEventDispatcher.java
rename to src/main/java/net/fokinatorr/sparkle/event/dispatcher/impl/DefaultEventDispatcher.java
index ebc0feb..64d3768 100644
--- a/src/main/java/ru/fokinatorr/sparkle/event/dispatcher/impl/DefaultEventDispatcher.java
+++ b/src/main/java/net/fokinatorr/sparkle/event/dispatcher/impl/DefaultEventDispatcher.java
@@ -1,15 +1,15 @@
-package ru.fokinatorr.sparkle.event.dispatcher.impl;
+package net.fokinatorr.sparkle.event.dispatcher.impl;
import it.unimi.dsi.fastutil.bytes.Byte2ObjectRBTreeMap;
import it.unimi.dsi.fastutil.bytes.Byte2ObjectSortedMap;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
-import ru.fokinatorr.sparkle.event.Event;
-import ru.fokinatorr.sparkle.event.annotation.EventListener;
-import ru.fokinatorr.sparkle.event.dispatcher.EventDispatcher;
-import ru.fokinatorr.sparkle.event.dispatcher.ListenerRemover;
-import ru.fokinatorr.sparkle.util.concurrent.ContextInheritingThreadFactory;
-import ru.fokinatorr.sparkle.util.concurrent.ThreadType;
+import net.fokinatorr.sparkle.event.Event;
+import net.fokinatorr.sparkle.event.annotation.EventListener;
+import net.fokinatorr.sparkle.event.dispatcher.EventDispatcher;
+import net.fokinatorr.sparkle.event.dispatcher.ListenerRemover;
+import net.fokinatorr.sparkle.util.concurrent.ContextInheritingThreadFactory;
+import net.fokinatorr.sparkle.util.concurrent.ThreadType;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -219,10 +219,10 @@ public class DefaultEventDispatcher implements EventDispatcher {
// If there was such a listener, call remove and then add to replace the priority
set.remove(listener);
set.add(listener);
- log.info("Registered a listener for event {}: {}", eventClass.getName(), listener);
+ log.debug("Registered a listener for event {}: {}", eventClass.getName(), listener);
return () -> {
set.remove(listener);
- log.info("Unregistered a listener for event {}: {}", eventClass.getName(), listener);
+ log.debug("Unregistered a listener for event {}: {}", eventClass.getName(), listener);
};
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/event/input/InputEvent.java b/src/main/java/net/fokinatorr/sparkle/event/input/InputEvent.java
similarity index 66%
rename from src/main/java/ru/fokinatorr/sparkle/event/input/InputEvent.java
rename to src/main/java/net/fokinatorr/sparkle/event/input/InputEvent.java
index 1fcbe2c..e1a6801 100644
--- a/src/main/java/ru/fokinatorr/sparkle/event/input/InputEvent.java
+++ b/src/main/java/net/fokinatorr/sparkle/event/input/InputEvent.java
@@ -1,7 +1,7 @@
-package ru.fokinatorr.sparkle.event.input;
+package net.fokinatorr.sparkle.event.input;
-import ru.fokinatorr.sparkle.event.Event;
-import ru.fokinatorr.sparkle.stage.Stage;
+import net.fokinatorr.sparkle.event.Event;
+import net.fokinatorr.sparkle.stage.Stage;
/**
* Base interface for events representing a user input (keyboard, mouse, etc.)
diff --git a/src/main/java/ru/fokinatorr/sparkle/event/input/Key.java b/src/main/java/net/fokinatorr/sparkle/event/input/Key.java
similarity index 99%
rename from src/main/java/ru/fokinatorr/sparkle/event/input/Key.java
rename to src/main/java/net/fokinatorr/sparkle/event/input/Key.java
index 5cf8f77..904d712 100644
--- a/src/main/java/ru/fokinatorr/sparkle/event/input/Key.java
+++ b/src/main/java/net/fokinatorr/sparkle/event/input/Key.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.event.input;
+package net.fokinatorr.sparkle.event.input;
import lombok.AccessLevel;
import lombok.Getter;
diff --git a/src/main/java/ru/fokinatorr/sparkle/event/input/KeyboardEvent.java b/src/main/java/net/fokinatorr/sparkle/event/input/KeyboardEvent.java
similarity index 98%
rename from src/main/java/ru/fokinatorr/sparkle/event/input/KeyboardEvent.java
rename to src/main/java/net/fokinatorr/sparkle/event/input/KeyboardEvent.java
index 0905233..f19fc39 100644
--- a/src/main/java/ru/fokinatorr/sparkle/event/input/KeyboardEvent.java
+++ b/src/main/java/net/fokinatorr/sparkle/event/input/KeyboardEvent.java
@@ -1,8 +1,7 @@
-package ru.fokinatorr.sparkle.event.input;
+package net.fokinatorr.sparkle.event.input;
import lombok.NonNull;
-import lombok.experimental.NonFinal;
-import ru.fokinatorr.sparkle.stage.Stage;
+import net.fokinatorr.sparkle.stage.Stage;
import java.util.Locale;
import java.util.Objects;
diff --git a/src/main/java/ru/fokinatorr/sparkle/event/input/MouseButton.java b/src/main/java/net/fokinatorr/sparkle/event/input/MouseButton.java
similarity index 89%
rename from src/main/java/ru/fokinatorr/sparkle/event/input/MouseButton.java
rename to src/main/java/net/fokinatorr/sparkle/event/input/MouseButton.java
index 8fc5673..a35e033 100644
--- a/src/main/java/ru/fokinatorr/sparkle/event/input/MouseButton.java
+++ b/src/main/java/net/fokinatorr/sparkle/event/input/MouseButton.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.event.input;
+package net.fokinatorr.sparkle.event.input;
/**
* Represents a mouse button.
diff --git a/src/main/java/ru/fokinatorr/sparkle/event/input/MouseEvent.java b/src/main/java/net/fokinatorr/sparkle/event/input/MouseEvent.java
similarity index 97%
rename from src/main/java/ru/fokinatorr/sparkle/event/input/MouseEvent.java
rename to src/main/java/net/fokinatorr/sparkle/event/input/MouseEvent.java
index 56c09f0..54967d8 100644
--- a/src/main/java/ru/fokinatorr/sparkle/event/input/MouseEvent.java
+++ b/src/main/java/net/fokinatorr/sparkle/event/input/MouseEvent.java
@@ -1,8 +1,8 @@
-package ru.fokinatorr.sparkle.event.input;
+package net.fokinatorr.sparkle.event.input;
import lombok.NonNull;
-import ru.fokinatorr.sparkle.phys2d.Point2D;
-import ru.fokinatorr.sparkle.stage.Stage;
+import net.fokinatorr.sparkle.phys2d.Point2D;
+import net.fokinatorr.sparkle.stage.Stage;
import java.util.Collections;
import java.util.EnumSet;
@@ -23,13 +23,13 @@ public sealed interface MouseEvent extends InputEvent
Stage stage();
/**
- * Returns the X coordinate on the stage where this event was performed.
+ * Returns the X coordinate on the stage where this event was performed. {@code 0} is leftmost coordinate.
* @return the X coordinate
*/
double x();
/**
- * Returns the Y coordinate on the stage where this event was performed.
+ * Returns the Y coordinate on the stage where this event was performed. {@code 0} is topmost coordinate.
* @return the Y coordinate
*/
double y();
diff --git a/src/main/java/net/fokinatorr/sparkle/event/lifecycle/CloseRequestedEvent.java b/src/main/java/net/fokinatorr/sparkle/event/lifecycle/CloseRequestedEvent.java
new file mode 100644
index 0000000..88ad7b5
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/event/lifecycle/CloseRequestedEvent.java
@@ -0,0 +1,32 @@
+package net.fokinatorr.sparkle.event.lifecycle;
+
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.RequiredArgsConstructor;
+import lombok.Value;
+import net.fokinatorr.sparkle.event.AbstractCancellableEvent;
+import net.fokinatorr.sparkle.event.lifecycle.StageStateChangeEvent.StopEvent;
+import net.fokinatorr.sparkle.graphics.render.RenderingContext;
+import net.fokinatorr.sparkle.graphics.render.surface.RenderingSurface;
+
+import static lombok.AccessLevel.NONE;
+
+/**
+ * This event is fired every when a {@link RenderingContext} has been implicitly requested to close
+ * (e.g. with the window's 'X' button or Alt+F4). Cancelling an instance of this event results
+ * in the respective context not being closed.
+ *
This event is fired before a {@link StopEvent}.
+ * @see RenderingContext#setShouldClose()
+ * @see RenderingSurface#shouldClose()
+ */
+@Value
+@EqualsAndHashCode(callSuper = true)
+@AllArgsConstructor(access = NONE)
+@RequiredArgsConstructor
+public class CloseRequestedEvent extends AbstractCancellableEvent {
+
+ /**
+ * The context for which a close was requested.
+ */
+ RenderingContext context;
+}
diff --git a/src/main/java/ru/fokinatorr/sparkle/event/lifecycle/StageStateChangeEvent.java b/src/main/java/net/fokinatorr/sparkle/event/lifecycle/StageStateChangeEvent.java
similarity index 87%
rename from src/main/java/ru/fokinatorr/sparkle/event/lifecycle/StageStateChangeEvent.java
rename to src/main/java/net/fokinatorr/sparkle/event/lifecycle/StageStateChangeEvent.java
index ff1d64c..9bb8ec5 100644
--- a/src/main/java/ru/fokinatorr/sparkle/event/lifecycle/StageStateChangeEvent.java
+++ b/src/main/java/net/fokinatorr/sparkle/event/lifecycle/StageStateChangeEvent.java
@@ -1,8 +1,8 @@
-package ru.fokinatorr.sparkle.event.lifecycle;
+package net.fokinatorr.sparkle.event.lifecycle;
import lombok.Value;
-import ru.fokinatorr.sparkle.event.Event;
-import ru.fokinatorr.sparkle.stage.Stage;
+import net.fokinatorr.sparkle.event.Event;
+import net.fokinatorr.sparkle.stage.Stage;
/**
* Base interface for events that are fired when a stage's state is changed.
@@ -65,7 +65,8 @@ public sealed interface StageStateChangeEvent extends Event
// There is no event for pause button; it just calls DebugUtils.debugSuspend()
/**
- * This event is fired when the stop button is clicked, or
+ * This event is fired when the stop button is clicked, or the stage was closed.
+ *
To intercept stage closing, use {@link CloseRequestedEvent}.
*/
@Value
class StopEvent implements StageStateChangeEvent {
diff --git a/src/main/java/ru/fokinatorr/sparkle/event/lifecycle/TickEvent.java b/src/main/java/net/fokinatorr/sparkle/event/lifecycle/TickEvent.java
similarity index 82%
rename from src/main/java/ru/fokinatorr/sparkle/event/lifecycle/TickEvent.java
rename to src/main/java/net/fokinatorr/sparkle/event/lifecycle/TickEvent.java
index 7813d5f..f0be6f1 100644
--- a/src/main/java/ru/fokinatorr/sparkle/event/lifecycle/TickEvent.java
+++ b/src/main/java/net/fokinatorr/sparkle/event/lifecycle/TickEvent.java
@@ -1,10 +1,10 @@
-package ru.fokinatorr.sparkle.event.lifecycle;
+package net.fokinatorr.sparkle.event.lifecycle;
import lombok.*;
-import ru.fokinatorr.sparkle.event.AbstractCancellableEvent;
-import ru.fokinatorr.sparkle.internal.access.EventLifecycleAccess;
-import ru.fokinatorr.sparkle.internal.access.SharedSecrets;
-import ru.fokinatorr.sparkle.stage.Stage;
+import net.fokinatorr.sparkle.event.AbstractCancellableEvent;
+import net.fokinatorr.sparkle.internal.access.EventLifecycleAccess;
+import net.fokinatorr.sparkle.internal.access.SharedSecrets;
+import net.fokinatorr.sparkle.stage.Stage;
import static lombok.AccessLevel.NONE;
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/ARGB.java b/src/main/java/net/fokinatorr/sparkle/graphics/ARGB.java
similarity index 96%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/ARGB.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/ARGB.java
index 9340c82..0780ffe 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/ARGB.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/ARGB.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.graphics;
+package net.fokinatorr.sparkle.graphics;
import lombok.experimental.UtilityClass;
@@ -159,6 +159,17 @@ public class ARGB {
return /* 0x00000000 | */(red & 0xFF) << 16 | (green & 0xFF) << 8 | blue & 0xFF;
}
+ /**
+ * Returns a hexadecimal color notation string representation of the given color. That is,
+ *
{@code #AARRGGBB}
+ * where each letter pair represents one component value in hexadecimal notation.
+ * @param color the color
+ * @return the color's string representation
+ */
+ public String toString(int color) {
+ return "#%08X".formatted(color);
+ }
+
// Blending
/**
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/BlendMode.java b/src/main/java/net/fokinatorr/sparkle/graphics/BlendMode.java
similarity index 93%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/BlendMode.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/BlendMode.java
index 2b03692..4001011 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/BlendMode.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/BlendMode.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.graphics;
+package net.fokinatorr.sparkle.graphics;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -15,6 +15,10 @@ import static lombok.AccessLevel.PRIVATE;
@RequiredArgsConstructor
@FieldDefaults(makeFinal = true, level = PRIVATE)
public enum BlendMode {
+ /**
+ * Standard blending, dependent on the graphics backend used.
+ */
+ NORMAL((_, b)->b, BlendType.ARGB),
/**
* Sums the colors' components.
* Suitable for glow and lighting effects.
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/GraphicsManager.java b/src/main/java/net/fokinatorr/sparkle/graphics/GraphicsManager.java
similarity index 72%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/GraphicsManager.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/GraphicsManager.java
index baa51db..fdc918c 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/GraphicsManager.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/GraphicsManager.java
@@ -1,15 +1,13 @@
-package ru.fokinatorr.sparkle.graphics;
+package net.fokinatorr.sparkle.graphics;
-import it.unimi.dsi.fastutil.Pair;
-import ru.fokinatorr.sparkle.audio.SoundInstance;
-import ru.fokinatorr.sparkle.graphics.image.Image;
-import ru.fokinatorr.sparkle.graphics.render.RenderingContext;
-import ru.fokinatorr.sparkle.graphics.render.surface.EmbeddedSurface;
-import ru.fokinatorr.sparkle.graphics.render.surface.RenderingSurface;
-import ru.fokinatorr.sparkle.graphics.render.surface.WindowSurface;
-import ru.fokinatorr.sparkle.stage.Stage;
-import ru.fokinatorr.sparkle.stage.StageCreator;
-import ru.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
+import net.fokinatorr.sparkle.graphics.image.Image;
+import net.fokinatorr.sparkle.graphics.render.RenderingContext;
+import net.fokinatorr.sparkle.graphics.render.surface.EmbeddedSurface;
+import net.fokinatorr.sparkle.graphics.render.surface.RenderingSurface;
+import net.fokinatorr.sparkle.graphics.render.surface.WindowSurface;
+import net.fokinatorr.sparkle.stage.Stage;
+import net.fokinatorr.sparkle.stage.StageCreator;
+import net.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
import java.nio.file.Path;
@@ -25,29 +23,33 @@ public interface GraphicsManager extends NonThrowingAutoCloseable {
/**
* Creates a new rendering context with a {@link WindowSurface} and a stage created using the given creator.
+ * The window will be initially hidden, non-resizable and non-fullscreen in the default implementation, and have the size of the {@link Stage} created
+ * using the given {@link StageCreator}. The window can be shown with {@link RenderingSurface#show()}.
*
- * @param title window title
+ * @param title initial window title
* @param stageCreator a stage creation strategy
- * @return a new rendering context and a stage bound to it
+ * @return a new rendering context
* @throws IllegalStateException if graphics manager is closed
* @throws NullPointerException if any argument is {@code null}
*/
- default Pair createWindowContext(String title, StageCreator stageCreator) {
+ default RenderingContext createWindowContext(String title, StageCreator stageCreator) {
return createWindowContext(title, stageCreator, false, false);
}
/**
* Creates a new rendering context with a {@link WindowSurface} and a stage created using the given creator.
+ * The window will be initially hidden and non-resizable in the default implementation, and have the size of the {@link Stage} created
+ * using the given {@link StageCreator}. The window can be shown with {@link RenderingSurface#show()}.
*
* @param title window title
* @param stageCreator a stage creation strategy
- * @param translucent whether the window should be transparent
+ * @param translucent whether the window should be transparent (not changeable after creation!)
* @param fullscreen whether the window should be fullscreen
- * @return a new rendering context and a stage bound to it
+ * @return a new rendering context
* @throws IllegalStateException if graphics manager is closed
* @throws NullPointerException if any argument is {@code null}
*/
- Pair createWindowContext(String title, StageCreator stageCreator, boolean translucent, boolean fullscreen);
+ RenderingContext createWindowContext(String title, StageCreator stageCreator, boolean translucent, boolean fullscreen);
/**
* Creates a new rendering context with the given embedded rendering surface and a stage created using the given creator.
@@ -55,11 +57,11 @@ public interface GraphicsManager extends NonThrowingAutoCloseable {
*
* @param surface the surface to render on
* @param stageCreator a stage creation strategy
- * @return a new rendering context and a stage bound to it
+ * @return a new rendering context
* @throws IllegalStateException if graphics manager is closed
* @throws NullPointerException if any argument is {@code null}
*/
- Pair createEmbeddedContext(EmbeddedSurface surface, StageCreator stageCreator);
+ RenderingContext createEmbeddedContext(EmbeddedSurface surface, StageCreator stageCreator);
/**
* Returns an existing rendering context bound to the given stage.
@@ -134,4 +136,12 @@ public interface GraphicsManager extends NonThrowingAutoCloseable {
* @throws IllegalStateException if graphics manager is closed
*/
void tick();
+
+ /**
+ * {@inheritDoc}
+ * After calling this method, the graphics manager must not be used.
+ * Calling this method more than once does not have any effect.
+ */
+ @Override
+ void close();
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/PixelReader.java b/src/main/java/net/fokinatorr/sparkle/graphics/PixelReader.java
similarity index 86%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/PixelReader.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/PixelReader.java
index 32fa810..7cd23c3 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/PixelReader.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/PixelReader.java
@@ -1,14 +1,14 @@
-package ru.fokinatorr.sparkle.graphics;
+package net.fokinatorr.sparkle.graphics;
-import ru.fokinatorr.sparkle.graphics.image.Image;
-import ru.fokinatorr.sparkle.graphics.render.framebuffer.Framebuffer;
-import ru.fokinatorr.sparkle.phys2d.Point2D;
+import net.fokinatorr.sparkle.graphics.image.RasterImage;
+import net.fokinatorr.sparkle.graphics.render.framebuffer.OffscreenFramebuffer;
+import net.fokinatorr.sparkle.phys2d.Point2D;
/**
* Allows reading pixel data from an image/framebuffer in ARGB format.
* @see ARGB
- * @see Image#createPixelReader()
- * @see Framebuffer#createPixelReader()
+ * @see RasterImage#createPixelReader()
+ * @see OffscreenFramebuffer#createPixelReader()
*/
public interface PixelReader {
/**
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/PixelWriter.java b/src/main/java/net/fokinatorr/sparkle/graphics/PixelWriter.java
similarity index 81%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/PixelWriter.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/PixelWriter.java
index f4682b3..23060df 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/PixelWriter.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/PixelWriter.java
@@ -1,15 +1,24 @@
-package ru.fokinatorr.sparkle.graphics;
+package net.fokinatorr.sparkle.graphics;
-import ru.fokinatorr.sparkle.graphics.render.framebuffer.Framebuffer;
-
-import java.awt.image.BufferedImage;
+import net.fokinatorr.sparkle.graphics.render.framebuffer.OffscreenFramebuffer;
/**
* Allows modifying pixel data of an image/framebuffer in ARGB format.
* @see ARGB
- * @see Framebuffer#createPixelWriter()
+ * @see OffscreenFramebuffer#createPixelWriter()
*/
public interface PixelWriter {
+ /**
+ * Returns the width of underlying image data.
+ * @return the width, always positive
+ */
+ int getWidth();
+ /**
+ * Returns the height of underlying image data.
+ * @return the height, always positive
+ */
+ int getHeight();
+
/**
* Sets a single pixel.
* @param x the X coordinate
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/font/FilesystemFontProvider.java b/src/main/java/net/fokinatorr/sparkle/graphics/font/FilesystemFontProvider.java
similarity index 98%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/font/FilesystemFontProvider.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/font/FilesystemFontProvider.java
index 4710569..a8960d7 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/font/FilesystemFontProvider.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/font/FilesystemFontProvider.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.graphics.font;
+package net.fokinatorr.sparkle.graphics.font;
import it.unimi.dsi.fastutil.Pair;
import it.unimi.dsi.fastutil.objects.ObjectReferenceImmutablePair;
@@ -99,7 +99,6 @@ public class FilesystemFontProvider implements FontProvider {
Path ttfPath = baseDir.resolve(actualFamily)
.resolve(actualPosture.name().toLowerCase())
.resolve(actualWeight.name().toLowerCase() + ".ttf");
- log.trace("Resolved font: {} -> {}", params, baseDir.relativize(ttfPath));
return ttfPath.toAbsolutePath();
});
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/font/Font.java b/src/main/java/net/fokinatorr/sparkle/graphics/font/Font.java
similarity index 99%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/font/Font.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/font/Font.java
index 34f83e2..927d9f6 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/font/Font.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/font/Font.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.graphics.font;
+package net.fokinatorr.sparkle.graphics.font;
import lombok.Builder;
import lombok.NonNull;
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/font/FontPosture.java b/src/main/java/net/fokinatorr/sparkle/graphics/font/FontPosture.java
similarity index 65%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/font/FontPosture.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/font/FontPosture.java
index da629fc..f97f6af 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/font/FontPosture.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/font/FontPosture.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.graphics.font;
+package net.fokinatorr.sparkle.graphics.font;
/**
* A font's postural style.
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/font/FontProvider.java b/src/main/java/net/fokinatorr/sparkle/graphics/font/FontProvider.java
similarity index 92%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/font/FontProvider.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/font/FontProvider.java
index b562b63..ceae7aa 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/font/FontProvider.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/font/FontProvider.java
@@ -1,6 +1,6 @@
-package ru.fokinatorr.sparkle.graphics.font;
+package net.fokinatorr.sparkle.graphics.font;
-import ru.fokinatorr.sparkle.util.Constants;
+import net.fokinatorr.sparkle.util.Constants;
import java.nio.file.Path;
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/font/FontWeight.java b/src/main/java/net/fokinatorr/sparkle/graphics/font/FontWeight.java
similarity index 98%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/font/FontWeight.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/font/FontWeight.java
index 496abce..94cb489 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/font/FontWeight.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/font/FontWeight.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.graphics.font;
+package net.fokinatorr.sparkle.graphics.font;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectMaps;
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/image/Image.java b/src/main/java/net/fokinatorr/sparkle/graphics/image/Image.java
new file mode 100644
index 0000000..4bee5f4
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/image/Image.java
@@ -0,0 +1,133 @@
+package net.fokinatorr.sparkle.graphics.image;
+
+import net.fokinatorr.sparkle.graphics.GraphicsManager;
+import net.fokinatorr.sparkle.graphics.render.RenderCanvas;
+
+import java.nio.file.Path;
+
+/**
+ * An immutable image that can be rendered on a canvas.
+ *
+ * This interface abstracts over various image formats (raster, vector, procedural)
+ * and enables uniform handling across rendering pipelines. Implementations may represent:
+ *
+ * Raster images (PNG, JPEG)
+ * Vector graphics (SVG)
+ * Dynamic/procedural textures
+ *
+ *
+ * Resource Management
+ * Images are lazy : they do not load their data until {@link #prepare()} is called.
+ * This allows efficient handling of large or rarely used assets.
+ *
+ * The image itself does not manage GPU resources (like textures) — that is the responsibility
+ * of the graphics engine.
+ * Therefore, implementations should not hold native GPU memory.
+ *
+ * Some images, however, may hold native non-GPU memory, so they have to be unloaded manually
+ * once no longer used.
+ *
+ *
Lifecycle
+ * It's best to load images through {@link GraphicsManager}'s methods for automatic resource management. If there's a need to do
+ * it manually, though, here's how:
+ *
+ * Create image (e.g., from file or stream)
+ * Call {@link #prepare()} before drawing
+ * Draw via {@link RenderCanvas#drawImage}
+ * Call {@link #unload()} when no longer needed
+ *
+ *
+ * Thread Safety
+ * Implementations must be safe to pass between threads, but are not required to support
+ * concurrent drawing from multiple canvases unless explicitly documented.
+ *
+ * @see RasterImage
+ * @see VectorImage
+ * @see GraphicsManager#loadImage(Path, boolean)
+ * @see GraphicsManager#getLoadedImage(Path)
+ * @see GraphicsManager#hasLoadedImage(Path)
+ * @see GraphicsManager#destroyImage(Path)
+ */
+public sealed interface Image permits RasterImage, VectorImage {
+
+ /**
+ * Prepares the image for rendering.
+ *
+ * This may involve:
+ *
+ * Lazy decoding of compressed data
+ * Rasterization of vector content
+ *
+ * etc.
+ * Once the image is done preparing:
+ *
+ * {@link #isReady()} returns {@code true}
+ * {@link #unload()} may be used to unload the data
+ *
+ *
+ * Idempotent: calling multiple times has no additional effect.
+ */
+ void prepare();
+
+ /**
+ * Checks whether this image is ready to be drawn.
+ *
+ * Returns {@code false} only if:
+ *
+ * The image is still loading asynchronously
+ * Required resources failed to load
+ * {@link #prepare()} has never been called or hasn't been called after unloading
+ * The image has been previously unloaded with {@link #unload()}
+ *
+ *
+ * @return true if safe to pass to {@link RenderCanvas#drawImage RenderCanvas.drawImage()}
+ */
+ boolean isReady();
+
+ /**
+ * Unloads internal data associated with this image.
+ *
+ * After calling this method:
+ *
+ * {@link #isReady()} returns {@code false}
+ * Subsequent calls to {@link #prepare()} may reload the data
+ *
+ *
+ * Idempotent: calling multiple times has no effect.
+ */
+ void unload();
+
+ /**
+ * {@return the intrinsic width of this image}
+ * Intrinsic Size
+ * Intrinsic size refers to the source's original dimensions. The actual dimensions are able to change depending
+ * on scaling and resolution. Examples:
+ *
+ * Raster images have a fixed size and their intrinsic size is equal to that size;
+ * Vector images have a dynamic resolution due to vector shapes being defined as paths, but the intrinsic size is
+ * typically set (e.g. {@code } element has attributes "width" & "height").
+ *
+ * @see #getIntrinsicHeight()
+ */
+ double getIntrinsicWidth();
+
+ /**
+ * {@return the intrinsic height of this image}
+ * See the definition of {@linkplain Image##intrinsic_size intrinsic size}.
+ * @see #getIntrinsicWidth()
+ */
+ double getIntrinsicHeight();
+
+ /**
+ * Optional hint about the MIME type of this image.
+ *
+ * Examples: {@code "image/png"}, {@code "image/svg+xml"}
+ *
+ * May return {@code null} if unknown or irrelevant (e.g. procedural images).
+ *
+ * @return the MIME type, or null if unavailable
+ */
+ default String getMimeType() {
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/image/RasterImage.java b/src/main/java/net/fokinatorr/sparkle/graphics/image/RasterImage.java
new file mode 100644
index 0000000..f894d32
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/image/RasterImage.java
@@ -0,0 +1,46 @@
+package net.fokinatorr.sparkle.graphics.image;
+
+import net.fokinatorr.sparkle.graphics.ARGB;
+import net.fokinatorr.sparkle.graphics.PixelReader;
+
+/**
+ * A raster image is an image with fixed pixel resolution (e.g. PNG, JPEG). The pixels are stored in {@linkplain ARGB}
+ * format.
+ */
+public non-sealed interface RasterImage extends Image {
+
+ /**
+ * Returns a pixel reader that can read this image's contents as pixels.
+ * The image must be {@linkplain #prepare() prepared} before calling this method.
+ *
+ * @return an object that reads this image by pixels
+ * @see #isReady()
+ * @see #prepare()
+ * @throws IllegalStateException if the image is not ready
+ */
+ PixelReader createPixelReader();
+
+ /**
+ * Returns the intrinsic width of this image. Raster images have a fixed size,
+ * so it's retrieved from the image's {@linkplain #createPixelReader pixel reader}.
+ *
Note: Implementations should typically cache this value for performance.
+ * @return {@inheritDoc}
+ * @throws IllegalStateException if the image is not ready
+ */
+ @Override
+ default double getIntrinsicWidth() {
+ return createPixelReader().getWidth();
+ }
+
+ /**
+ * Returns the intrinsic height of this image. Raster images have a fixed size,
+ * so it's retrieved from the image's {@linkplain #createPixelReader pixel reader}.
+ *
Note: Implementations should typically cache this value for performance.
+ * @return {@inheritDoc}
+ * @throws IllegalStateException if the image is not ready
+ */
+ @Override
+ default double getIntrinsicHeight() {
+ return createPixelReader().getHeight();
+ }
+}
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/image/VectorImage.java b/src/main/java/net/fokinatorr/sparkle/graphics/image/VectorImage.java
new file mode 100644
index 0000000..c06fd5c
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/image/VectorImage.java
@@ -0,0 +1,101 @@
+package net.fokinatorr.sparkle.graphics.image;
+
+import net.fokinatorr.sparkle.graphics.ARGB;
+import net.fokinatorr.sparkle.graphics.PixelReader;
+import net.fokinatorr.sparkle.phys2d.Point2D;
+
+import java.awt.Shape;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * A vector image is an image defined with vector shapes (shapes with a path), which
+ * means it has a variable resolution and can return different pixel data depending
+ * on scaling factors.
+ */
+public non-sealed interface VectorImage extends Image {
+ // This comment serves absolutely no informational purpose whatsoever and is only here to distract people for 5 seconds
+ // and cause minor frustration. You are free to read further now. :)
+
+ /**
+ * Rasterizes the vector content into a pixel grid of the given dimensions and returns a pixel reader over the grid.
+ * The image must be {@linkplain #prepare() prepared} before calling this method.
+ *
+ * @param dimensions the requested dimensions
+ * @return an object that reads this image by pixels
+ * @throws IllegalStateException if the image is not ready
+ * @see #isReady()
+ * @see #prepare()
+ */
+ PixelReader createPixelReader(Point2D dimensions);
+
+ /**
+ * Returns a list of vectors of this vector image. The image must be {@linkplain #prepare() prepared} before calling this method.
+ *
+ * @return this image's vectors
+ * @throws IllegalStateException if the image is not ready
+ * @see #isReady()
+ * @see #prepare()
+ */
+ List getVectors();
+
+ /**
+ * A vector of a vector image.
+ *
+ * @param vector the path
+ * @param strokeARGB stroke color in {@linkplain ARGB} format
+ * @param fillARGB fill color in ARGB
+ * @param lineWidth stroke line width; if {@code 0}, not outlined
+ */
+ record Vector(
+ Shape vector,
+ int strokeARGB,
+ int fillARGB,
+ double lineWidth
+ ) {
+
+ /**
+ * @throws NullPointerException if any argument is {@code null}
+ * @throws IllegalArgumentException if line width is negative
+ */
+ public Vector {
+ Objects.requireNonNull(vector, "vector");
+ if (lineWidth < 0) {
+ throw new IllegalArgumentException("Line width must be non-negative, found: " + lineWidth);
+ }
+ }
+
+ /**
+ * Creates a filled-only version of this vector.
+ *
+ * @param argb the fill color
+ * @return a new instance with the given style
+ */
+ public Vector filled(int argb) {
+ return new Vector(vector, argb, 0, 0);
+ }
+
+ /**
+ * Creates a stroked-only version of this vector.
+ *
+ * @param argb the stroke color
+ * @param lineWidth the line width
+ * @return a new instance with the given style
+ */
+ public Vector stroked(int argb, double lineWidth) {
+ return new Vector(vector, 0, argb, lineWidth);
+ }
+
+ /**
+ * Creates a stroked and filled version of this vector.
+ *
+ * @param strokeARGB the stroke color
+ * @param fillARGB the fill color
+ * @param lineWidth the line width
+ * @return a new instance with the given style
+ */
+ public Vector styled(int strokeARGB, int fillARGB, double lineWidth) {
+ return new Vector(vector, strokeARGB, fillARGB, lineWidth);
+ }
+ }
+}
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/image/RasterImage.java b/src/main/java/net/fokinatorr/sparkle/graphics/image/impl/AWTRasterImage.java
similarity index 67%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/image/RasterImage.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/image/impl/AWTRasterImage.java
index 9e45ba0..ae8b6c1 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/image/RasterImage.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/image/impl/AWTRasterImage.java
@@ -1,37 +1,38 @@
-package ru.fokinatorr.sparkle.graphics.image;
+package net.fokinatorr.sparkle.graphics.image.impl;
import lombok.AccessLevel;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.experimental.FieldDefaults;
-import ru.fokinatorr.sparkle.graphics.ARGB;
-import ru.fokinatorr.sparkle.graphics.PixelReader;
+import net.fokinatorr.sparkle.graphics.PixelReader;
+import net.fokinatorr.sparkle.graphics.image.RasterImage;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.IOException;
-import java.net.URL;
import java.net.URLConnection;
+import java.nio.file.Files;
+import java.nio.file.Path;
/**
- * A raster image is an image consisting of pixels (e.g. PNG, JPEG). The pixels
- * are stored in ARGB format.
- * @see ARGB
+ * A universal raster image implementation based on AWT's {@link BufferedImage}
+ * and {@link ImageIO} API.
*/
@FieldDefaults(level = AccessLevel.PRIVATE)
@RequiredArgsConstructor
-public class RasterImage implements Image {
+public class AWTRasterImage implements RasterImage {
/**
* Location of the image data.
*/
- @NonNull final URL resource;
+ @NonNull
+ final Path resource;
volatile BufferedImage decoded;
@Override
public void prepare() {
if (decoded == null) {
- try {
- decoded = ImageIO.read(resource);
+ try (var stream = Files.newInputStream(resource)) {
+ decoded = ImageIO.read(stream);
} catch (IOException e) {
throw new RuntimeException("Failed to decode raster image", e);
}
@@ -45,10 +46,28 @@ public class RasterImage implements Image {
@Override
public PixelReader createPixelReader() {
- prepare(); // ensure decoded in case caller forgot to prepare the image
+ if (decoded == null) {
+ throw new IllegalStateException("Image has not been prepared yet");
+ }
return new Reader(decoded);
}
+ @Override
+ public double getIntrinsicWidth() {
+ if (decoded == null) {
+ throw new IllegalStateException("Image has not been prepared yet");
+ }
+ return decoded.getWidth();
+ }
+
+ @Override
+ public double getIntrinsicHeight() {
+ if (decoded == null) {
+ throw new IllegalStateException("Image has not been prepared yet");
+ }
+ return decoded.getHeight();
+ }
+
@Override
public String getMimeType() {
String guessed = URLConnection.guessContentTypeFromName(resource.toString());
@@ -56,9 +75,7 @@ public class RasterImage implements Image {
}
@Override
- public void close() {
- // technically this class CAN be used after calling this method since there are no resources to free
- // but for code architecture consistency it's not recommended
+ public void unload() {
decoded = null;
}
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/image/impl/SVGImage.java b/src/main/java/net/fokinatorr/sparkle/graphics/image/impl/SVGImage.java
new file mode 100644
index 0000000..7147c03
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/image/impl/SVGImage.java
@@ -0,0 +1,192 @@
+package net.fokinatorr.sparkle.graphics.image.impl;
+
+import lombok.AccessLevel;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+import org.lwjgl.nanovg.NSVGImage;
+import org.lwjgl.nanovg.NSVGPath;
+import org.lwjgl.nanovg.NSVGShape;
+import org.lwjgl.system.MemoryUtil;
+import net.fokinatorr.sparkle.graphics.PixelReader;
+import net.fokinatorr.sparkle.graphics.image.VectorImage;
+import net.fokinatorr.sparkle.graphics.impl.IntBufferPixelAccessor;
+import net.fokinatorr.sparkle.graphics.impl.sw.Scaling;
+import net.fokinatorr.sparkle.phys2d.Point2D;
+
+import java.awt.geom.Path2D;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+
+import java.util.Map;
+
+import static org.lwjgl.system.MemoryStack.stackPush;
+import static org.lwjgl.system.MemoryUtil.*;
+import static org.lwjgl.nanovg.NanoSVG.*;
+
+/**
+ * An SVG image is a vector-based format.
+ *
+ * This implementation uses native memory and has to be manually {@linkplain #unload() unloaded} once no longer needed.
+ */
+@FieldDefaults(level = AccessLevel.PRIVATE)
+@RequiredArgsConstructor
+public class SVGImage implements VectorImage {
+ /**
+ * Location of the image data.
+ */
+ @NonNull
+ final Path resource;
+ volatile NSVGImage decoded;
+ volatile long rasterizer; // pointer
+ final Map resolutions = HashMap.newHashMap(1);
+ volatile List vectors;
+
+ @Override
+ public void prepare() {
+ if (decoded == null) {
+ try (
+ var channel = Files.newByteChannel(resource);
+ var stack = stackPush()
+ ) {
+ long size = channel.size();
+ if (size == -1 || (int) ++size != size) { // add 1 to the size to allow null termination
+ throw new IOException("Resource too large"); // safeguard for 32-bit systems
+ }
+ ByteBuffer data = stack.malloc((int) size);
+ channel.read(data);
+ data.put((byte) 0).flip(); // null-terminate and prepare for reading
+ decoded = nsvgParse(data, stack.UTF8("px"), 96f);
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to decode SVG image from path: " + resource, e);
+ }
+ if (decoded == null) {
+ throw new RuntimeException("Failed to decode SVG image from path: " + resource);
+ }
+ }
+ }
+
+ @Override
+ public boolean isReady() {
+ return decoded != null;
+ }
+
+ @Override
+ public PixelReader createPixelReader(Point2D dimensions) {
+ if (decoded == null) {
+ throw new IllegalStateException("Image has not been prepared yet");
+ }
+ return new IntBufferPixelAccessor(
+ (int) dimensions.x(), (int) dimensions.y(),
+ resolutions.computeIfAbsent(dimensions, this::rasterize),
+ () -> {
+ if (decoded == null) {
+ throw new IllegalStateException("Image has not been prepared yet");
+ }
+ }
+ );
+ }
+
+ @Override
+ public double getIntrinsicWidth() {
+ if (decoded == null) {
+ throw new IllegalStateException("Image has not been prepared yet");
+ }
+ return decoded.width();
+ }
+
+ @Override
+ public double getIntrinsicHeight() {
+ if (decoded == null) {
+ throw new IllegalStateException("Image has not been prepared yet");
+ }
+ return decoded.height();
+ }
+
+ @Override
+ public String getMimeType() {
+ return "image/svg+xml";
+ }
+
+ @Override
+ public List getVectors() {
+ if (decoded == null) {
+ throw new IllegalStateException("Image has not been prepared yet");
+ }
+ if (vectors == null) {
+ vectors = new ArrayList<>();
+
+ for (NSVGShape svgShape = decoded.shapes(); svgShape != null; svgShape = NSVGShape.createSafe(memGetAddress(svgShape.address() + NSVGShape.NEXT))) {
+ int strokeColor = svgShape.stroke().color(); // TODO gradient support
+ int fillColor = svgShape.fill().color();
+ float lineWidth = svgShape.strokeWidth();
+ Path2D.Float vec = new Path2D.Float();
+ for (NSVGPath path = svgShape.paths(); path != null; path = NSVGPath.createSafe(memGetAddress(path.address() + NSVGPath.NEXT))) {
+ FloatBuffer pts = path.pts().rewind();
+ vec.moveTo(pts.get(), pts.get());
+ for (int i = 1; i < path.npts(); i += 3) { // we already read one point, and we read 3 per iteration
+ vec.curveTo(pts.get(), pts.get(), pts.get(), pts.get(), pts.get(), pts.get());
+ }
+ if (path.closed() != 0) vec.closePath();
+ }
+
+ vectors.add(new Vector(vec, strokeColor, fillColor, lineWidth));
+ }
+ }
+ return vectors;
+ }
+
+ @Override
+ public void unload() {
+ resolutions.values().forEach(MemoryUtil::memFree);
+ resolutions.clear();
+ vectors = null;
+ if (rasterizer != NULL) nsvgDeleteRasterizer(rasterizer);
+ if (decoded != null) nsvgDelete(decoded);
+ decoded = null;
+ }
+
+ // Private implementation
+
+ private IntBuffer rasterize(Point2D dim) {
+ if (rasterizer == NULL) {
+ rasterizer = nsvgCreateRasterizer();
+ }
+ float maxScale = (float) Math.max(
+ dim.x() / decoded.width(),
+ dim.y() / decoded.height()
+ );
+ int rasterWidth = (int) (decoded.width() * maxScale), rasterHeight = (int) (decoded.height() * maxScale);
+ ByteBuffer rasterizedBB = memAlloc((int) (rasterWidth * rasterHeight * Integer.BYTES));
+ try {
+ nsvgRasterize(
+ rasterizer,
+ decoded,
+ 0f, 0f,
+ maxScale,
+ rasterizedBB,
+ rasterWidth, rasterHeight,
+ rasterWidth * Integer.BYTES
+ );
+ } catch (Exception e) {
+ memFree(rasterizedBB);
+ throw new RuntimeException("Failed to rasterise SVG image", e);
+ }
+ IntBuffer rasterized = rasterizedBB.asIntBuffer();
+ IntBuffer resized = memAllocInt((int) (dim.x() * dim.y()));
+ Scaling.bicubicResize(
+ new IntBufferPixelAccessor(rasterWidth, rasterHeight, rasterized, () -> {}),
+ new IntBufferPixelAccessor((int) dim.x(), (int) dim.y(), resized, () -> {})
+ );
+ memFree(rasterizedBB);
+ return resized;
+ }
+}
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/AbstractRenderingContext.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/AbstractRenderingContext.java
similarity index 60%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/impl/AbstractRenderingContext.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/impl/AbstractRenderingContext.java
index b8d5916..9c278fa 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/AbstractRenderingContext.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/AbstractRenderingContext.java
@@ -1,26 +1,21 @@
-package ru.fokinatorr.sparkle.graphics.impl;
+package net.fokinatorr.sparkle.graphics.impl;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.experimental.FieldDefaults;
-import ru.fokinatorr.sparkle.context.AppContext;
-import ru.fokinatorr.sparkle.graphics.GraphicsManager;
-import ru.fokinatorr.sparkle.graphics.GraphicsUtils;
-import ru.fokinatorr.sparkle.graphics.PixelReader;
-import ru.fokinatorr.sparkle.graphics.image.Image;
-import ru.fokinatorr.sparkle.graphics.render.RenderingContext;
-import ru.fokinatorr.sparkle.graphics.render.renderer.Renderer;
-import ru.fokinatorr.sparkle.graphics.render.renderer.RendererRegistry;
-import ru.fokinatorr.sparkle.graphics.render.surface.RenderingSurface;
-import ru.fokinatorr.sparkle.internal.access.SharedSecrets;
-import ru.fokinatorr.sparkle.internal.access.StageAccess;
-import ru.fokinatorr.sparkle.phys2d.Point2D;
-import ru.fokinatorr.sparkle.stage.RenderableID;
-import ru.fokinatorr.sparkle.stage.Stage;
+import net.fokinatorr.sparkle.context.AppContext;
+import net.fokinatorr.sparkle.graphics.GraphicsManager;
+import net.fokinatorr.sparkle.graphics.render.RenderingContext;
+import net.fokinatorr.sparkle.graphics.render.renderer.Renderer;
+import net.fokinatorr.sparkle.graphics.render.renderer.RendererRegistry;
+import net.fokinatorr.sparkle.graphics.render.surface.RenderingSurface;
+import net.fokinatorr.sparkle.stage.RenderableID;
+import net.fokinatorr.sparkle.stage.Stage;
import static lombok.AccessLevel.PROTECTED;
-import static ru.fokinatorr.sparkle.graphics.render.RenderCanvas.ORIGINAL_SIZE;
-import static ru.fokinatorr.sparkle.util.Constants.NANOS_PER_SECOND;
+import static net.fokinatorr.sparkle.util.Constants.NANOS_PER_MILLISECOND;
+import static net.fokinatorr.sparkle.util.Constants.NANOS_PER_SECOND;
+import static net.fokinatorr.sparkle.util.WaitUtils.*;
/**
* Base class for rendering context implementations.
@@ -33,7 +28,7 @@ public abstract class AbstractRenderingContext implements RenderingContext {
@Getter final Stage stage;
@Getter final GraphicsManager parent;
- boolean closed;
+ @Getter boolean closed;
@Getter double lastFPS;
long totalRenderTimeNs;
int frameCount;
@@ -53,13 +48,14 @@ public abstract class AbstractRenderingContext implements RenderingContext {
ensureOpen();
long startTimeNs = System.nanoTime();
// actual rendering
- var fb = surface.acquireBuffer();
+ var fb = surface.acquireBuffer(stage.getWidth(), stage.getHeight());
RenderCanvasExt canvas = getCanvas();
canvas.attachTarget(fb);
canvas.clear();
- renderStage();
+ renderStage(canvas);
canvas.flush();
surface.present(fb);
+ waitFor(1000 / stage.getFPSLimit() - (System.nanoTime() - startTimeNs) / NANOS_PER_MILLISECOND);
long renderTimeNs = System.nanoTime() - startTimeNs;
// statistics
@@ -78,30 +74,22 @@ public abstract class AbstractRenderingContext implements RenderingContext {
@Override
public abstract RenderCanvasExt getCanvas();
+ // Implementation-specific cleanup actions
protected abstract void doClose();
- protected abstract boolean renderControlBar();
-
@SuppressWarnings("unchecked")
- protected void renderStage() {
- ensureOpen();
- RenderCanvasExt canvas = getCanvas();
+ protected void renderStage(RenderCanvasExt canvas) {
stage.drawBackdrop(canvas);
// render content
RendererRegistry registry = context.get(RendererRegistry.class);
for (RenderableID> id : stage.getLayers()) {
Object renderable = id.getFrom(stage);
- Renderer renderer = registry.get((Class) renderable.getClass());
+ Renderer renderer = registry.get(renderable.getClass());
if (renderer.isVisible(renderable)) {
renderer.render(renderable, canvas);
}
}
-
- // render control bar if needed
- if (renderControlBar()) {
- // TODO render stage's control bar
- }
}
protected void ensureOpen() {
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/impl/GraphicsState.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/GraphicsState.java
new file mode 100644
index 0000000..50589ca
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/GraphicsState.java
@@ -0,0 +1,231 @@
+package net.fokinatorr.sparkle.graphics.impl;
+
+import lombok.Data;
+import lombok.NonNull;
+import lombok.experimental.FieldDefaults;
+import net.fokinatorr.sparkle.effect.graphics.GraphicEffectMap;
+import net.fokinatorr.sparkle.graphics.BlendMode;
+import net.fokinatorr.sparkle.graphics.impl.TransformOp.*;
+import net.fokinatorr.sparkle.graphics.render.RenderCanvas;
+
+import java.awt.geom.AffineTransform;
+import java.util.Deque;
+import java.util.LinkedList;
+import java.util.Objects;
+
+import static lombok.AccessLevel.PRIVATE;
+
+/**
+ * Represents the current graphics state of a {@link RenderCanvas}.
+ *
+ * @see RenderCanvas
+ * @see RenderCanvas#save()
+ * @see RenderCanvas#restore()
+ */
+@FieldDefaults(level = PRIVATE)
+@Data
+public class GraphicsState {
+
+ Deque transformStack = new LinkedList<>();
+
+ int fillARGB = 0xFF_00_00_00; // Default black
+ int strokeARGB = 0xFF_00_00_00; // Default black
+ double lineWidth = 1.0;
+ /**
+ * Unsigned byte representing the opacity multiplier.
+ * {@code 0} - fully transparent, {@code 255} ({@code -1}) - fully opaque.
+ */
+ byte alpha = -1;
+
+ @NonNull
+ BlendMode blendMode = BlendMode.NORMAL;
+ @NonNull
+ GraphicEffectMap effects = new GraphicEffectMap();
+
+ double clipX = -1;
+ double clipY;
+ double clipW;
+ double clipH;
+
+
+ /**
+ * Creates a deep copy of this graphics state.
+ *
+ * @return a new {@code GraphicsState} with identical property values
+ */
+ public GraphicsState copy() {
+ GraphicsState copy = new GraphicsState();
+ copy.transformStack = new LinkedList<>(this.transformStack);
+ copy.fillARGB = this.fillARGB;
+ copy.strokeARGB = this.strokeARGB;
+ copy.lineWidth = this.lineWidth;
+ copy.alpha = this.alpha;
+ copy.blendMode = this.blendMode;
+ copy.effects = this.effects.copy();
+ copy.clipX = this.clipX;
+ copy.clipY = this.clipY;
+ copy.clipW = this.clipW;
+ copy.clipH = this.clipH;
+ return copy;
+ }
+
+ /**
+ * Translates the transform by the given deltas.
+ * @param tx the X delta
+ * @param ty the Y delta
+ * @throws IllegalArgumentException if any argument is infinite or NaN
+ */
+ public void translate(double tx, double ty) {
+ if (!Double.isFinite(tx)) {
+ throw new IllegalArgumentException("Translation must be finite, got: " + tx);
+ }
+ if (!Double.isFinite(ty)) {
+ throw new IllegalArgumentException("Translation must be finite, got: " + ty);
+ }
+ if (tx != 0 || ty != 0) {
+ transformStack.push(new TranslateOp2D((float) tx, (float) ty));
+ }
+ }
+
+ /**
+ * Rotates the transform by the given amount of degrees
+ * @param deg the rotation delta
+ * @throws IllegalArgumentException if deg is infinite, or NaN
+ */
+ public void rotate(double deg) {
+ if (!Double.isFinite(deg)) {
+ throw new IllegalArgumentException("Rotation must be positive and finite, got: " + deg);
+ }
+ if (deg % 360 != 0) {
+ transformStack.push(new RotateOp2D((float) deg));
+ }
+ }
+
+ /**
+ * Scales the transform by the given deltas.
+ * @param sx the X axis scale delta
+ * @param sy the Y axis scale delta
+ * @throws IllegalArgumentException if any argument is non-positive, infinite or NaN
+ */
+ public void scale(double sx, double sy) {
+ if (Math.abs(sx) == 0 || !Double.isFinite(sx)) {
+ throw new IllegalArgumentException("X scale must be not zero and finite, got: " + sx);
+ }
+ if (Math.abs(sy) == 0 || !Double.isFinite(sy)) {
+ throw new IllegalArgumentException("Y scale must be not zero and finite, got: " + sy);
+ }
+ if (sx != 1 || sy != 1) {
+ transformStack.push(new ScaleOp2D((float) sx, (float) sy));
+ }
+ }
+
+ /**
+ * Multiplies the transformation by the given matrix.
+ * @param at the transform matrix
+ * @throws NullPointerException if transform matrix is {@code null}
+ */
+ public void mulTransform(AffineTransform at) {
+ Objects.requireNonNull(at, "transform matrix");
+
+ double tx = at.getTranslateX(), ty = at.getTranslateY(),
+ sx = at.getScaleX(), sy = at.getScaleY();
+ if (!Double.isFinite(tx)) {
+ throw new IllegalArgumentException("Translation must be finite, got: " + tx);
+ }
+ if (!Double.isFinite(ty)) {
+ throw new IllegalArgumentException("Translation must be finite, got: " + ty);
+ }
+ if (Math.abs(sx) == 0 || !Double.isFinite(sx)) {
+ throw new IllegalArgumentException("X scale must be not zero and finite, got: " + sx);
+ }
+ if (Math.abs(sy) == 0 || !Double.isFinite(sy)) {
+ throw new IllegalArgumentException("Y scale must be not zero and finite, got: " + sy);
+ }
+
+ if (!at.isIdentity()) {
+ transformStack.push(new MulOp2D(at));
+ }
+ }
+
+ /**
+ * Sets the new line width.
+ * @param lineWidth the new line width
+ * @throws IllegalArgumentException if lineWidth is non-positive, infinite, or NaN
+ */
+ public void setLineWidth(double lineWidth) {
+ if (lineWidth <= 0 || !Double.isFinite(lineWidth)) {
+ throw new IllegalArgumentException("Line width must be positive and finite, got: " + lineWidth);
+ }
+ this.lineWidth = lineWidth;
+ }
+
+ /**
+ * Sets the X coordinate of the top-left corner of clipping region.
+ * @param clipX the new value
+ * @throws IllegalArgumentException if negative, infinite, or NaN
+ */
+ public void setClipX(double clipX) {
+ if (clipX < 0 || !Double.isFinite(clipX)) {
+ throw new IllegalArgumentException("Clip X must be non-negative and finite, got: " + clipX);
+ }
+ this.clipX = clipX;
+ }
+
+ /**
+ * Sets the Y coordinate of the top-left corner of clipping region.
+ * @param clipY the new value
+ * @throws IllegalArgumentException if negative, infinite, or NaN
+ */
+ public void setClipY(double clipY) {
+ if (clipY < 0 || !Double.isFinite(clipY)) {
+ throw new IllegalArgumentException("Clip Y must be non-negative and finite, got: " + clipY);
+ }
+ this.clipY = clipY;
+ }
+
+ /**
+ * Sets the width of clipping region.
+ * @param clipW the new value
+ * @throws IllegalArgumentException if non-positive, infinite, or NaN
+ */
+ public void setClipW(double clipW) {
+ if (clipW <= 0 || !Double.isFinite(clipW)) {
+ throw new IllegalArgumentException("Clip width must be positive and finite, got: " + clipW);
+ }
+ this.clipW = clipW;
+ }
+
+ /**
+ * Sets the height of clipping region.
+ * @param clipH the new value
+ * @throws IllegalArgumentException if non-positive, infinite, or NaN
+ */
+ public void setClipH(double clipH) {
+ if (clipH <= 0 || !Double.isFinite(clipH)) {
+ throw new IllegalArgumentException("Clip height must be positive and finite, got: " + clipH);
+ }
+ this.clipH = clipH;
+ }
+
+ /**
+ * Resets the clipping region to none.
+ */
+ public void resetClip() {
+ clipX = -1;
+ }
+
+ /**
+ * {@return whether clip must be applied}
+ */
+ public boolean hasClip() {
+ return clipX >= 0;
+ }
+
+ /**
+ * Checks whether this state has any non-identity transformations.
+ * @return true if translation, rotation, or scaling is applied
+ */
+ public boolean hasTransform() {
+ return !transformStack.isEmpty();
+ }
+}
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/IntBufferPixelAccessor.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/IntBufferPixelAccessor.java
similarity index 95%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/impl/IntBufferPixelAccessor.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/impl/IntBufferPixelAccessor.java
index ac766f9..12d7f88 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/IntBufferPixelAccessor.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/IntBufferPixelAccessor.java
@@ -1,9 +1,9 @@
-package ru.fokinatorr.sparkle.graphics.impl;
+package net.fokinatorr.sparkle.graphics.impl;
import lombok.RequiredArgsConstructor;
import lombok.experimental.FieldDefaults;
-import ru.fokinatorr.sparkle.graphics.PixelReader;
-import ru.fokinatorr.sparkle.graphics.PixelWriter;
+import net.fokinatorr.sparkle.graphics.PixelReader;
+import net.fokinatorr.sparkle.graphics.PixelWriter;
import java.nio.IntBuffer;
@@ -19,8 +19,7 @@ public class IntBufferPixelAccessor implements PixelReader, PixelWriter {
int width, height;
IntBuffer img;
Runnable ensureOpen;
-
- //
+
@Override
public int getWidth() {
@@ -34,6 +33,8 @@ public class IntBufferPixelAccessor implements PixelReader, PixelWriter {
return height;
}
+ //
+
@Override
public int getARGB(int x, int y) {
ensureOpen();
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/OpenGLGraphicsManager.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/OpenGLGraphicsManager.java
similarity index 58%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/impl/OpenGLGraphicsManager.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/impl/OpenGLGraphicsManager.java
index 319cff6..b437703 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/OpenGLGraphicsManager.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/OpenGLGraphicsManager.java
@@ -1,29 +1,28 @@
-package ru.fokinatorr.sparkle.graphics.impl;
+package net.fokinatorr.sparkle.graphics.impl;
-import it.unimi.dsi.fastutil.Pair;
import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap;
-import it.unimi.dsi.fastutil.objects.ReferenceReferenceImmutablePair;
+import lombok.Getter;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.experimental.FieldDefaults;
import lombok.extern.slf4j.Slf4j;
import org.lwjgl.glfw.GLFWErrorCallback;
-import ru.fokinatorr.sparkle.context.AppContext;
-import ru.fokinatorr.sparkle.event.dispatcher.EventDispatcher;
-import ru.fokinatorr.sparkle.graphics.GraphicsManager;
-import ru.fokinatorr.sparkle.graphics.image.Image;
-import ru.fokinatorr.sparkle.graphics.image.RasterImage;
-import ru.fokinatorr.sparkle.graphics.image.SVGImage;
-import ru.fokinatorr.sparkle.graphics.impl.gl.OpenGLContext;
-import ru.fokinatorr.sparkle.graphics.impl.gl.surface.GL_GLFWWindowSurface;
-import ru.fokinatorr.sparkle.graphics.render.RenderingContext;
-import ru.fokinatorr.sparkle.graphics.render.surface.EmbeddedSurface;
-import ru.fokinatorr.sparkle.internal.access.SharedSecrets;
-import ru.fokinatorr.sparkle.internal.access.StageAccess;
-import ru.fokinatorr.sparkle.stage.Stage;
-import ru.fokinatorr.sparkle.stage.StageCreator;
+import net.fokinatorr.sparkle.context.AppContext;
+import net.fokinatorr.sparkle.event.dispatcher.EventDispatcher;
+import net.fokinatorr.sparkle.event.lifecycle.CloseRequestedEvent;
+import net.fokinatorr.sparkle.graphics.GraphicsManager;
+import net.fokinatorr.sparkle.graphics.image.Image;
+import net.fokinatorr.sparkle.graphics.image.impl.AWTRasterImage;
+import net.fokinatorr.sparkle.graphics.image.impl.SVGImage;
+import net.fokinatorr.sparkle.graphics.impl.gl.OpenGLContext;
+import net.fokinatorr.sparkle.graphics.impl.gl.surface.GL_GLFWWindowSurface;
+import net.fokinatorr.sparkle.graphics.render.RenderingContext;
+import net.fokinatorr.sparkle.graphics.render.surface.EmbeddedSurface;
+import net.fokinatorr.sparkle.internal.access.SharedSecrets;
+import net.fokinatorr.sparkle.internal.access.StageAccess;
+import net.fokinatorr.sparkle.stage.Stage;
+import net.fokinatorr.sparkle.stage.StageCreator;
-import java.net.MalformedURLException;
import java.nio.file.Path;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -45,7 +44,8 @@ public class OpenGLGraphicsManager implements GraphicsManager {
private static final StageAccess stageAcc = SharedSecrets.getStageAccess();
@NonNull
- final AppContext context;
+ @Getter
+ final AppContext appContext;
final Queue workQ = new ConcurrentLinkedQueue<>();
final Map renderContexts = new Reference2ReferenceOpenHashMap<>();
final Thread graphicsThread = Thread.currentThread();
@@ -60,10 +60,9 @@ public class OpenGLGraphicsManager implements GraphicsManager {
@Override
public void close() {
if (!closed) {
- ensureOnCorrectThread();
renderContexts.values().forEach(AbstractRenderingContext::close);
renderContexts.clear();
- images.values().forEach(Image::close);
+ images.values().forEach(Image::unload);
images.clear();
autoLoadImages.clear();
if (glInitialized) {
@@ -76,33 +75,33 @@ public class OpenGLGraphicsManager implements GraphicsManager {
}
@Override
- public Pair createWindowContext(String title, StageCreator stageCreator, boolean translucent, boolean fullscreen) {
+ public RenderingContext createWindowContext(String title, StageCreator stageCreator, boolean translucent, boolean fullscreen) {
ensureOpen();
ensureOnCorrectThread();
ensureGLInitialized();
-
- Stage stage = SharedSecrets.getStageAccess().newStage(stageCreator, context);
+ Stage stage = stageAcc.newStage(stageCreator, appContext);
// @formatter:off // for readability
GL_GLFWWindowSurface window = fullscreen
? GL_GLFWWindowSurface.createFullscreen(
title, glfwGetPrimaryMonitor(), translucent,
- context.get(EventDispatcher.class), stage, graphicsThread
+ appContext.get(EventDispatcher.class), stage, graphicsThread
)
: GL_GLFWWindowSurface.create(
title, translucent,
- context.get(EventDispatcher.class), stage, graphicsThread
+ appContext.get(EventDispatcher.class), stage, graphicsThread
);
// @formatter:on
- OpenGLContext glContext = new OpenGLContext(context, window, stage, autoLoadImages, this);
+ OpenGLContext glContext = new OpenGLContext(appContext, window, stage, autoLoadImages, this);
renderContexts.put(stage, glContext);
- return new ReferenceReferenceImmutablePair<>(stage, glContext);
+ stageAcc.setRenderContext(stage, glContext);
+ return glContext;
}
@Override
- public Pair createEmbeddedContext(EmbeddedSurface surface, StageCreator stageCreator) {
+ public RenderingContext createEmbeddedContext(EmbeddedSurface surface, StageCreator stageCreator) {
ensureOpen();
- return null;
+ return null; // TODO implement software rendering context
}
@Override
@@ -120,19 +119,13 @@ public class OpenGLGraphicsManager implements GraphicsManager {
public Image loadImage(Path path, boolean autoLoad) {
ensureOpen();
- Image newImg;
- try {
- newImg = path.getFileName().toString().endsWith(".svg") // TODO more formats later
- ? new SVGImage(path.toUri().toURL())
- : new RasterImage(path.toUri().toURL());
- } catch (MalformedURLException e) {
- throw new RuntimeException(e);
- }
+ // TODO more formats later
+ Image newImg = path.getFileName().toString().endsWith(".svg") ? new SVGImage(path) : new AWTRasterImage(path);
Image oldImg = images.put(path, newImg);
if (oldImg != null) {
autoLoadImages.remove(oldImg);
- oldImg.close();
+ oldImg.unload();
}
if (autoLoad) autoLoadImages.add(newImg);
@@ -154,14 +147,16 @@ public class OpenGLGraphicsManager implements GraphicsManager {
public void destroyImage(Path path) {
ensureOpen();
if (images.containsKey(path)) {
- images.remove(path).close();
+ images.remove(path).unload();
}
}
@Override
public void runLater(Runnable run) {
ensureOpen();
- if (!workQ.offer(run)) {
+ if (Thread.currentThread() == graphicsThread) {
+ run.run();
+ } else if (!workQ.offer(run)) {
throw new IllegalStateException("Work queue overflow; cannot add more tasks");
}
}
@@ -174,18 +169,42 @@ public class OpenGLGraphicsManager implements GraphicsManager {
runTasks();
for (var renderCtx : renderContexts.values()) {
renderCtx.pollEvents();
- if (!stageAcc.isSuppressRedraw(renderCtx.getStage())) {
+
+ // Check close request first to prevent window hang
+ if (renderCtx.shouldClose()) {
+ if (renderCtx.getSurface().isExplicitShouldClose()) {
+ // Explicit request; just close
+ removeAndClose(renderCtx);
+ } else {
+ // Implicit close; fire a CloseRequestedEvent if there are listeners
+ EventDispatcher dispatcher = appContext.get(EventDispatcher.class);
+ if (dispatcher.hasListenersFor(CloseRequestedEvent.class)) {
+ CloseRequestedEvent event = new CloseRequestedEvent(renderCtx);
+ dispatcher.fireEvent(event).thenRun(() -> {
+ // If the event wasn't cancelled, close
+ if (!event.isCancelled()) {
+ removeAndClose(renderCtx);
+ }
+ });
+ } else {
+ // Otherwise, just close
+ removeAndClose(renderCtx);
+ }
+ }
+ }
+ if (!stageAcc.isSuppressRedraw(renderCtx.getStage()) && renderContexts.containsValue(renderCtx)) {
renderCtx.present();
}
- if (renderCtx.shouldClose()) {
- renderCtx.getStage().stop().thenRun(() -> runLater(() -> {
- renderCtx.close();
- renderContexts.remove(renderCtx.getStage());
- }));
- }
}
}
+ private void removeAndClose(RenderingContext renderCtx) {
+ renderCtx.getStage().stop().thenRun(() -> {
+ renderContexts.remove(renderCtx.getStage());
+ runLater(renderCtx::close);
+ });
+ }
+
private void ensureOpen() {
if (closed) {
throw new IllegalStateException("This manager is closed");
@@ -204,7 +223,8 @@ public class OpenGLGraphicsManager implements GraphicsManager {
this.errorCallback = GLFWErrorCallback.createPrint(System.err).set();
if (glfwPlatformSupported(GLFW_PLATFORM_WAYLAND) || glfwPlatformSupported(GLFW_PLATFORM_X11)) {
- glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11); // I don't think OpenGL works on Wayland
+ // EGL/Wayland not supported by NVIDIA drivers; force XWayland mode for Linux Wayland sessions
+ glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11);
}
if (!glfwInit()) {
@@ -216,9 +236,13 @@ public class OpenGLGraphicsManager implements GraphicsManager {
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 6);
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
- glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GLFW_TRUE);
+ glfwWindowHint(GLFW_CONTEXT_RELEASE_BEHAVIOR, GLFW_RELEASE_BEHAVIOR_NONE); // Don't share resources
+ glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GLFW_TRUE); // For macOS
+ glfwWindowHint(GLFW_CONTEXT_DEBUG, GLFW_TRUE);
+ glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
+ glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);
- // GL context not created here, so no GL calls yet
+ glInitialized = true;
}
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/RenderCanvasExt.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/RenderCanvasExt.java
similarity index 57%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/impl/RenderCanvasExt.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/impl/RenderCanvasExt.java
index 73ea5ef..afd14d2 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/RenderCanvasExt.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/RenderCanvasExt.java
@@ -1,8 +1,7 @@
-package ru.fokinatorr.sparkle.graphics.impl;
+package net.fokinatorr.sparkle.graphics.impl;
-import ru.fokinatorr.sparkle.graphics.image.Image;
-import ru.fokinatorr.sparkle.graphics.render.RenderCanvas;
-import ru.fokinatorr.sparkle.graphics.render.framebuffer.Framebuffer;
+import net.fokinatorr.sparkle.graphics.render.RenderCanvas;
+import net.fokinatorr.sparkle.graphics.render.framebuffer.Framebuffer;
/**
* An extensions interface for {@link RenderCanvas} providing additional methods
@@ -26,9 +25,4 @@ public interface RenderCanvasExt extends RenderCanvas {
*/
void flush();
- /**
- * Uploads an Image object, making it ready for rendering.
- * @param image the image
- */
- void uploadImage(Image image);
}
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/impl/TransformOp.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/TransformOp.java
new file mode 100644
index 0000000..5390044
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/TransformOp.java
@@ -0,0 +1,135 @@
+package net.fokinatorr.sparkle.graphics.impl;
+
+import org.joml.Matrix3x2f;
+import org.joml.Matrix4f;
+
+import java.awt.geom.AffineTransform;
+import java.util.Objects;
+
+/**
+ * A transform operation to apply to a matrix.
+ * Transform operations are value-based types; treat equal instances as interchangeable
+ * and don't use them wherever an identity is required (e.g. synchronization, {@link java.lang.ref.Reference} API).
+ */
+public sealed interface TransformOp
+ permits TransformOp.MulOp2D, TransformOp.RotateOp2D, TransformOp.ScaleOp2D, TransformOp.TranslateOp2D {
+
+ /**
+ * Applies this transform operation to the given matrix.
+ *
+ * @param dest the destination matrix
+ */
+ void apply(Matrix4f dest);
+
+ /**
+ * Applies this transform operation to the given {@link AffineTransform} instance.
+ *
+ * @param affine the destination object
+ * @throws UnsupportedOperationException if this transform is not applicable (e.g. 3D transform (affine transforms are 2D))
+ */
+ default void apply(AffineTransform affine) {
+ throw new UnsupportedOperationException("Applying a non-2D transform to an AffineTransform instance");
+ }
+
+ /**
+ * Translate by the specified delta.
+ *
+ * @param tx X translation
+ * @param ty Y translation
+ */
+ record TranslateOp2D(float tx, float ty) implements TransformOp {
+
+ public TranslateOp2D {
+ if (!(Float.isFinite(tx) && Float.isFinite(ty))) {
+ throw new IllegalArgumentException("Translate deltas must be finite, got: " + tx + ", " + ty);
+ }
+ }
+
+ @Override
+ public void apply(Matrix4f dest) {
+ dest.translate(tx, ty, 0);
+ }
+
+ @Override
+ public void apply(AffineTransform affine) {
+ affine.translate(tx, ty);
+ }
+ }
+
+ /**
+ * Scale by the specified delta.
+ *
+ * @param sx X scaling
+ * @param sy Y scaling
+ */
+ record ScaleOp2D(float sx, float sy) implements TransformOp {
+
+ public ScaleOp2D {
+ if (!(sx != 0 && sy != 0 && Float.isFinite(sx) && Float.isFinite(sy))) {
+ throw new IllegalArgumentException("Scale factors must be finite and not 0, got: " + sx + ", " + sy);
+ }
+ }
+
+ @Override
+ public void apply(Matrix4f dest) {
+ dest.scaleXY(sx, sy);
+ }
+
+ @Override
+ public void apply(AffineTransform affine) {
+ affine.scale(sx, sy);
+ }
+ }
+
+ /**
+ * Rotate by the specified degrees.
+ *
+ * @param deg rotation degrees
+ */
+ record RotateOp2D(float deg) implements TransformOp {
+
+ public RotateOp2D {
+ if (!Float.isFinite(deg)) {
+ throw new IllegalArgumentException("Rotation degrees must be finite, got: " + deg);
+ }
+ }
+
+ @Override
+ public void apply(Matrix4f dest) {
+ dest.rotateZ(org.joml.Math.toRadians(deg));
+ }
+
+ @Override
+ public void apply(AffineTransform affine) {
+ affine.rotate(org.joml.Math.toRadians(deg));
+ }
+ }
+
+ /**
+ * Multiply by the specified transform matrix.
+ * @param at the transform matrix
+ */
+ record MulOp2D(AffineTransform at) implements TransformOp {
+
+ public MulOp2D {
+ Objects.requireNonNull(at, "transform matrix");
+ }
+
+ @Override
+ public void apply(Matrix4f dest) {
+ Matrix3x2f factor = new Matrix3x2f();
+ factor.m00 = (float) at.getScaleX();
+ factor.m10 = (float) at.getShearX();
+ factor.m20 = (float) at.getTranslateX();
+ factor.m01 = (float) at.getShearY();
+ factor.m11 = (float) at.getScaleY();
+ factor.m21 = (float) at.getTranslateY();
+ dest.mul(factor);
+ }
+
+ @Override
+ public void apply(AffineTransform affine) {
+ affine.concatenate(at);
+ }
+ }
+}
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/GLFramebuffer.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/GLFramebuffer.java
new file mode 100644
index 0000000..d3b7ce3
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/GLFramebuffer.java
@@ -0,0 +1,88 @@
+package net.fokinatorr.sparkle.graphics.impl.gl;
+
+import net.fokinatorr.sparkle.graphics.render.framebuffer.Framebuffer;
+
+import java.nio.ByteBuffer;
+
+import static org.lwjgl.opengl.GL46.*;
+
+/**
+ * A wrapper for an OpenGL framebuffer.
+ * @param fboId the framebuffer object ID
+ * @param texId the bound color texture ID
+ * @param width the buffer width
+ * @param height the buffer height
+ */
+public record GLFramebuffer(int fboId, int texId, int width, int height) implements Framebuffer {
+
+ public GLFramebuffer {
+ if (width <= 0 || height <= 0) {
+ throw new IllegalArgumentException("Width and height must be positive");
+ }
+ if (fboId > 0 && texId > 0) {
+ glBindFramebuffer(GL_FRAMEBUFFER, fboId);
+ // Create texture
+ glBindTexture(GL_TEXTURE_2D, texId);
+ glPixelStorei(GL_PACK_ALIGNMENT, 1);
+ glTexImage2D(
+ GL_TEXTURE_2D,
+ 0,
+ GL_RGBA,
+ width, height,
+ 0,
+ GL_RGBA,
+ GL_UNSIGNED_BYTE,
+ (ByteBuffer) null
+ );
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+ // Attach to FBO
+ glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texId, 0);
+ glDrawBuffers(GL_COLOR_ATTACHMENT0);
+
+ int status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
+ if (status != GL_FRAMEBUFFER_COMPLETE) {
+ String msg = switch (status) {
+ case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT -> "Incomplete attachment";
+ case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT -> "Missing attachment";
+ case GL_FRAMEBUFFER_UNSUPPORTED -> "Unsupported format";
+ default -> "Unknown error";
+ };
+ throw new RuntimeException("Framebuffer not complete: " + msg + " (0x" + Integer.toHexString(status).toUpperCase() + ")");
+ }
+
+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
+ glBindTexture(GL_TEXTURE_2D, 0);
+ }
+ }
+
+ /**
+ * Uses the given FBO with the given default dimensions.
+ * @param fboId the existing FBO ID
+ * @param width the initial width
+ * @param height the initial height
+ */
+ public GLFramebuffer(int fboId, int width, int height) {
+ this(fboId, fboId > 0 ? glGenTextures() : 0, width, height);
+ }
+
+ /**
+ * Creates a new FBO with the given default dimensions.
+ * @param width the initial width
+ * @param height the initial height
+ */
+ public GLFramebuffer(int width, int height) {
+ this(glGenFramebuffers(), glGenTextures(), width, height);
+ }
+
+ @Override
+ public void close() {
+ if (fboId > 0) {
+ glDeleteFramebuffers(fboId);
+ glDeleteTextures(texId);
+ }
+ }
+}
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/GLRenderCanvas.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/GLRenderCanvas.java
new file mode 100644
index 0000000..ac3f856
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/GLRenderCanvas.java
@@ -0,0 +1,671 @@
+package net.fokinatorr.sparkle.graphics.impl.gl;
+
+import lombok.experimental.FieldDefaults;
+import org.joml.Matrix4f;
+import net.fokinatorr.sparkle.effect.graphics.GraphicEffect;
+import net.fokinatorr.sparkle.effect.graphics.GraphicEffectMap;
+import net.fokinatorr.sparkle.graphics.ARGB;
+import net.fokinatorr.sparkle.graphics.BlendMode;
+import net.fokinatorr.sparkle.graphics.image.Image;
+import net.fokinatorr.sparkle.graphics.image.RasterImage;
+import net.fokinatorr.sparkle.graphics.image.VectorImage;
+import net.fokinatorr.sparkle.graphics.impl.GraphicsState;
+import net.fokinatorr.sparkle.graphics.impl.RenderCanvasExt;
+import net.fokinatorr.sparkle.graphics.impl.gl.element.GLTransformedVertexArray;
+import net.fokinatorr.sparkle.graphics.impl.gl.shader.GLShaderProgram;
+import net.fokinatorr.sparkle.graphics.impl.gl.shader.GLShaderProgramCache;
+import net.fokinatorr.sparkle.graphics.impl.gl.shader.ShaderType;
+import net.fokinatorr.sparkle.graphics.render.framebuffer.Framebuffer;
+
+import java.awt.*;
+import java.awt.geom.AffineTransform;
+import java.util.*;
+
+import static lombok.AccessLevel.PROTECTED;
+import static org.lwjgl.opengl.GL46.*;
+import static net.fokinatorr.sparkle.graphics.impl.gl.shader.ShaderLoader.loadShader;
+
+import net.fokinatorr.sparkle.phys2d.Point2D;
+import net.fokinatorr.sparkle.util.Mth;
+
+/**
+ * An OpenGL render canvas that accepts {@link GLFramebuffer}s.
+ */
+@FieldDefaults(level = PROTECTED)
+public class GLRenderCanvas implements RenderCanvasExt {
+
+ private static final GraphicEffectMap EMPTY = new GraphicEffectMap();
+ private static final Matrix4f IDENTITY_MATRIX = new Matrix4f();
+
+ final OpenGLContext parent;
+
+ final Deque stateStack = new LinkedList<>();
+ GraphicsState currentState = new GraphicsState();
+
+ final GLShaderProgram strokeShader;
+ final GLShaderProgram fillShader;
+ final GLShaderProgram imageShader;
+
+ final Matrix4f viewProjection = new Matrix4f();
+ GLFramebuffer fb;
+
+ final boolean clearWhite;
+ boolean closed;
+
+
+ public GLRenderCanvas(OpenGLContext parent, boolean clearWhite) {
+ this.parent = parent;
+ this.clearWhite = clearWhite;
+
+ parent.makeCurrent();
+ GLShaderProgramCache programCache = parent.getProgramCache();
+ // Compile shaders with error checking
+ strokeShader = programCache.getOrCreate("stroke", () -> GLShaderProgram.compile(Map.of(
+ ShaderType.VERTEX, loadShader("stroke.vert.glsl"),
+// ShaderType.GEOMETRY, loadShader("stroke.geom.glsl"),
+ ShaderType.FRAGMENT, loadShader("stroke.frag.glsl")
+ )));
+ checkError();
+
+ fillShader = programCache.getOrCreate("fill", () -> GLShaderProgram.compile(Map.of(
+ ShaderType.VERTEX, loadShader("fill.vert.glsl"),
+ ShaderType.FRAGMENT, loadShader("fill.frag.glsl")
+ )));
+ checkError();
+
+ imageShader = programCache.getOrCreate("image", () -> GLShaderProgram.compile(Map.of(
+ ShaderType.VERTEX, loadShader("image.vert.glsl"),
+ ShaderType.FRAGMENT, loadShader("image.frag.glsl")
+ )));
+ checkError();
+ }
+
+ //
+
+ @Override
+ public void attachTarget(Framebuffer target) {
+ ensureOpen();
+ if (!(target instanceof GLFramebuffer(int fboId, int _, int width, int height))) {
+ throw new IllegalArgumentException("Unsupported frame buffer type: " + target.getClass());
+ }
+ parent.makeCurrent();
+ checkError();
+ if (this.fb != null) this.fb.close();
+ this.fb = (GLFramebuffer) target;
+
+ glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fboId);
+ checkError();
+ glViewport(0, 0, width, height);
+ checkError();
+ viewProjection.setOrtho2D(0, fb.width(), fb.height(), 0);
+ if (clearWhite) {
+ glClearColor(1f, 1f, 1f, 1f);
+ } else {
+ glClearColor(0f, 0f, 0f, 0f);
+ }
+ checkError();
+ }
+
+ @Override
+ public void clear() {
+ ensureOpen();
+ parent.makeCurrent();
+ currentState.getTransformStack().clear();
+ ensureDrawBufferBound();
+ glClear(GL_COLOR_BUFFER_BIT);
+ checkError();
+ }
+
+ @Override
+ public void flush() {
+ ensureOpen();
+ parent.makeCurrent();
+ ensureDrawBufferBound();
+ glFlush();
+ checkError();
+ }
+ //
+
+ //
+
+ // Drawing methods
+
+ /**
+ * Setup before outline operation(s)
+ * @return valid line width range
+ */
+ private float[] outlineSetup() {
+ // Ensure that we're open and parent context is current
+ ensureOpen();
+ parent.makeCurrent();
+ ensureDrawBufferBound();
+
+ float[] lineWidthRange = {1, 1};
+ glGetFloatv(GL_SMOOTH_LINE_WIDTH_RANGE, lineWidthRange);
+ strokeShader.use();
+ checkError();
+ applyBlendFunc();
+ applyClip();
+
+ return lineWidthRange;
+ }
+
+ /**
+ * {@link #outlineSetup()} must be called before calling this method
+ */
+ private void doOutline(GLTransformedVertexArray outlineVAO, float[] lineWidthRange) {
+ outlineVAO.bind();
+ buildTransformMatrix(outlineVAO.getTransform());
+ outlineVAO.setDirtyTransform();
+
+ // Set up vertex attributes & shader uniforms
+ int strokeARGB = currentState.getStrokeARGB();
+ float
+ a = byteToFloat(ARGB.alpha(strokeARGB)) * byteToFloat(currentState.getAlpha()),
+ r = byteToFloat(ARGB.red(strokeARGB)),
+ g = byteToFloat(ARGB.green(strokeARGB)),
+ b = byteToFloat(ARGB.blue(strokeARGB));
+
+ GraphicEffectMap effects = currentState.getEffects();
+
+ strokeShader
+ .setUniform("u_Proj", viewProjection)
+ .setUniform("u_Model", outlineVAO.getTotalTransform())
+ .setUniform("u_Color", r, g, b, a)
+ .setUniform("u_HueShift", (float) effects.getDouble(GraphicEffect.HUE_SHIFT))
+ .setUniform("u_Brightness", (float) effects.getDouble(GraphicEffect.BRIGHTNESS) / 100f)
+ .setUniform("u_Opacity", 1 - (float) effects.getDouble(GraphicEffect.FADE) / 100f);
+ checkError();
+
+ // Draw
+ glLineWidth((float) Mth.clamp(currentState.getLineWidth(), lineWidthRange[0], lineWidthRange[1]));
+ checkError();
+ glDrawArrays(GL_LINE_STRIP, 0, outlineVAO.getVertexArray().getVertexCount());
+ checkError();
+ }
+
+ /**
+ * Cleanup after outline operation(s)
+ */
+ private void outlineTeardown() {
+ GLTransformedVertexArray.unbind();
+ strokeShader.unuse(true);
+ checkError();
+ }
+
+ @Override
+ public void drawShape(Shape shape) {
+ float[] lineWidthRange = outlineSetup();
+
+ for (GLTransformedVertexArray outlineVAO : parent.getVaoCache().outline(shape)) {
+ doOutline(outlineVAO, lineWidthRange);
+ }
+
+ outlineTeardown();
+ }
+
+ @Override
+ public void drawRect(double x, double y, double w, double h) {
+ float[] lineWidthRange = outlineSetup();
+ doOutline(parent.getVaoCache().rect((float) x, (float) y, (float) w, (float) h), lineWidthRange);
+ outlineTeardown();
+ }
+
+ @Override
+ public void drawOval(double x, double y, double w, double h) {
+ float[] lineWidthRange = outlineSetup();
+ doOutline(parent.getVaoCache().oval((float) x, (float) y, (float) w, (float) h), lineWidthRange);
+ outlineTeardown();
+ }
+
+ @Override
+ public void drawLine(double x1, double y1, double x2, double y2) {
+ float[] lineWidthRange = outlineSetup();
+ doOutline(parent.getVaoCache().line((float) x1, (float) y1, (float) x2, (float) y2), lineWidthRange);
+ outlineTeardown();
+ }
+
+ // Filling methods
+
+ /**
+ * Setup before fill operation(s)
+ */
+ private void fillSetup() {
+ // Ensure we're open and parent context is current
+ ensureOpen();
+ parent.makeCurrent();
+ checkError();
+ ensureDrawBufferBound();
+
+ fillShader.use();
+ checkError();
+ applyBlendFunc();
+ applyClip();
+ }
+
+ /**
+ * {@link #fillSetup()} must be called before calling this method
+ */
+ private void doFill(GLTransformedVertexArray fillVAO, boolean triangleFan) {
+ fillVAO.bind();
+ buildTransformMatrix(fillVAO.getTransform());
+ fillVAO.setDirtyTransform();
+
+ int fillARGB = currentState.getFillARGB();
+ float
+ a = byteToFloat(ARGB.alpha(fillARGB)) * byteToFloat(currentState.getAlpha()),
+ r = byteToFloat(ARGB.red(fillARGB)),
+ g = byteToFloat(ARGB.green(fillARGB)),
+ b = byteToFloat(ARGB.blue(fillARGB));
+
+ GraphicEffectMap effects = currentState.getEffects();
+
+ fillShader
+ .setUniform("u_Proj", viewProjection)
+ .setUniform("u_Model", fillVAO.getTotalTransform())
+ .setUniform("u_Color", r, g, b, a)
+ .setUniform("u_HueShift", (float) effects.getDouble(GraphicEffect.HUE_SHIFT))
+ .setUniform("u_Brightness", (float) effects.getDouble(GraphicEffect.BRIGHTNESS) / 100f)
+ .setUniform("u_Opacity", 1 - (float) effects.getDouble(GraphicEffect.FADE) / 100f);
+ checkError();
+
+ if (triangleFan) {
+ glDrawArrays(GL_TRIANGLE_FAN, 0, fillVAO.getVertexArray().getVertexCount());
+ } else {
+ glDrawElements(GL_TRIANGLES, fillVAO.getVertexArray().getIndexCount(), GL_UNSIGNED_INT, 0);
+ }
+ checkError();
+ }
+
+ /**
+ * Cleanup after outline operation(s)
+ */
+ private void fillTeardown() {
+ GLTransformedVertexArray.unbind();
+ fillShader.unuse(true);
+ checkError();
+ }
+
+ @Override
+ public void fillShape(Shape shape) {
+ // First fill...
+ fillSetup();
+ for (GLTransformedVertexArray fillVAO : parent.getVaoCache().triangulate(shape)) {
+ doFill(fillVAO, false);
+ }
+ fillTeardown();
+
+ // ...then outline
+
+ float[] lineWidthRange = outlineSetup();
+ for (GLTransformedVertexArray outlineVAO : parent.getVaoCache().outline(shape)) {
+ doOutline(outlineVAO, lineWidthRange);
+ }
+ outlineTeardown();
+ }
+
+ @Override
+ public void fillRect(double x, double y, double w, double h) {
+ fillSetup();
+ GLTransformedVertexArray rect = parent.getVaoCache().rect((float) x, (float) y, (float) w, (float) h);
+ doFill(rect, false);
+ fillTeardown();
+ float[] lineWidthRange = outlineSetup();
+ doOutline(rect, lineWidthRange);
+ outlineTeardown();
+ }
+
+ @Override
+ public void fillOval(double x, double y, double w, double h) {
+ fillSetup();
+ GLTransformedVertexArray oval = parent.getVaoCache().oval((float) x, (float) y, (float) w, (float) h);
+ doFill(oval, true);
+ fillTeardown();
+ float[] lineWidthRange = outlineSetup();
+ doOutline(oval, lineWidthRange);
+ outlineTeardown();
+ }
+
+ // Image drawing
+
+ @Override
+ public void drawImage(Image image, double x, double y, double w, double h) {
+ ensureOpen();
+
+ // sanity checks
+ if (!Double.isFinite(x)) {
+ throw new IllegalArgumentException("X coordinate must be finite, found: " + x);
+ }
+ if (!Double.isFinite(y)) {
+ throw new IllegalArgumentException("Y coordinate must be finite, found: " + y);
+ }
+ if (w == ORIGINAL_SIZE || h == ORIGINAL_SIZE) {
+ if (!image.isReady()) image.prepare();
+ if (w == ORIGINAL_SIZE) w = image.getIntrinsicWidth();
+ if (h == ORIGINAL_SIZE) h = image.getIntrinsicHeight();
+ }
+ if (!Double.isFinite(w) || w <= 0) {
+ throw new IllegalArgumentException("Width must be finite and positive, found: " + w);
+ }
+ if (!Double.isFinite(h) || h <= 0) {
+ throw new IllegalArgumentException("Height must be finite and positive, found: " + h);
+ }
+
+ if (image instanceof RasterImage raster) {
+ drawUploadedImage(parent.getTextureCache().getOrUploadRaster(raster), x, y, w, h);
+ } else if (image instanceof VectorImage vector) {
+ drawUploadedImage(parent.getTextureCache().getOrUploadVector(vector, new Point2D(w, h)), x, y, w, h);
+ }
+ }
+
+ /**
+ * Draws a texture that's already uploaded to GPU memory.
+ * @param textureId the GL texture name
+ */
+ void drawUploadedImage(int textureId, double x, double y, double w, double h) {
+ parent.makeCurrent();
+ checkError();
+ ensureDrawBufferBound();
+
+ GLTransformedVertexArray imageVAO = parent.getVaoCache().rectImg((float) x, (float) y, (float) w, (float) h);
+ imageVAO.bind();
+ checkError();
+ buildTransformMatrix(imageVAO.getTransform());
+ imageVAO.setDirtyTransform();
+
+ // === 1. Bind Texture ===
+ glActiveTexture(GL_TEXTURE0);
+ checkError();
+ glBindTexture(GL_TEXTURE_2D, textureId);
+ checkError();
+
+ // === 2. Use Image Shader Program ===
+ imageShader.use();
+ checkError();
+
+ // === 3. Set Uniforms ===
+ imageShader
+ .setUniform("u_Proj", viewProjection)
+ .setUniform("u_Model", imageVAO.getTotalTransform())
+ .setUniform("u_Texture", 0) // sampler2D 0 <-> GL_TEXTURE0, current active texture unit
+ .setUniform("u_Alpha", byteToFloat(currentState.getAlpha()));
+ checkError();
+
+ // Apply blend mode and clip
+ applyBlendFunc();
+ applyClip();
+
+ // Pass graphic effects
+ GraphicEffectMap effects = currentState.getEffects();
+ imageShader
+ .setUniform("u_HueShift", (float) effects.getDouble(GraphicEffect.HUE_SHIFT))
+ .setUniform("u_Bulge", (float) effects.getDouble(GraphicEffect.BULGE)) // bulge coefficient
+ .setUniform("u_Whirl", (float) effects.getDouble(GraphicEffect.WHIRL)) // whirl coefficient: 0 - none, negative - whirl clockwise, positive - counter-clockwise
+ .setUniform("u_SkewX", (float) effects.getDouble(GraphicEffect.SKEW_X)) // skew angle: 0 - none, negative - left, positive - right
+ .setUniform("u_SkewY", (float) effects.getDouble(GraphicEffect.SKEW_Y)) // skew angle: 0 - none, negative - left, positive - right
+ .setUniform("u_Mosaic", (float) effects.getDouble(GraphicEffect.MOSAIC))
+ .setUniform("u_Brightness", (float) effects.getDouble(GraphicEffect.BRIGHTNESS) / 100f)
+ .setUniform("u_Opacity", 1 - (float) effects.getDouble(GraphicEffect.FADE) / 100f)
+ .setUniform("u_Pixelation", (float) effects.getDouble(GraphicEffect.PIXELATION));
+ checkError();
+
+ // === 4. Draw Quad ===
+ glDrawElements(GL_TRIANGLES, imageVAO.getVertexArray().getIndexCount(), GL_UNSIGNED_INT, 0);
+ checkError();
+
+ // === 5. Cleanup ===
+ GLTransformedVertexArray.unbind();
+ imageShader.unuse(true);
+ checkError();
+ }
+
+ @Override
+ public GLSubCanvas createSubCanvas(double width, double height) {
+ ensureOpen();
+ parent.makeCurrent();
+ checkError();
+
+ Point2D dim = getDimensions();
+ if (width > dim.x() || height > dim.y()) {
+ throw new IllegalArgumentException("Width and height of a sub-canvas can't be greater than the original");
+ }
+ if (width <= 0 || height <= 0) {
+ throw new IllegalArgumentException("Width and height of a sub-canvas most be positive");
+ }
+ GLSubCanvas renderCanvas = new GLSubCanvas(this);
+ renderCanvas.attachTarget(new GLFramebuffer((int) width, (int) height));
+ renderCanvas.clear();
+ return renderCanvas;
+ }
+
+ // Current state management
+
+ @Override
+ public void translate(double dx, double dy) {
+ currentState.translate(dx, dy);
+ }
+
+ @Override
+ public void rotate(double degrees) {
+ currentState.rotate(degrees);
+ }
+
+ @Override
+ public void scale(double sx, double sy) {
+ currentState.scale(sx, sy);
+ }
+
+ @Override
+ public void mulTransform(AffineTransform at) {
+ currentState.mulTransform(at);
+ }
+
+ @Override
+ public void setFillARGB(int argb) {
+ currentState.setFillARGB(argb);
+ }
+
+ @Override
+ public void setStrokeARGB(int argb) {
+ currentState.setStrokeARGB(argb);
+ }
+
+ @Override
+ public void setLineWidth(double width) {
+ currentState.setLineWidth(width);
+ }
+
+ @Override
+ public void setAlpha(byte alpha) {
+ currentState.setAlpha(alpha);
+ }
+
+ @Override
+ public void setBlendMode(BlendMode mode) {
+ currentState.setBlendMode(mode);
+ }
+
+ @Override
+ public void setEffects(GraphicEffectMap effects) {
+ currentState.setEffects(effects);
+ }
+
+ @Override
+ public void clip(double x, double y, double w, double h) {
+ if (!Double.isFinite(x)) {
+ throw new IllegalArgumentException("X coordinate must be finite, found: " + x);
+ }
+ if (!Double.isFinite(y)) {
+ throw new IllegalArgumentException("Y coordinate must be finite, found: " + y);
+ }
+ if (!Double.isFinite(w) || w <= 0) {
+ throw new IllegalArgumentException("Width must be finite and positive, found: " + w);
+ }
+ if (!Double.isFinite(h) || h <= 0) {
+ throw new IllegalArgumentException("Height must be finite and positive, found: " + h);
+ }
+ currentState.setClipX(x);
+ currentState.setClipY(y);
+ currentState.setClipW(w);
+ currentState.setClipH(h);
+ }
+
+ @Override
+ public void resetClip() {
+ currentState.resetClip();
+ }
+
+ @Override
+ public void save() {
+ stateStack.push(currentState.copy());
+ }
+
+ @Override
+ public void restore() {
+ if (!stateStack.isEmpty()) {
+ currentState = stateStack.pop();
+ }
+ }
+
+ @Override
+ public void setIdentity() {
+ currentState.getTransformStack().clear();
+ currentState.setFillARGB(0xFF_00_00_00);
+ currentState.setStrokeARGB(0xFF_00_00_00);
+ currentState.setLineWidth(1);
+ currentState.setAlpha((byte) 255);
+ currentState.setBlendMode(BlendMode.NORMAL);
+ currentState.setEffects(EMPTY);
+ currentState.resetClip();
+ }
+
+ // Other
+
+ @Override
+ public Point2D getDimensions() {
+ ensureOpen();
+ if (fb == null) {
+ throw new IllegalStateException("No buffer attached");
+ }
+ return fb.getDimensions();
+ }
+
+ @Override
+ public OpenGLContext getContext() {
+ return parent;
+ }
+
+ @Override
+ public void close() {
+ if (!closed) {
+ if (fb != null) {
+ fb.close();
+ fb = null;
+ }
+ closed = true;
+ }
+ }
+
+ //
+
+ // Private implementation
+
+ private void applyBlendFunc() {
+ switch (currentState.getBlendMode()) {
+ case NORMAL -> {
+ // Standard alpha compositing
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ glBlendEquation(GL_FUNC_ADD);
+ }
+ case ADD -> {
+ // Sum all components
+ glBlendFunc(GL_ONE, GL_ONE);
+ glBlendEquation(GL_FUNC_ADD);
+ }
+ case BLEND_SUBTRACT -> {
+ // Subtract all components
+ glBlendFunc(GL_ONE, GL_ONE);
+ glBlendEquation(GL_FUNC_SUBTRACT);
+ }
+ case RGB_SUBTRACT -> {
+ // Subtract RGB components, sum alpha components
+ glBlendFunc(GL_ONE, GL_ONE);
+ glBlendEquationSeparate(GL_FUNC_SUBTRACT, GL_FUNC_ADD);
+ }
+ case BLEND_MULTIPLY -> {
+ // Multiply all components
+ glBlendFunc(GL_DST_COLOR, GL_ZERO);
+ glBlendEquation(GL_FUNC_ADD);
+ }
+ case RGB_MULTIPLY -> {
+ // Multiply RGB components, sum alpha components
+ glBlendFuncSeparate(GL_DST_COLOR, GL_ZERO, GL_ONE, GL_ONE);
+ glBlendEquation(GL_FUNC_ADD);
+ }
+ }
+ checkError();
+ }
+
+ private void applyClip() {
+ if (currentState.hasClip()) {
+ glScissor(
+ (int) currentState.getClipX(),
+ (int) currentState.getClipY(),
+ (int) currentState.getClipW(),
+ (int) currentState.getClipH()
+ );
+ checkError();
+ }
+ }
+
+ private void ensureDrawBufferBound() {
+ ensureBufferBound(true);
+ }
+
+ protected void ensureBufferBound(boolean draw) {
+ if (fb == null) {
+ throw new IllegalStateException("No framebuffer attached");
+ }
+ glBindFramebuffer(draw ? GL_DRAW_FRAMEBUFFER : GL_READ_FRAMEBUFFER, fb.fboId());
+ checkError();
+ glViewport(0, 0, fb.width(), fb.height());
+ checkError();
+ }
+
+ protected static void checkError() {
+ int error = glGetError();
+ if (error != GL_NO_ERROR) {
+ throw new RuntimeException("OpenGL error: 0x" + Integer.toHexString(error).toUpperCase());
+ }
+ }
+
+ private Matrix4f buildTransformMatrix() {
+ if (!currentState.hasTransform()) return IDENTITY_MATRIX;
+ Matrix4f mat = new Matrix4f();
+ buildTransformMatrix(mat);
+ return mat;
+ }
+
+ private void buildTransformMatrix(Matrix4f dest) {
+ dest.identity();
+ if (currentState.hasTransform()) {
+ // Deque.push prepends elements, so we just iterate normally to get reverse transform order
+ currentState.getTransformStack().forEach(op -> op.apply(dest));
+ }
+ }
+
+ /**
+ * Converts a color component from unsigned byte (0 - 255) to float (0.0 - 1.0).
+ *
+ * @param b the color component
+ */
+ private static float byteToFloat(byte b) {
+ return Byte.toUnsignedInt(b) / 255f;
+ }
+
+ protected void ensureOpen() {
+ if (closed) {
+ throw new IllegalStateException("This canvas is closed");
+ }
+ }
+}
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/GLSubCanvas.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/GLSubCanvas.java
new file mode 100644
index 0000000..4aafc45
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/GLSubCanvas.java
@@ -0,0 +1,65 @@
+package net.fokinatorr.sparkle.graphics.impl.gl;
+
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+
+import static org.lwjgl.opengl.GL46.*;
+
+import static lombok.AccessLevel.PRIVATE;
+
+/**
+ * An OpenGL sub-canvas.
+ */
+@Slf4j
+@FieldDefaults(makeFinal = true, level = PRIVATE)
+public class GLSubCanvas extends GLRenderCanvas {
+ public GLSubCanvas(GLRenderCanvas parentCanvas) {
+ super(parentCanvas.getContext(), false);
+ this.parentCanvas = parentCanvas;
+ }
+
+ GLRenderCanvas parentCanvas;
+
+ @Override
+ public boolean isSubCanvas() {
+ return true;
+ }
+
+ @Override
+ public void submitImage(double x, double y, double w, double h) {
+ ensureOpen();
+
+ if (!Double.isFinite(x)) {
+ throw new IllegalArgumentException("X coordinate must be finite, found: " + x);
+ }
+ if (!Double.isFinite(y)) {
+ throw new IllegalArgumentException("Y coordinate must be finite, found: " + y);
+ }
+ if (w == ORIGINAL_SIZE) w = fb.width();
+ if (h == ORIGINAL_SIZE) h = fb.height();
+ if (!Double.isFinite(w) || w <= 0) {
+ throw new IllegalArgumentException("Width must be finite and positive, found: " + w);
+ }
+ if (!Double.isFinite(h) || h <= 0) {
+ throw new IllegalArgumentException("Height must be finite and positive, found: " + h);
+ }
+ if (fb.fboId() == 0) {
+ // should not happen
+ throw new IllegalStateException("Can't get texture of default framebuffer");
+ }
+
+ parent.makeCurrent();
+ flush();
+ ensureBufferBound(false);
+
+ parentCanvas.drawUploadedImage(fb.texId(), x, y, w, h);
+ }
+
+ @Override
+ protected void ensureBufferBound(boolean draw) {
+ super.ensureBufferBound(draw);
+ if (draw) {
+ glBindTexture(GL_TEXTURE_2D, fb.texId());
+ }
+ }
+}
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/OpenGLContext.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/OpenGLContext.java
new file mode 100644
index 0000000..94f98ac
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/OpenGLContext.java
@@ -0,0 +1,136 @@
+package net.fokinatorr.sparkle.graphics.impl.gl;
+
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+import org.lwjgl.opengl.GL;
+import org.lwjgl.opengl.GLCapabilities;
+import org.slf4j.event.Level;
+import net.fokinatorr.sparkle.context.AppContext;
+import net.fokinatorr.sparkle.graphics.image.Image;
+import net.fokinatorr.sparkle.graphics.image.RasterImage;
+import net.fokinatorr.sparkle.graphics.impl.AbstractRenderingContext;
+import net.fokinatorr.sparkle.graphics.impl.OpenGLGraphicsManager;
+import net.fokinatorr.sparkle.graphics.impl.gl.element.GLTextureCache;
+import net.fokinatorr.sparkle.graphics.impl.gl.element.GLVertexArrayCache;
+import net.fokinatorr.sparkle.graphics.impl.gl.shader.GLShaderProgramCache;
+import net.fokinatorr.sparkle.graphics.impl.gl.surface.GL_GLFWWindowSurface;
+import net.fokinatorr.sparkle.stage.Stage;
+
+import java.util.Set;
+
+import static lombok.AccessLevel.PRIVATE;
+import static org.lwjgl.glfw.GLFW.*;
+import static org.lwjgl.opengl.GL46.*;
+import static org.lwjgl.system.MemoryUtil.*;
+
+/**
+ * An OpenGL rendering context bound to a GLFW window.
+ *
+ * This context uses the GLFW window's OpenGL context for rendering.
+ */
+@Slf4j
+@FieldDefaults(makeFinal = true, level = PRIVATE)
+@Getter
+public class OpenGLContext extends AbstractRenderingContext {
+ long glfwWindow; // pointer
+ Set autoLoadImages;
+ GLCapabilities caps;
+ GLRenderCanvas canvas;
+ GLVertexArrayCache vaoCache;
+ GLShaderProgramCache programCache;
+ GLTextureCache textureCache;
+
+ public OpenGLContext(AppContext context,
+ GL_GLFWWindowSurface surface, Stage stage,
+ Set autoLoadImages,
+ OpenGLGraphicsManager parent) {
+ super(context, surface, stage, parent);
+ this.glfwWindow = surface.getGlfwWindow();
+ this.autoLoadImages = autoLoadImages;
+ this.vaoCache = new GLVertexArrayCache(context, this);
+ this.programCache = new GLShaderProgramCache(this);
+ this.textureCache = new GLTextureCache(context, this);
+
+ makeCurrent();
+ caps = GL.createCapabilities(true);
+
+ if (!caps.OpenGL46) {
+ throw new IllegalStateException("OpenGL 4.6 required but not supported");
+ }
+
+ for (Image img : autoLoadImages) {
+ if (img instanceof RasterImage raster) textureCache.getOrUploadRaster(raster);
+ }
+
+ String windowPtrString = "0x" + Long.toHexString(glfwWindow).toUpperCase();
+
+ glfwSwapInterval(1); // V-sync
+ glEnable(GL_BLEND);
+ glEnable(GL_DEBUG_OUTPUT);
+ glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
+ glDebugMessageCallback((source, _, _, severity, length, messagePtr, _) -> {
+ Level logLevel = switch (severity) {
+ case GL_DEBUG_SEVERITY_HIGH -> Level.ERROR;
+ case GL_DEBUG_SEVERITY_MEDIUM -> Level.WARN;
+ default -> Level.DEBUG;
+ };
+ String message = memUTF8(messagePtr, length);
+ String sourceStr = switch (source) {
+ case GL_DEBUG_SOURCE_API -> "OpenGL API";
+ case GL_DEBUG_SOURCE_WINDOW_SYSTEM -> "GLFW";
+ case GL_DEBUG_SOURCE_APPLICATION -> "application";
+ case GL_DEBUG_SOURCE_SHADER_COMPILER -> "shader compiler";
+ default -> "";
+ };
+ log.atLevel(logLevel).log("[{} on context {}] {}", sourceStr, windowPtrString, message);
+ }, NULL);
+ glDisable(GL_LINE_SMOOTH);
+ this.canvas = new GLRenderCanvas(this, !surface.isTranslucent());
+ glFinish(); // wait for GPU initialization
+
+ log.debug("Initialized OpenGL context version {}", glGetString(GL_VERSION));
+ log.debug("\tGL Renderer: {}", glGetString(GL_RENDERER));
+ log.debug("\tGL Vendor: {}", glGetString(GL_VENDOR));
+ log.debug("\tGLFW window: {} ({})", glfwGetWindowTitle(glfwWindow), windowPtrString);
+ int profile = glGetInteger(GL_CONTEXT_PROFILE_MASK);
+ log.debug("\tGL Profile: {}", switch (profile) {
+ case GL_CONTEXT_CORE_PROFILE_BIT -> "Core";
+ case GL_CONTEXT_COMPATIBILITY_PROFILE_BIT -> "Compatibility";
+ case 0 -> "None";
+ default -> "Unknown: " + profile;
+ });
+ }
+
+ public void makeCurrent() {
+ ensureOpen();
+ glfwMakeContextCurrent(glfwWindow);
+ GL.setCapabilities(caps);
+ }
+
+ @Override
+ protected void doClose() {
+ makeCurrent();
+ glFinish();
+
+ vaoCache.close();
+ programCache.close();
+ textureCache.close();
+ canvas.close();
+
+ GL.setCapabilities(null);
+ glfwMakeContextCurrent(0);
+
+ // GL context destroyed by the surface
+ }
+
+ @Override
+ public OpenGLGraphicsManager getParent() {
+ return (OpenGLGraphicsManager) super.getParent();
+ }
+
+ @Override
+ public GL_GLFWWindowSurface getSurface() {
+ return (GL_GLFWWindowSurface) super.getSurface();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/element/GLTextureCache.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/element/GLTextureCache.java
new file mode 100644
index 0000000..66f6b6e
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/element/GLTextureCache.java
@@ -0,0 +1,170 @@
+package net.fokinatorr.sparkle.graphics.impl.gl.element;
+
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.NonFinal;
+import org.lwjgl.opengl.GL46;
+import net.fokinatorr.sparkle.context.AppContext;
+import net.fokinatorr.sparkle.graphics.ARGB;
+import net.fokinatorr.sparkle.graphics.PixelReader;
+import net.fokinatorr.sparkle.graphics.image.Image;
+import net.fokinatorr.sparkle.graphics.image.RasterImage;
+import net.fokinatorr.sparkle.graphics.image.VectorImage;
+import net.fokinatorr.sparkle.graphics.impl.gl.OpenGLContext;
+import net.fokinatorr.sparkle.phys2d.Point2D;
+import net.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
+
+import java.lang.ref.Cleaner;
+import java.nio.ByteBuffer;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.WeakHashMap;
+
+import static org.lwjgl.opengl.GL46.*;
+import static org.lwjgl.system.MemoryUtil.*;
+
+/**
+ * A cache for loaded images -> uploaded textures.
+ */
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+@RequiredArgsConstructor
+public class GLTextureCache implements NonThrowingAutoCloseable {
+
+ Map rasterTextures = new WeakHashMap<>(); // Object2IntMap doesn't have weak implementations sadly
+ Map> vectorTextures = new WeakHashMap<>();
+ Set texDeleters = new HashSet<>();
+ AppContext appContext;
+ OpenGLContext glContext;
+
+ @NonFinal
+ boolean closed;
+
+ /**
+ * Returns a ready texture ID, or uploads the given raster image to GPU and stores and returns its texture ID.
+ * @param image the source image
+ * @return the cached/uploaded texture
+ */
+ public int getOrUploadRaster(RasterImage image) {
+ ensureOpen();
+ if (!rasterTextures.containsKey(image)) {
+ glContext.makeCurrent();
+ if (!image.isReady()) image.prepare();
+
+ int textureId = doUpload(image.createPixelReader());
+ rasterTextures.put(image, textureId);
+ return registerCleanupRaster(image, textureId);
+ }
+ return rasterTextures.get(image);
+ }
+
+ /**
+ * Returns a ready texture ID, or uploads the given vector image to GPU with the given dimensions and stores and returns its texture ID.
+ * @param image the source image
+ * @param dim the desired image dimensions
+ * @return the cached/uploaded texture
+ */
+ public int getOrUploadVector(VectorImage image, Point2D dim) {
+ ensureOpen();
+ Object2IntMap resolutions = vectorTextures.computeIfAbsent(image, _ -> {
+ Object2IntMap result = new Object2IntOpenHashMap<>();
+ registerCleanupVector(image, result);
+ return result;
+ });
+ if (!resolutions.containsKey(dim)) {
+ glContext.makeCurrent();
+ if (!image.isReady()) image.prepare();
+
+ int textureId = doUpload(image.createPixelReader(dim));
+ resolutions.put(dim, textureId);
+ return textureId;
+ }
+ return resolutions.getInt(dim);
+ }
+
+ private int doUpload(PixelReader reader) {
+ int width = reader.getWidth();
+ int height = reader.getHeight();
+
+ int textureId = glGenTextures();
+ glBindTexture(GL_TEXTURE_2D, textureId);
+
+ ByteBuffer pixels = memAlloc(width * height * Integer.BYTES);
+ int[][] data = reader.getAll();
+ for (int y = height - 1; y >= 0; y--) { // Flip Y to match OpenGL's coordinate system
+ for (int x = 0; x < width; x++) {
+ int argb = data[y][x];
+ pixels
+ .put(ARGB.red(argb))
+ .put(ARGB.green(argb))
+ .put(ARGB.blue(argb))
+ .put(ARGB.alpha(argb));
+ }
+ }
+ pixels.flip();
+
+ glTexImage2D(
+ GL_TEXTURE_2D,
+ 0,
+ GL_RGBA,
+ width, height,
+ 0,
+ GL_RGBA, GL_UNSIGNED_BYTE,
+ pixels
+ );
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+ memFree(pixels);
+ return textureId;
+ }
+
+ /**
+ * {@inheritDoc}
+ * After calling this method, this texture cache must not be used.
+ * Idempotent.
+ */
+ @Override
+ public void close() {
+ if (!closed) {
+ glContext.makeCurrent();
+ rasterTextures.values().forEach(GL46::glDeleteTextures);
+ rasterTextures.clear();
+ texDeleters.forEach(Cleaner.Cleanable::clean);
+ texDeleters.clear();
+ closed = true;
+ }
+ }
+
+ private void ensureOpen() {
+ if (closed) {
+ throw new IllegalStateException("Texture cache is closed");
+ }
+ }
+
+ private int registerCleanupRaster(Image img, int tex) {
+ Cleaner cleaner = appContext.get(Cleaner.class);
+ texDeleters.add(cleaner.register(img, () -> {
+ if (!glContext.isClosed()) { // Need to check since cleaning action may run after context closing
+ glContext.makeCurrent();
+ glDeleteTextures(tex);
+ }
+ }));
+ return tex;
+ }
+
+ private void registerCleanupVector(Image img, Object2IntMap textures) {
+ Cleaner cleaner = appContext.get(Cleaner.class);
+ texDeleters.add(cleaner.register(img, () -> {
+ if (!glContext.isClosed()) { // Need to check since cleaning action may run after context closing
+ glContext.makeCurrent();
+ textures.values().forEach(GL46::glDeleteTextures);
+ }
+ }));
+ }
+}
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/element/GLTransformedVertexArray.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/element/GLTransformedVertexArray.java
new file mode 100644
index 0000000..b98766b
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/element/GLTransformedVertexArray.java
@@ -0,0 +1,71 @@
+package net.fokinatorr.sparkle.graphics.impl.gl.element;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.NonFinal;
+import org.joml.*;
+
+/**
+ * A decorator over {@link GLVertexArray}, adding transformation matrices.
+ * There are two: one for internal transformations (e.g. transforming unit VAOs),
+ * and another - for user-supplied transformations.
+ *
The underlying vertex array is not owned by this decorator, you must close it manually when needed!
+ */
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+@Getter
+@RequiredArgsConstructor
+public class GLTransformedVertexArray {
+ /**
+ * The decorated VAO.
+ */
+ GLVertexArray vertexArray;
+ /**
+ * The internal model matrix.
+ */
+ Matrix4f internTransform = new Matrix4f();
+ /**
+ * The user-provided model matrix.
+ */
+ Matrix4f transform = new Matrix4f();
+ Matrix4f totalTransform = new Matrix4f();
+
+ @NonFinal boolean transformDirty = true; // lazy (re)calculation on demand
+
+ /**
+ * Returns the combined transformation matrix of this object.
+ * @return the total transformation matrix
+ */
+ public Matrix4fc getTotalTransform() {
+ if (transformDirty) {
+ transform.mul(internTransform, totalTransform);
+ transformDirty = false;
+ }
+ return totalTransform;
+ }
+
+ /**
+ * Marks that a change in one of transform matrices has occurred
+ * and the final transform needs to be recalculated.
+ */
+ public void setDirtyTransform() {
+ transformDirty = true;
+ }
+
+ /**
+ * Binds this vertex array.
+ *
+ * @throws IllegalStateException if the underlying vertex array is closed
+ */
+ public void bind() {
+ vertexArray.bind();
+ }
+
+ /**
+ * Unbinds the currently bound vertex array.
+ */
+ public static void unbind() {
+ GLVertexArray.unbind();
+ }
+}
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/element/GLVertexArray.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/element/GLVertexArray.java
new file mode 100644
index 0000000..268b500
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/element/GLVertexArray.java
@@ -0,0 +1,169 @@
+package net.fokinatorr.sparkle.graphics.impl.gl.element;
+
+import it.unimi.dsi.fastutil.floats.FloatCollection;
+import it.unimi.dsi.fastutil.ints.IntCollection;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+import net.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
+
+import java.util.Objects;
+
+import static org.lwjgl.opengl.GL46.*;
+
+/**
+ * An OpenGL vertex array object (VAO).
+ * May have a vertex buffer (VBO) and an index/element buffer (EBO).
+ */
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class GLVertexArray implements NonThrowingAutoCloseable {
+ @Getter(AccessLevel.PACKAGE)
+ final int vao, vbo, ebo;
+ /**
+ * The vertex count, required for array drawing.
+ */
+ @Getter
+ final int vertexCount;
+ /**
+ * The count of indices, required for element drawing.
+ */
+ @Getter
+ final int indexCount;
+ boolean closed;
+
+ /**
+ * Creates a new vertex array with the given vertex and index data.
+ *
+ * @param vertices the VBO content
+ * @param indices the EBO content
+ * @param hasUV whether VBO contains UV coordinates
+ * @throws NullPointerException if any argument is {@code null}
+ */
+ public GLVertexArray(float[] vertices, int[] indices, boolean hasUV) {
+ Objects.requireNonNull(vertices, "vertices");
+ Objects.requireNonNull(indices, "indices");
+
+ this.vao = glGenVertexArrays();
+ this.vbo = glGenBuffers();
+ this.ebo = glGenBuffers();
+ this.vertexCount = hasUV ? vertices.length / 5 : vertices.length / 3;
+ this.indexCount = indices.length;
+
+ bind();
+ glBindBuffer(GL_ARRAY_BUFFER, vbo);
+ glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ebo);
+
+ glBufferData(GL_ARRAY_BUFFER, vertices, GL_STATIC_DRAW);
+ glBufferData(GL_ELEMENT_ARRAY_BUFFER, indices, GL_STATIC_DRAW);
+
+ glEnableVertexAttribArray(0);
+ if (hasUV) {
+ glVertexAttribPointer(0, 3, GL_FLOAT, false, 5 * Float.BYTES, 0);
+ glEnableVertexAttribArray(1);
+ glVertexAttribPointer(1, 2, GL_FLOAT, false, 5 * Float.BYTES, 3 * Float.BYTES);
+ } else {
+ glVertexAttribPointer(0, 3, GL_FLOAT, false, 3 * Float.BYTES, 0);
+ }
+
+ unbind();
+ glBindBuffer(GL_ARRAY_BUFFER, 0);
+ glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+ }
+
+ /**
+ * Creates a new vertex array with only vertex data. It will not have an EBO.
+ *
+ * @param vertices the VBO content
+ * @param hasUV whether VBO contains UV coordinates
+ * @throws NullPointerException if any argument is {@code null}
+ */
+ public GLVertexArray(float[] vertices, boolean hasUV) {
+ Objects.requireNonNull(vertices, "vertices");
+
+ this.vao = glGenVertexArrays();
+ this.vbo = glGenBuffers();
+ this.ebo = 0;
+ this.vertexCount = hasUV ? vertices.length / 5 : vertices.length / 3;
+ this.indexCount = 0;
+
+ bind();
+ glBindBuffer(GL_ARRAY_BUFFER, vbo);
+ glBufferData(GL_ARRAY_BUFFER, vertices, GL_STATIC_DRAW);
+
+ glEnableVertexAttribArray(0);
+ if (hasUV) {
+ glVertexAttribPointer(0, 3, GL_FLOAT, false, 5 * Float.BYTES, 0);
+ glEnableVertexAttribArray(1);
+ glVertexAttribPointer(1, 2, GL_FLOAT, false, 5 * Float.BYTES, 3 * Float.BYTES);
+ } else {
+ glVertexAttribPointer(0, 3, GL_FLOAT, false, 3 * Float.BYTES, 0);
+ }
+
+ unbind();
+ glBindBuffer(GL_ARRAY_BUFFER, 0);
+ }
+
+ /**
+ * Creates a new vertex array with the given vertex and index data.
+ *
+ * @param vertices the VBO content
+ * @param indices the EBO content
+ * @param hasUV whether VBO contains UV coordinates
+ * @throws NullPointerException if any argument is {@code null}
+ */
+ public GLVertexArray(FloatCollection vertices, IntCollection indices, boolean hasUV) {
+ Objects.requireNonNull(vertices, "vertices");
+ Objects.requireNonNull(indices, "indices");
+ this(vertices.toFloatArray(), indices.toIntArray(), hasUV);
+ }
+
+ /**
+ * Creates a new vertex array with only vertex data. It will not have an EBO.
+ *
+ * @param vertices the VBO content
+ * @param hasUV whether VBO contains UV coordinates
+ * @throws NullPointerException if any argument is {@code null}
+ */
+ public GLVertexArray(FloatCollection vertices, boolean hasUV) {
+ Objects.requireNonNull(vertices, "vertices");
+ this(vertices.toFloatArray(), hasUV);
+ }
+
+ /**
+ * Binds this vertex array.
+ *
+ * @throws IllegalStateException if this vertex array is closed
+ */
+ public void bind() {
+ ensureOpen();
+ glBindVertexArray(vao);
+ }
+
+ /**
+ * Unbinds the currently bound vertex array.
+ */
+ public static void unbind() {
+ glBindVertexArray(0);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
After calling this method, the vertex array should not be used.
+ * Idempotent.
+ */
+ @Override
+ public void close() {
+ if (!closed) {
+ glDeleteVertexArrays(vao);
+ glDeleteBuffers(vbo);
+ if (ebo > 0) glDeleteBuffers(ebo);
+ closed = true;
+ }
+ }
+
+ private void ensureOpen() {
+ if (closed) {
+ throw new IllegalStateException("Vertex array is closed");
+ }
+ }
+}
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/element/GLVertexArrayCache.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/element/GLVertexArrayCache.java
new file mode 100644
index 0000000..eca0b26
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/element/GLVertexArrayCache.java
@@ -0,0 +1,473 @@
+package net.fokinatorr.sparkle.graphics.impl.gl.element;
+
+import it.unimi.dsi.fastutil.doubles.DoubleArrayList;
+import it.unimi.dsi.fastutil.doubles.DoubleList;
+import it.unimi.dsi.fastutil.floats.FloatArrayList;
+import it.unimi.dsi.fastutil.floats.FloatList;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntList;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.NonFinal;
+import org.poly2tri.Poly2Tri;
+import org.poly2tri.geometry.polygon.Polygon;
+import org.poly2tri.geometry.polygon.PolygonPoint;
+import org.poly2tri.geometry.primitives.Point;
+import net.fokinatorr.sparkle.context.AppContext;
+import net.fokinatorr.sparkle.graphics.impl.gl.OpenGLContext;
+import net.fokinatorr.sparkle.util.Mth;
+import net.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
+
+import java.awt.*;
+import java.awt.geom.PathIterator;
+import java.lang.ref.Cleaner;
+import java.util.*;
+import java.util.List;
+
+import static java.awt.geom.PathIterator.*;
+import static java.awt.geom.PathIterator.SEG_CLOSE;
+import static java.awt.geom.PathIterator.SEG_QUADTO;
+import static org.lwjgl.opengl.GL30.*;
+
+/**
+ * A storage for commonly used vertex arrays.
+ */
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+@RequiredArgsConstructor
+public class GLVertexArrayCache implements NonThrowingAutoCloseable {
+ // Note: org.joml.Math has faster and precise enough for rendering trigonometric functions than java.lang.Math, so we're using it here
+
+ /**
+ * render mode: DrawElements(TRIANGLES,..)
+ */
+ @Getter(lazy = true, value = AccessLevel.PRIVATE)
+ GLVertexArray unitRect = makeUnitRect();
+ /**
+ * render mode: DrawElements(TRIANGLES,..)
+ */
+ @Getter(lazy = true, value = AccessLevel.PRIVATE)
+ GLVertexArray unitImg = makeUnitImg();
+
+ /**
+ * render mode: DrawArrays(TRIANGLE_FAN,..)
+ */
+ @Getter(lazy = true, value = AccessLevel.PRIVATE)
+ GLVertexArray unitOval = makeUnitOval();
+
+ /**
+ * render mode: DrawArrays(LINE_STRIP,..)
+ */
+ @Getter(lazy = true, value = AccessLevel.PRIVATE)
+ GLVertexArray unitLine = makeUnitLine();
+
+ Map> triangles = new WeakHashMap<>();
+ Map> outlines = new WeakHashMap<>();
+ Set vaDeleters = new HashSet<>();
+ AppContext appContext;
+ OpenGLContext glContext;
+
+
+ @NonFinal
+ boolean closed;
+
+ /**
+ * Returns a rectangle vertex array with the specified position and size.
+ *
+ * @param x the origin X coordinate
+ * @param y the origin Y coordinate
+ * @param w the width
+ * @param h the height
+ * @return a rectangle VAO
+ */
+ public GLTransformedVertexArray rect(float x, float y, float w, float h) {
+ ensureOpen();
+ GLTransformedVertexArray result = new GLTransformedVertexArray(getUnitRect());
+ result.getInternTransform()
+ .scaleXY(w, h)
+ .translate(x / w, y / h, 0);
+ return result;
+ }
+
+ /**
+ * Returns a rectangle vertex array with the specified position and size for rendering images.
+ *
+ * @param x the origin X coordinate
+ * @param y the origin Y coordinate
+ * @param w the width
+ * @param h the height
+ * @return a rectangle VAO for images
+ */
+ public GLTransformedVertexArray rectImg(float x, float y, float w, float h) {
+ ensureOpen();
+ GLTransformedVertexArray result = new GLTransformedVertexArray(getUnitImg());
+ result.getInternTransform()
+ .scaleXY(w, h)
+ .translate(x / w, y / h, 0);
+ return result;
+ }
+
+ /**
+ * Returns an ellipse vertex array enclosed by a rectangle with the specified position and size.
+ *
+ * @param x the enclosing rectangle's origin X coordinate
+ * @param y the origin Y coordinate
+ * @param w the width
+ * @param h the height
+ * @return an ellipse VAO
+ */
+ public GLTransformedVertexArray oval(float x, float y, float w, float h) {
+ ensureOpen();
+ GLTransformedVertexArray result = new GLTransformedVertexArray(getUnitOval());
+ result.getInternTransform()
+ .scaleXY(w, h)
+ .translate(x / w, y / h, 0);
+ return result;
+ }
+
+
+ /**
+ * Returns a line vertex array between the specified positions.
+ *
+ * @param x1 the first position X coordinate
+ * @param y1 the first position Y coordinate
+ * @param x2 the second position X coordinate
+ * @param y2 the second position Y coordinate
+ * @return a line VAO
+ */
+ public GLTransformedVertexArray line(float x1, float y1, float x2, float y2) {
+ ensureOpen();
+ glContext.makeCurrent();
+ GLTransformedVertexArray result = new GLTransformedVertexArray(getUnitLine());
+ float dist = x2 - x1;
+ result.getInternTransform()
+ .scaleXY(dist, 1)
+ .rotateZ((float) org.joml.Math.atan2((double) y2 - y1, dist))
+ .translate(x1 / dist, y1, 0);
+ return result;
+ }
+
+ /**
+ * Returns vertex arrays for each subpath of the given {@link Shape} for filling operations.
+ * For shapes with a united path, the returned list is a singleton.
+ *
+ * @param shape the shape
+ * @return VAOs for the given shape, triangulated
+ * @throws NullPointerException if any argument is {@code null}
+ */
+ public List triangulate(Shape shape) {
+ ensureOpen();
+ Objects.requireNonNull(shape, "shape");
+ return triangles.computeIfAbsent(shape, _ -> {
+ List results = new LinkedList<>();
+ // Convert Shape to vertices & triangulate
+ for (DoubleList path : shapeToVertices(shape)) {
+ // shapeToVertices size is always a multiple of 3
+ List points = new LinkedList<>();
+ for (int i = 0; i < path.size(); i += 3) {
+ points.add(new PolygonPoint(
+ path.getDouble(i),
+ path.getDouble(i + 1),
+ path.getDouble(i + 2)
+ ));
+ }
+ Polygon polygon = new Polygon(points);
+ Poly2Tri.triangulate(polygon);
+
+ FloatList vertices = new FloatArrayList();
+ IntList indices = new IntArrayList();
+ Object2IntMap pointIndex = new Object2IntOpenHashMap<>();
+ for (var triangle : polygon.getTriangles()) {
+ for (var point : triangle.points) {
+ indices.add(pointIndex.computeIfAbsent(point, _ -> {
+ int result = vertices.size() / 3;
+ vertices.add((float) point.getX());
+ vertices.add((float) point.getY());
+ vertices.add((float) point.getZ());
+ return result;
+ }));
+ }
+ }
+ if (!vertices.isEmpty()) {
+ glContext.makeCurrent();
+ results.add(registerCleanup(new GLVertexArray(vertices, indices, false)));
+ }
+ }
+ return Collections.unmodifiableList(results);
+ })
+ .stream()
+ .map(GLTransformedVertexArray::new)
+ .toList();
+ }
+
+ /**
+ * Returns path vertex arrays for each subpath of the given {@link Shape} for stroking operations.
+ * For shapes with a united path, the returned list is a singleton.
+ *
+ * @param shape the shape
+ * @return VAOs for the given shape, representing outlines
+ * @throws NullPointerException if any argument is {@code null}
+ */
+ public List outline(Shape shape) {
+ ensureOpen();
+ Objects.requireNonNull(shape, "shape");
+ return outlines.computeIfAbsent(shape, _ -> {
+ List results = new LinkedList<>();
+ // Convert Shape to vertices & triangulate
+ for (DoubleList path : shapeToVertices(shape)) {
+ if (!path.isEmpty()) {
+ FloatList floatPath = new FloatArrayList(path.size());
+ path.forEach((double v) -> floatPath.add((float) v));
+ glContext.makeCurrent();
+ results.add(registerCleanup(new GLVertexArray(floatPath, false)));
+ }
+ }
+ return Collections.unmodifiableList(results);
+ })
+ .stream()
+ .map(GLTransformedVertexArray::new)
+ .toList();
+ }
+
+ /**
+ * {@inheritDoc}
+ * After calling this method, this VAO cache must not be used.
+ * Idempotent.
+ */
+ @Override
+ public void close() {
+ if (!closed) {
+ glContext.makeCurrent();
+ getUnitRect().close();
+ getUnitImg().close();
+ getUnitOval().close();
+ getUnitLine().close();
+ triangles.values().forEach(glVertexArrays -> glVertexArrays.forEach(GLVertexArray::close));
+ triangles.clear();
+ outlines.values().forEach(glVertexArrays -> glVertexArrays.forEach(GLVertexArray::close));
+ outlines.clear();
+ vaDeleters.forEach(Cleaner.Cleanable::clean); // unregister cleaning actions since VAOs already closed
+ vaDeleters.clear();
+ closed = true;
+ }
+ }
+
+
+ // Private impl
+
+ private void ensureOpen() {
+ if (closed) {
+ throw new IllegalStateException("VAO cache is closed");
+ }
+ }
+
+ private static List shapeToVertices(Shape shape) {
+ PathIterator itr = shape.getPathIterator(null);
+ List paths = new LinkedList<>();
+ DoubleList currentVertices = null;
+
+ double lastX = 0, lastY = 0;
+ double[] coords = new double[6];
+
+ loop:
+ while (!itr.isDone()) {
+ switch (itr.currentSegment(coords)) {
+ case SEG_MOVETO -> {
+ if (currentVertices != null) {
+ paths.add(currentVertices);
+ }
+ currentVertices = new DoubleArrayList();
+ currentVertices.add(lastX = coords[0]);
+ currentVertices.add(lastY = coords[1]);
+ currentVertices.add(0);
+ }
+ case SEG_LINETO -> {
+ if (currentVertices == null) {
+ currentVertices = new DoubleArrayList();
+ }
+ currentVertices.add(lastX = coords[0]);
+ currentVertices.add(lastY = coords[1]);
+ currentVertices.add(0);
+ }
+ case SEG_CUBICTO -> {
+ if (currentVertices == null) {
+ currentVertices = new DoubleArrayList();
+ }
+ cubicToVertices(
+ currentVertices,
+ lastX, lastY,
+ coords[0], coords[1],
+ coords[2], coords[3],
+ coords[4], coords[5]
+ );
+ lastX = coords[4];
+ lastY = coords[5];
+ }
+ case SEG_QUADTO -> {
+ if (currentVertices == null) {
+ currentVertices = new DoubleArrayList();
+ }
+ quadToVertices(
+ currentVertices,
+ lastX, lastY,
+ coords[0], coords[1],
+ coords[2], coords[3]
+ );
+ lastX = coords[2];
+ lastY = coords[3];
+ }
+ case SEG_CLOSE -> {
+ if (currentVertices == null) {
+ currentVertices = new DoubleArrayList();
+ }
+ break loop;
+ }
+ }
+ itr.next();
+ }
+
+ if (currentVertices != null) {
+ paths.add(currentVertices);
+ }
+ return paths;
+ }
+
+ /**
+ * Converts a cubic curve into vertices suitable for OpenGL.
+ *
+ * @param dest the destination vertex list
+ * @param x0 the current X
+ * @param y0 the current Y
+ * @param x1 the first control X
+ * @param y1 the first control Y
+ * @param x2 the second control X
+ * @param y2 the second control Y
+ * @param x3 the third control X
+ * @param y3 the third control Y
+ */
+ private static void cubicToVertices(
+ DoubleList dest,
+ double x0, double y0,
+ double x1, double y1,
+ double x2, double y2,
+ double x3, double y3
+ ) {
+ for (double t = 0; t <= 1; t += 0.05) { // TODO adjust step size?
+ dest.add(Mth.cubicCurve(t, x0, x1, x2, x3));
+ dest.add(Mth.cubicCurve(t, y0, y1, y2, y3));
+ dest.add(0);
+ }
+ }
+
+ /**
+ * Converts a quadratic curve into vertices suitable for OpenGL.
+ *
+ * @param dest the destination vertex list
+ * @param x0 the current X
+ * @param y0 the current Y
+ * @param x1 the first control X
+ * @param y1 the first control Y
+ * @param x2 the second control X
+ * @param y2 the second control Y
+ */
+ private static void quadToVertices(
+ DoubleList dest,
+ double x0, double y0,
+ double x1, double y1,
+ double x2, double y2
+ ) {
+ for (double t = 0; t <= 1; t += 0.05) { // TODO adjust step size?
+ dest.add((float) Mth.quadCurve(t, x0, x1, x2));
+ dest.add((float) Mth.quadCurve(t, y0, y1, y2));
+ dest.add(0);
+ }
+ }
+
+ private GLVertexArray registerCleanup(GLVertexArray va) {
+ Cleaner cleaner = appContext.get(Cleaner.class);
+ int vao = va.getVao();
+ int vbo = va.getVbo();
+ int ebo = va.getEbo();
+ vaDeleters.add(cleaner.register(va, () -> {
+ if (!glContext.isClosed()) { // Need to check since cleaning action may run after context closing
+ glContext.makeCurrent();
+ glDeleteVertexArrays(vao);
+ glDeleteBuffers(vbo);
+ if (ebo > 0) glDeleteBuffers(ebo);
+ }
+ }));
+ return va;
+ }
+
+ // Below methods are only for Lombok purposes, do not call them
+
+ private GLVertexArray makeUnitRect() {
+ glContext.makeCurrent();
+ return new GLVertexArray(
+ new float[]{
+// x y z
+ 0, 0, 0,
+ 0, 1, 0,
+ 1, 1, 0,
+ 1, 0, 0
+ },
+ new int[]{
+ 0, 1, 2, // ΔABC
+ 0, 2, 3 // ΔADC
+ },
+ false
+ );
+ }
+
+ private GLVertexArray makeUnitOval() {
+ glContext.makeCurrent();
+ int segments = 32;
+ FloatList vertices = new FloatArrayList(segments * 3);
+
+ for (int i = 0; i <= segments; i++) {
+ double theta = Math.TAU * i / segments;
+ float x = (float) org.joml.Math.cos(theta) * 0.5f + 0.5f;
+ float y = (float) org.joml.Math.sin(theta) * 0.5f + 0.5f;
+ vertices.add(x);
+ vertices.add(y);
+ vertices.add(0);
+ }
+
+ return new GLVertexArray(vertices, false);
+ }
+
+
+ private GLVertexArray makeUnitImg() {
+ glContext.makeCurrent();
+ return new GLVertexArray(
+ new float[]{
+// x y z u v
+ 0, 0, 0, 0, 1,
+ 0, 1, 0, 0, 0,
+ 1, 1, 0, 1, 0,
+ 1, 0, 0, 1, 1
+ },
+ new int[]{
+ 0, 1, 2, // ΔABC
+ 0, 2, 3 // ΔADC
+ },
+ true
+ );
+ }
+
+ private GLVertexArray makeUnitLine() {
+ glContext.makeCurrent();
+ return new GLVertexArray(
+ new float[]{
+// x y z
+ 0, 0, 0,
+ 1, 0, 0
+ },
+ false
+ );
+ }
+
+}
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/shader/GLShaderProgram.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/shader/GLShaderProgram.java
similarity index 92%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/shader/GLShaderProgram.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/shader/GLShaderProgram.java
index 647e036..538d916 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/shader/GLShaderProgram.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/shader/GLShaderProgram.java
@@ -1,14 +1,14 @@
-package ru.fokinatorr.sparkle.graphics.impl.gl.shader;
+package net.fokinatorr.sparkle.graphics.impl.gl.shader;
-import it.unimi.dsi.fastutil.ints.Int2IntMap;
-import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import lombok.Getter;
import lombok.experimental.FieldDefaults;
-import org.joml.Matrix4f;
+import org.joml.Matrix4fc;
import org.lwjgl.opengl.GL20;
-import ru.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
+import net.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
import java.nio.FloatBuffer;
import java.util.Map;
@@ -26,7 +26,7 @@ import static org.lwjgl.system.MemoryStack.stackPush;
@Getter
public class GLShaderProgram implements NonThrowingAutoCloseable {
final int programId;
- final Int2IntMap uniformLocationsCache = new Int2IntOpenHashMap();
+ final Object2IntMap uniformLocationsCache = new Object2IntOpenHashMap<>();
boolean closed;
@@ -118,12 +118,11 @@ public class GLShaderProgram implements NonThrowingAutoCloseable {
ensureOpen();
int[] currentProgram = {0};
glGetIntegerv(GL_CURRENT_PROGRAM, currentProgram);
- if (currentProgram[0] == programId) {
- glUseProgram(0);
+ if (currentProgram[0] != programId) {
+ return;
}
- } else {
- glUseProgram(0);
}
+ glUseProgram(0);
}
/**
@@ -184,7 +183,7 @@ public class GLShaderProgram implements NonThrowingAutoCloseable {
* @param matrix the matrix
* @return this program
*/
- public GLShaderProgram setUniform(String name, Matrix4f matrix) {
+ public GLShaderProgram setUniform(String name, Matrix4fc matrix) {
int loc = getUniformLocation(name);
if (loc != -1) {
try (var stack = stackPush()) {
@@ -217,7 +216,7 @@ public class GLShaderProgram implements NonThrowingAutoCloseable {
}
private int getUniformLocation(String name) {
- return uniformLocationsCache.computeIfAbsent(name.hashCode(), _ -> glGetUniformLocation(programId, name));
+ return uniformLocationsCache.computeIfAbsent(name, _ -> glGetUniformLocation(programId, name));
}
private static void checkCompiled(int shader, String type, String code) {
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/shader/GLShaderProgramCache.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/shader/GLShaderProgramCache.java
new file mode 100644
index 0000000..dd3a305
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/shader/GLShaderProgramCache.java
@@ -0,0 +1,51 @@
+package net.fokinatorr.sparkle.graphics.impl.gl.shader;
+
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+import net.fokinatorr.sparkle.graphics.impl.gl.OpenGLContext;
+import net.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.function.Supplier;
+
+/**
+ * A name-based cache for {@link GLShaderProgram} instances.
+ */
+@FieldDefaults(level = AccessLevel.PRIVATE)
+@RequiredArgsConstructor
+public class GLShaderProgramCache implements NonThrowingAutoCloseable {
+
+ final ConcurrentMap programs = new ConcurrentHashMap<>();
+ final OpenGLContext glContext;
+
+ boolean closed;
+
+ /**
+ * Gets or creates a shader program with the specified name. The given creation function is only called
+ * if no program exists with the given name.
+ *
+ * @param name the unique identifier of the desired instance
+ * @param creator a supplier that provides the new program
+ * @return the existing or newly created and cached shader program instance
+ * @throws IllegalStateException if this cache is closed
+ */
+ public GLShaderProgram getOrCreate(String name, Supplier extends GLShaderProgram> creator) {
+ if (closed) {
+ throw new IllegalStateException("Shader program cache is closed");
+ }
+ glContext.makeCurrent();
+ return programs.computeIfAbsent(name, _ -> creator.get());
+ }
+
+ @Override
+ public void close() {
+ if (!closed) {
+ glContext.makeCurrent();
+ programs.values().forEach(GLShaderProgram::close);
+ programs.clear();
+ closed = true;
+ }
+ }
+}
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/shader/ShaderCompileException.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/shader/ShaderCompileException.java
similarity index 95%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/shader/ShaderCompileException.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/shader/ShaderCompileException.java
index 59b2c85..7903fc3 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/shader/ShaderCompileException.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/shader/ShaderCompileException.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.graphics.impl.gl.shader;
+package net.fokinatorr.sparkle.graphics.impl.gl.shader;
import lombok.Getter;
import lombok.experimental.FieldDefaults;
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/ShaderLoader.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/shader/ShaderLoader.java
similarity index 92%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/ShaderLoader.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/shader/ShaderLoader.java
index 8c934f0..9afead5 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/ShaderLoader.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/shader/ShaderLoader.java
@@ -1,7 +1,7 @@
-package ru.fokinatorr.sparkle.graphics.impl.gl;
+package net.fokinatorr.sparkle.graphics.impl.gl.shader;
import lombok.experimental.UtilityClass;
-import ru.fokinatorr.sparkle.util.Constants;
+import net.fokinatorr.sparkle.util.Constants;
import java.io.IOException;
import java.nio.file.Files;
@@ -55,7 +55,7 @@ public class ShaderLoader {
if (lastIndexOfDot >= 0) {
name = name.substring(0, lastIndexOfDot);
}
- snippetMap.put("{{" + name + "}}", loadSnippet(snippet));
+ snippetMap.put("// {{" + name + "}}", loadSnippet(snippet));
});
} catch (IOException e) {
throw new ExceptionInInitializerError(e);
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/shader/ShaderProgramLinkException.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/shader/ShaderProgramLinkException.java
similarity index 93%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/shader/ShaderProgramLinkException.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/shader/ShaderProgramLinkException.java
index 2bfdf55..c886223 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/shader/ShaderProgramLinkException.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/shader/ShaderProgramLinkException.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.graphics.impl.gl.shader;
+package net.fokinatorr.sparkle.graphics.impl.gl.shader;
import lombok.Getter;
import lombok.experimental.FieldDefaults;
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/shader/ShaderType.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/shader/ShaderType.java
similarity index 93%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/shader/ShaderType.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/shader/ShaderType.java
index 498f599..9220be2 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/shader/ShaderType.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/shader/ShaderType.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.graphics.impl.gl.shader;
+package net.fokinatorr.sparkle.graphics.impl.gl.shader;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/surface/GL_GLFWWindowSurface.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/surface/GL_GLFWWindowSurface.java
similarity index 75%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/surface/GL_GLFWWindowSurface.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/surface/GL_GLFWWindowSurface.java
index 2a7d869..87fc01d 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/surface/GL_GLFWWindowSurface.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/gl/surface/GL_GLFWWindowSurface.java
@@ -1,14 +1,13 @@
-package ru.fokinatorr.sparkle.graphics.impl.gl.surface;
+package net.fokinatorr.sparkle.graphics.impl.gl.surface;
import lombok.AccessLevel;
import lombok.experimental.FieldDefaults;
import lombok.extern.slf4j.Slf4j;
-import ru.fokinatorr.sparkle.event.dispatcher.EventDispatcher;
-import ru.fokinatorr.sparkle.graphics.impl.gl.GLFramebuffer;
-import ru.fokinatorr.sparkle.graphics.impl.surface.AbstractGLFWWindowSurface;
-import ru.fokinatorr.sparkle.graphics.render.framebuffer.Framebuffer;
-import ru.fokinatorr.sparkle.phys2d.Point2D;
-import ru.fokinatorr.sparkle.stage.Stage;
+import net.fokinatorr.sparkle.event.dispatcher.EventDispatcher;
+import net.fokinatorr.sparkle.graphics.impl.gl.GLFramebuffer;
+import net.fokinatorr.sparkle.graphics.impl.surface.AbstractGLFWWindowSurface;
+import net.fokinatorr.sparkle.graphics.render.framebuffer.Framebuffer;
+import net.fokinatorr.sparkle.stage.Stage;
import static org.lwjgl.glfw.GLFW.*;
import static org.lwjgl.system.MemoryUtil.NULL;
@@ -25,8 +24,6 @@ public final class GL_GLFWWindowSurface extends AbstractGLFWWindowSurface {
*/
GL_GLFWWindowSurface(long glfwWindow, EventDispatcher dispatcher, Stage stage, Thread graphicsThread) {
super(glfwWindow, dispatcher, stage, graphicsThread);
- glfwMakeContextCurrent(glfwWindow);
- glfwSwapInterval(1);
}
@@ -45,16 +42,14 @@ public final class GL_GLFWWindowSurface extends AbstractGLFWWindowSurface {
if (translucent) {
glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, GLFW_TRUE);
glfwWindowHint(GLFW_DECORATED, GLFW_FALSE);
- }
- GL_GLFWWindowSurface result = new GL_GLFWWindowSurface(
- glfwCreateWindow(stage.getWidth(), stage.getHeight(), title, NULL, NULL),
- dispatcher, stage, graphicsThread
- );
- if (translucent) {
+ } else {
glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, GLFW_FALSE);
glfwWindowHint(GLFW_DECORATED, GLFW_TRUE);
}
- return result;
+ return new GL_GLFWWindowSurface(
+ glfwCreateWindow(stage.getWidth(), stage.getHeight(), title, NULL, NULL),
+ dispatcher, stage, graphicsThread
+ );
}
/**
@@ -73,22 +68,26 @@ public final class GL_GLFWWindowSurface extends AbstractGLFWWindowSurface {
if (translucent) {
glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, GLFW_TRUE);
glfwWindowHint(GLFW_DECORATED, GLFW_FALSE);
- }
- GL_GLFWWindowSurface result = new GL_GLFWWindowSurface(
- glfwCreateWindow(stage.getWidth(), stage.getHeight(), title, monitor, NULL),
- dispatcher, stage, graphicsThread
- );
- if (translucent) {
+ } else {
glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, GLFW_FALSE);
glfwWindowHint(GLFW_DECORATED, GLFW_TRUE);
}
- return result;
+ return new GL_GLFWWindowSurface(
+ glfwCreateWindow(stage.getWidth(), stage.getHeight(), title, monitor, NULL),
+ dispatcher, stage, graphicsThread
+ );
}
@Override
- public Framebuffer acquireBuffer() {
- Point2D dim = getSize();
- return new GLFramebuffer(0, (int) dim.x(), (int) dim.y());
+ public Framebuffer acquireBuffer(int prefWidth, int prefHeight) {
+ if (prefWidth < FB_ORIGINAL_SIZE || prefHeight < FB_ORIGINAL_SIZE) {
+ throw new IllegalArgumentException("Invalid framebuffer size: " + prefWidth + "x" + prefHeight);
+ }
+ return new GLFramebuffer(
+ 0, // GL specification: When no framebuffer object is attached (glBindFramebuffer(GL_FRAMEBUFFER, 0)), rendering is done to default framebuffer, which is managed by the windowing system.
+ prefWidth == FB_ORIGINAL_SIZE ? getWidth() : prefWidth,
+ prefHeight == FB_ORIGINAL_SIZE ? getHeight() : prefHeight
+ );
}
@Override
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/surface/AbstractGLFWWindowSurface.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/surface/AbstractGLFWWindowSurface.java
similarity index 76%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/impl/surface/AbstractGLFWWindowSurface.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/impl/surface/AbstractGLFWWindowSurface.java
index e3bdee8..5a3d70a 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/surface/AbstractGLFWWindowSurface.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/surface/AbstractGLFWWindowSurface.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.graphics.impl.surface;
+package net.fokinatorr.sparkle.graphics.impl.surface;
import lombok.AccessLevel;
import lombok.Getter;
@@ -6,19 +6,20 @@ import lombok.experimental.FieldDefaults;
import lombok.extern.slf4j.Slf4j;
import org.lwjgl.glfw.GLFWVidMode;
import org.lwjgl.system.Callback;
-import ru.fokinatorr.sparkle.event.dispatcher.EventDispatcher;
-import ru.fokinatorr.sparkle.event.input.Key;
-import ru.fokinatorr.sparkle.event.input.KeyboardEvent;
-import ru.fokinatorr.sparkle.event.input.MouseButton;
-import ru.fokinatorr.sparkle.event.input.MouseEvent;
-import ru.fokinatorr.sparkle.graphics.render.surface.WindowSurface;
-import ru.fokinatorr.sparkle.phys2d.Point2D;
-import ru.fokinatorr.sparkle.stage.Stage;
-import ru.fokinatorr.sparkle.util.concurrent.atomic.AtomicDouble;
+import net.fokinatorr.sparkle.event.dispatcher.EventDispatcher;
+import net.fokinatorr.sparkle.event.input.Key;
+import net.fokinatorr.sparkle.event.input.KeyboardEvent;
+import net.fokinatorr.sparkle.event.input.MouseButton;
+import net.fokinatorr.sparkle.event.input.MouseEvent;
+import net.fokinatorr.sparkle.graphics.render.surface.WindowSurface;
+import net.fokinatorr.sparkle.phys2d.Point2D;
+import net.fokinatorr.sparkle.stage.Stage;
+import net.fokinatorr.sparkle.util.concurrent.atomic.AtomicDouble;
import java.util.*;
import java.util.concurrent.atomic.AtomicLong;
+import static org.lwjgl.glfw.Callbacks.glfwFreeCallbacks;
import static org.lwjgl.glfw.GLFW.*;
import static org.lwjgl.system.MemoryUtil.NULL;
@@ -35,11 +36,10 @@ public abstract class AbstractGLFWWindowSurface implements WindowSurface {
@Getter
final long glfwWindow; // pointer
final List resizeCallback = new LinkedList<>();
- final List callbacks = new LinkedList<>();
final Thread graphicsThread;
- Callback resizeCB;
int[] oldXYWH = null;
boolean closed;
+ boolean explicitClose;
/**
@@ -55,7 +55,7 @@ public abstract class AbstractGLFWWindowSurface implements WindowSurface {
this.graphicsThread = Objects.requireNonNull(graphicsThread, "graphics thread");
//
- callbacks.add(glfwSetKeyCallback(glfwWindow, (_, keyCode, scancode, action, modifiers) -> {
+ glfwSetKeyCallback(glfwWindow, (_, keyCode, scancode, action, modifiers) -> {
Key key = GLFWToPublicAPI.KEYS_MAP.get(keyCode);
if (key != null) {
switch (action) {
@@ -87,54 +87,47 @@ public abstract class AbstractGLFWWindowSurface implements WindowSurface {
}
);
}
- }));
+ });
- callbacks.add(glfwSetCharCallback(glfwWindow, (_, codePoint) -> {
+ glfwSetCharCallback(glfwWindow, (_, codePoint) -> {
if (dispatcher.hasListenersFor(KeyboardEvent.CharInputEvent.class)) {
dispatcher.fireEvent(new KeyboardEvent.CharInputEvent(stage, codePoint));
}
- }));
+ });
AtomicLong lastMousePress = new AtomicLong(-1);
- callbacks.add(glfwSetMouseButtonCallback(glfwWindow, (_, buttonCode, action, _) -> {
+ glfwSetMouseButtonCallback(glfwWindow, (_, buttonCode, action, _) -> {
MouseButton button = GLFWToPublicAPI.MOUSE_BUTTONS_MAP.get(buttonCode);
- double[] realX = {0}, realY = {0};
- glfwGetCursorPos(glfwWindow, realX, realY);
- double x = realX[0] - stage.getWidth() / 2d;
- double y = realY[0] - stage.getHeight() / 2d;
+ double[] x = {0}, y = {0};
+ glfwGetCursorPos(glfwWindow, x, y);
switch (action) {
case GLFW_PRESS -> {
lastMousePress.set(System.nanoTime());
if (dispatcher.hasListenersFor(MouseEvent.MousePressedEvent.class)) {
- dispatcher.fireEvent(new MouseEvent.MousePressedEvent(button, stage, x, y));
+ dispatcher.fireEvent(new MouseEvent.MousePressedEvent(button, stage, x[0], y[0]));
}
}
case GLFW_RELEASE -> {
if (dispatcher.hasListenersFor(MouseEvent.MouseReleasedEvent.class)) {
- dispatcher.fireEvent(new MouseEvent.MouseReleasedEvent(button, stage, x, y));
+ dispatcher.fireEvent(new MouseEvent.MouseReleasedEvent(button, stage, x[0], y[0]));
}
if (lastMousePress.get() > 0) {
long pressDurationNs = System.nanoTime() - lastMousePress.getAndSet(-1);
if (dispatcher.hasListenersFor(MouseEvent.MouseClickedEvent.class)
&& pressDurationNs <= 500_000_000L) { // TODO configurable?
- dispatcher.fireEvent(new MouseEvent.MouseClickedEvent(button, stage, x, y));
+ dispatcher.fireEvent(new MouseEvent.MouseClickedEvent(button, stage, x[0], y[0]));
}
}
}
}
- }));
+ });
AtomicDouble lastMouseX = new AtomicDouble(-1);
AtomicDouble lastMouseY = new AtomicDouble(-1);
- callbacks.add(glfwSetCursorPosCallback(glfwWindow, (_, newRealX, newRealY) -> {
- double oldRealX = lastMouseX.getAndSet(newRealX);
- double oldRealY = lastMouseY.getAndSet(newRealY);
- if (dispatcher.hasListenersFor(MouseEvent.MouseCursorMovedEvent.class) && oldRealX >= 0 && oldRealY >= 0) {
- double
- oldX = oldRealX - stage.getWidth() / 2d,
- oldY = oldRealY - stage.getWidth() / 2d,
- newX = newRealX - stage.getWidth() / 2d,
- newY = newRealY - stage.getWidth() / 2d;
+ glfwSetCursorPosCallback(glfwWindow, (_, newX, newY) -> {
+ double oldX = lastMouseX.getAndSet(newX);
+ double oldY = lastMouseY.getAndSet(newY);
+ if (dispatcher.hasListenersFor(MouseEvent.MouseCursorMovedEvent.class) && oldX >= 0 && oldY >= 0) {
Set pressedButtons = EnumSet.noneOf(MouseButton.class);
for (int mb : GLFWToPublicAPI.MOUSE_BUTTONS_MAP.keySet()) {
if (glfwGetMouseButton(glfwWindow, mb) == GLFW_PRESS) {
@@ -144,17 +137,15 @@ public abstract class AbstractGLFWWindowSurface implements WindowSurface {
dispatcher.fireEvent(new MouseEvent.MouseCursorMovedEvent(stage, oldX, oldY, newX, newY, pressedButtons));
}
- }));
+ });
- callbacks.add(glfwSetScrollCallback(glfwWindow, (_, dx, dy) -> {
+ glfwSetScrollCallback(glfwWindow, (_, dx, dy) -> {
if (dispatcher.hasListenersFor(MouseEvent.MouseScrolledEvent.class)) {
- double[] realX = {0}, realY = {0};
- glfwGetCursorPos(glfwWindow, realX, realY);
- double x = realX[0] - stage.getWidth() / 2d;
- double y = realY[0] - stage.getHeight() / 2d;
- dispatcher.fireEvent(new MouseEvent.MouseScrolledEvent(stage, x, y, dx, dy));
+ double[] x = {0}, y = {0};
+ glfwGetCursorPos(glfwWindow, x, y);
+ dispatcher.fireEvent(new MouseEvent.MouseScrolledEvent(stage, x[0], y[0], dx, dy));
}
- }));
+ });
//
}
@@ -194,35 +185,50 @@ public abstract class AbstractGLFWWindowSurface implements WindowSurface {
@Override
public boolean shouldClose() {
- ensureOpen();
-// ensureOnCorrectThread();
- return glfwWindowShouldClose(glfwWindow);
+ if (closed || !glfwWindowShouldClose(glfwWindow)) { // order is important here!
+ return false;
+ }
+ glfwSetWindowShouldClose(glfwWindow, false); // clear flag as required by contract
+ return true;
+ }
+
+ @Override
+ public void setShouldClose() {
+ if (!closed) {
+ glfwSetWindowShouldClose(glfwWindow, true);
+ explicitClose = true;
+ }
+ }
+
+ @Override
+ public boolean isExplicitShouldClose() {
+ boolean result = !closed && explicitClose;
+ explicitClose = false;
+ return result;
+ }
+
+ @Override
+ public void setResizable(boolean resizable) {
+ ensureOnCorrectThread();
+ glfwSetWindowAttrib(glfwWindow, GLFW_RESIZABLE, resizable ? GLFW_TRUE : GLFW_FALSE);
+ }
+
+ @Override
+ public boolean isResizable() {
+ ensureOnCorrectThread();
+ return glfwGetWindowAttrib(glfwWindow, GLFW_RESIZABLE) == GLFW_TRUE;
}
@Override
public void onResize(ResizeListener callback) {
ensureOpen();
- ensureOnCorrectThread();
resizeCallback.add(callback);
- Callback newCB = glfwSetWindowSizeCallback(glfwWindow, (_, width, height) -> {
+ Callback oldCB = glfwSetWindowSizeCallback(glfwWindow, (_, width, height) -> {
for (var cb : resizeCallback) {
cb.resized(this, width, height);
}
});
- if (resizeCB != null) resizeCB.free();
- resizeCB = newCB;
- }
-
- @Override
- public Set getFeatures() {
- return Collections.unmodifiableSet(EnumSet.of(
- Feature.RESIZABLE,
- Feature.MOVABLE,
- Feature.HIDEABLE,
- Feature.NAMEABLE,
- Feature.FULLSCREENABLE,
- Feature.TRANSLUCENT
- ));
+ if (oldCB != null) oldCB.free();
}
@Override
@@ -348,16 +354,7 @@ public abstract class AbstractGLFWWindowSurface implements WindowSurface {
@Override
public void close() {
if (!closed) {
- if (resizeCB != null) {
- resizeCB.free();
- resizeCB = null;
- }
- callbacks.forEach(callback -> {
- if (callback != null) {
- callback.free();
- }
- });
- callbacks.clear();
+ glfwFreeCallbacks(glfwWindow);
glfwDestroyWindow(glfwWindow);
closed = true;
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/surface/GLFWToPublicAPI.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/surface/GLFWToPublicAPI.java
similarity index 98%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/impl/surface/GLFWToPublicAPI.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/impl/surface/GLFWToPublicAPI.java
index 8f92116..01bea8d 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/surface/GLFWToPublicAPI.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/surface/GLFWToPublicAPI.java
@@ -1,11 +1,11 @@
-package ru.fokinatorr.sparkle.graphics.impl.surface;
+package net.fokinatorr.sparkle.graphics.impl.surface;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectMaps;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import lombok.experimental.UtilityClass;
-import ru.fokinatorr.sparkle.event.input.Key;
-import ru.fokinatorr.sparkle.event.input.MouseButton;
+import net.fokinatorr.sparkle.event.input.Key;
+import net.fokinatorr.sparkle.event.input.MouseButton;
import static org.lwjgl.glfw.GLFW.*;
@@ -218,8 +218,8 @@ public class GLFWToPublicAPI {
k.put(GLFW_KEY_KP_ENTER, Key.NUMPAD_ENTER); // the tall guy
k.put(GLFW_KEY_KP_EQUAL, Key.NUMPAD_EQUALS); // he is tall bc he ate this key
- // Modifier keys. The most controversial keys that have absolutely different meaning on different OSes.
- // the key's meaning becomes more and more blurry as we dive deeper...
+ // Modifier keys. The only ones with absolutely different meaning on different OSes.
+ // the key's intended meaning becomes more and more blurry as we dive deeper...
// these guys are normal. they have the same name and overall do more or less the same in all OSes
k.put(GLFW_KEY_LEFT_SHIFT, Key.LEFT_SHIFT);
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/impl/sw/Scaling.java b/src/main/java/net/fokinatorr/sparkle/graphics/impl/sw/Scaling.java
new file mode 100644
index 0000000..7aa11f0
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/impl/sw/Scaling.java
@@ -0,0 +1,121 @@
+package net.fokinatorr.sparkle.graphics.impl.sw;
+
+import lombok.experimental.UtilityClass;
+import net.fokinatorr.sparkle.graphics.ARGB;
+import net.fokinatorr.sparkle.graphics.PixelReader;
+import net.fokinatorr.sparkle.graphics.PixelWriter;
+import net.fokinatorr.sparkle.util.Mth;
+
+import java.util.Objects;
+
+/**
+ * High-quality image scaling using bicubic interpolation.
+ *
+ * Based on Catmull-Rom kernel: sharp, no oversharpening.
+ */
+@UtilityClass
+public final class Scaling {
+
+ /**
+ * Resizes an image using bicubic interpolation.
+ *
+ * @param src the source pixel data
+ * @param dst the destination pixel data
+ */
+ public void bicubicResize(PixelReader src, PixelWriter dst) {
+ Objects.requireNonNull(src, "source");
+ Objects.requireNonNull(dst, "destination");
+
+ int
+ srcWidth = src.getWidth(), srcHeight = src.getHeight(),
+ targetWidth = dst.getWidth(), targetHeight = dst.getHeight();
+
+ double xRatio = (double) srcWidth / targetWidth;
+ double yRatio = (double) srcHeight / targetHeight;
+
+ for (int ty = 0; ty < targetHeight; ty++) {
+ double sy = ty * yRatio;
+ int y = (int) Math.floor(sy);
+ double dy = sy - y;
+
+ for (int tx = 0; tx < targetWidth; tx++) {
+ double sx = tx * xRatio;
+ int x = (int) Math.floor(sx);
+ double dx = sx - x;
+
+ dst.setARGB(tx, ty, bicubicSample(src, srcWidth, srcHeight, x, y, dx, dy));
+ }
+ }
+ }
+
+ /**
+ * Samples one pixel using bicubic interpolation.
+ */
+ private int bicubicSample(
+ PixelReader src,
+ int w,
+ int h,
+ int x,
+ int y,
+ double dx,
+ double dy
+ ) {
+ double[] coeffsY = cubicCoeffs(dy);
+ double[] coeffsX = cubicCoeffs(dx);
+
+ double r = 0, g = 0, b = 0, a = 0;
+
+ for (int j = -1; j <= 2; j++) {
+ double wy = coeffsY[j + 1];
+ int yj = y + j;
+
+ for (int i = -1; i <= 2; i++) {
+ double wx = coeffsX[i + 1];
+ int xi = x + i;
+
+ int argb = getPixelSafe(src, w, h, xi, yj);
+ double wgt = wx * wy;
+
+ r += (argb & 0xFF) * wgt;
+ g += ((argb >> 8) & 0xFF) * wgt;
+ b += ((argb >> 16) & 0xFF) * wgt;
+ a += ((argb >> 24) & 0xFF) * wgt;
+ }
+ }
+
+ return ARGB.color(
+ (byte) clamp(a),
+ (byte) clamp(r),
+ (byte) clamp(g),
+ (byte) clamp(b)
+ );
+ }
+
+ /**
+ * Catmull-Rom cubic kernel: B=0, C=0.5
+ */
+ private double[] cubicCoeffs(double x) {
+ double x2 = x * x;
+ double x3 = x2 * x;
+
+ return new double[] {
+ -0.5 * x3 + x2 - 0.5 * x,
+ 1.5 * x3 - 2.5 * x2 + 1.0,
+ -1.5 * x3 + 2.0 * x2 + 0.5 * x,
+ 0.5 * x3 - 0.5 * x2
+ };
+ }
+
+ /**
+ * Gets pixel with edge clamping.
+ */
+ private int getPixelSafe(PixelReader src, int w, int h, int x, int y) {
+ x = Mth.clamp(x, 0, w - 1);
+ y = Mth.clamp(y, 0, h - 1);
+ return src.getARGB(x, y);
+ }
+
+ private static int clamp(double v) {
+ return Mth.clamp(Math.round(v), 0, 255);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/io/ImageDecoder.java b/src/main/java/net/fokinatorr/sparkle/graphics/io/ImageDecoder.java
new file mode 100644
index 0000000..daa4139
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/io/ImageDecoder.java
@@ -0,0 +1,4 @@
+package net.fokinatorr.sparkle.graphics.io;
+
+public interface ImageDecoder {
+}
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/render/RenderCanvas.java b/src/main/java/net/fokinatorr/sparkle/graphics/render/RenderCanvas.java
similarity index 77%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/render/RenderCanvas.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/render/RenderCanvas.java
index 9608348..928f9ce 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/render/RenderCanvas.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/render/RenderCanvas.java
@@ -1,15 +1,15 @@
-package ru.fokinatorr.sparkle.graphics.render;
+package net.fokinatorr.sparkle.graphics.render;
-import org.w3c.dom.Text;
-import ru.fokinatorr.sparkle.effect.graphics.GraphicEffect;
-import ru.fokinatorr.sparkle.effect.graphics.GraphicEffectMap;
-import ru.fokinatorr.sparkle.graphics.ARGB;
-import ru.fokinatorr.sparkle.graphics.BlendMode;
-import ru.fokinatorr.sparkle.graphics.image.Image;
-import ru.fokinatorr.sparkle.phys2d.Point2D;
-import ru.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
+import net.fokinatorr.sparkle.effect.graphics.GraphicEffect;
+import net.fokinatorr.sparkle.effect.graphics.GraphicEffectMap;
+import net.fokinatorr.sparkle.graphics.ARGB;
+import net.fokinatorr.sparkle.graphics.BlendMode;
+import net.fokinatorr.sparkle.graphics.image.Image;
+import net.fokinatorr.sparkle.phys2d.Point2D;
+import net.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
import java.awt.Shape;
+import java.awt.geom.AffineTransform;
import java.awt.geom.Ellipse2D;
import java.awt.geom.Line2D;
import java.awt.geom.Rectangle2D;
@@ -21,6 +21,9 @@ import java.util.Objects;
* This interface provides methods for drawing shapes and images, applying transformations,
* setting styling properties, and managing clipping regions. It maintains a state
* stack that can be saved and restored using {@link #save()} and {@link #restore()}.
+ *
Note: When images and shapes are uploaded into GPU memory, they're typically cached using
+ * identity semantics (comparing by reference, not value), so custom renderers are expected to cache constantly
+ * used images/shapes and treat them as immutable objects to prevent data consistency issues.
*
*
Coordinate System
* The coordinate system uses floating-point coordinates where {@code (0, 0)} is typically the
@@ -87,6 +90,7 @@ public interface RenderCanvas extends NonThrowingAutoCloseable {
/**
* Draws an image at the specified position with the given size.
+ * If either dimension is set to {@link #ORIGINAL_SIZE}, then the image's respective dimension is used.
*
* @param image the image to draw
* @param x the X coordinate of the top-left corner
@@ -94,8 +98,8 @@ public interface RenderCanvas extends NonThrowingAutoCloseable {
* @param w the preferred width of the image or {@link #ORIGINAL_SIZE}
* @param h the preferred height of the image or {@link #ORIGINAL_SIZE}
* @throws NullPointerException if image is {@code null}
- * @throws IllegalArgumentException if coordinates or dimensions are negative, {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
- * ({@link #ORIGINAL_SIZE} doesn't count since it's a special value)
+ * @throws IllegalArgumentException if dimensions are negative, or if any argument is {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
+ * ({@link #ORIGINAL_SIZE} for coordinates doesn't count since it's a special value)
* @see #drawImage(Image, Point2D, Point2D)
*/
void drawImage(Image image, double x, double y, double w, double h);
@@ -144,7 +148,7 @@ public interface RenderCanvas extends NonThrowingAutoCloseable {
* @param y the Y coordinate of the top-left corner
* @param w the width of the rectangle
* @param h the height of the rectangle
- * @throws IllegalArgumentException if coordinates or dimensions are negative, {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
+ * @throws IllegalArgumentException if dimensions are negative, or if any argument is {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
* @see #drawShape(Shape)
* @see #fillShape(Shape)
*/
@@ -156,7 +160,7 @@ public interface RenderCanvas extends NonThrowingAutoCloseable {
* @param topLeft the top-left corner coordinates
* @param deltaSize the size dimensions of the rectangle
* @throws NullPointerException if any argument is {@code null}
- * @throws IllegalArgumentException if coordinates or dimensions are negative, {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
+ * @throws IllegalArgumentException if dimensions are negative, or if any argument is {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
*/
default void fillRect(Point2D topLeft, Point2D deltaSize) {
fillRect(topLeft.x(), topLeft.y(), deltaSize.x(), deltaSize.y());
@@ -178,7 +182,7 @@ public interface RenderCanvas extends NonThrowingAutoCloseable {
* @param topLeft the top-left corner coordinates
* @param deltaSize the size dimensions of the rectangle
* @throws NullPointerException if any argument is {@code null}
- * @throws IllegalArgumentException if coordinates or dimensions are negative, {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
+ * @throws IllegalArgumentException if dimensions are negative, or if any argument is {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
*/
default void drawRect(Point2D topLeft, Point2D deltaSize) {
drawRect(topLeft.x(), topLeft.y(), deltaSize.x(), deltaSize.y());
@@ -189,7 +193,7 @@ public interface RenderCanvas extends NonThrowingAutoCloseable {
* @param y1 the Y coordinate of the first position
* @param x2 the X coordinate of the second position
* @param y2 the Y coordinate of the second position
- * @throws IllegalArgumentException if any coordinates are negative, {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
+ * @throws IllegalArgumentException if any argument is {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
* @see #drawShape(Shape)
*/
default void drawLine(double x1, double y1, double x2, double y2) {
@@ -200,7 +204,7 @@ public interface RenderCanvas extends NonThrowingAutoCloseable {
* @param first the first position
* @param second the second position
* @throws NullPointerException if any argument is {@code null}
- * @throws IllegalArgumentException if any coordinates are negative, {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
+ * @throws IllegalArgumentException if any argument is {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
*/
default void drawLine(Point2D first, Point2D second) {
drawLine(first.x(), first.y(), second.x(), second.y());
@@ -212,7 +216,7 @@ public interface RenderCanvas extends NonThrowingAutoCloseable {
* @param y the Y coordinate of the top-left corner
* @param w the width of the oval
* @param h the height of the oval
- * @throws IllegalArgumentException if coordinates or dimensions are negative, {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
+ * @throws IllegalArgumentException if dimensions are negative, or if any argument is {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
* @see #drawShape(Shape)
* @see #fillShape(Shape)
*/
@@ -224,7 +228,7 @@ public interface RenderCanvas extends NonThrowingAutoCloseable {
* @param topLeft the top-left corner coordinates
* @param deltaSize the size dimensions of the oval
* @throws NullPointerException if any argument is {@code null}
- * @throws IllegalArgumentException if coordinates or dimensions are negative, {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
+ * @throws IllegalArgumentException if dimensions are negative, or if any argument is {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
*/
default void fillOval(Point2D topLeft, Point2D deltaSize) {
fillOval(topLeft.x(), topLeft.y(), deltaSize.x(), deltaSize.y());
@@ -235,18 +239,19 @@ public interface RenderCanvas extends NonThrowingAutoCloseable {
* @param y the Y coordinate of the top-left corner
* @param w the width of the oval
* @param h the height of the oval
- * @throws IllegalArgumentException if coordinates or dimensions are negative, {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
+ * @throws IllegalArgumentException if dimensions are negative, or if any argument is {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
* @see #drawShape(Shape)
*/
default void drawOval(double x, double y, double w, double h) {
drawShape(new Ellipse2D.Double(x, y, w, h));
}
+
/**
* Vector version of {@link #drawOval(double, double, double, double)}.
* @param topLeft the top-left corner coordinates
* @param deltaSize the size dimensions of the oval
* @throws NullPointerException if any argument is {@code null}
- * @throws IllegalArgumentException if coordinates or dimensions are negative, {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
+ * @throws IllegalArgumentException if dimensions are negative, or if any argument is {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
*/
default void drawOval(Point2D topLeft, Point2D deltaSize) {
drawOval(topLeft.x(), topLeft.y(), deltaSize.x(), deltaSize.y());
@@ -316,10 +321,28 @@ public interface RenderCanvas extends NonThrowingAutoCloseable {
*
* @param sx the scaling factor for the X axis
* @param sy the scaling factor for the Y axis
- * @throws IllegalArgumentException if sx or sy is/are non-positive, {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
+ * @throws IllegalArgumentException if sx or sy is/are 0, {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
*/
void scale(double sx, double sy);
+ /**
+ * Scales the coordinate system by the specified delta vector.
+ * @param delta the scale factor vector point
+ * @throws NullPointerException if delta is {@code null}
+ * @throws IllegalArgumentException if any vector component is 0, {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
+ */
+ default void scale(Point2D delta) {
+ Objects.requireNonNull(delta, "delta");
+ scale(delta.x(), delta.y());
+ }
+
+ /**
+ * Multiplies the coordinate system by the specified affine transform matrix.
+ * @param at the transform matrix
+ * @throws NullPointerException if transform matrix is {@code null}
+ */
+ void mulTransform(AffineTransform at);
+
/**
* Sets the fill color for shape filling operations.
* This color will be used by subsequent calls to {@link #fillShape(Shape)} and convenience methods.
@@ -380,33 +403,35 @@ public interface RenderCanvas extends NonThrowingAutoCloseable {
* Sets the graphic effects map to apply to subsequent drawing operations.
*
Note: Spatial distortion effects can't be applied to vector content (shapes, text); effects
* that can be applied to them are: {@link GraphicEffect#HUE_SHIFT HUE_SHIFT}, {@link GraphicEffect#BRIGHTNESS BRIGHTNESS}
- * and {@link GraphicEffect#OPACITY OPACITY}. Use {@link #createSubCanvas(double, double)} and {@link #getFinalImage()}
+ * and {@link GraphicEffect#FADE FADE}. Use {@link #createSubCanvas(double, double)} and {@link #submitImage(double, double, double, double)}
* to apply spatial distortion to vector elements.
* @param effects the effect map
*/
void setEffects(GraphicEffectMap effects);
/**
- * Intersects the current clipping region with the specified shape.
- * All subsequent drawing operations will be clipped to the intersection of
- * the current clip and the specified shape. The clip is transformed by the
- * current transformation matrix.
- *
- * @param shape the shape to intersect with the current clip
- * @throws NullPointerException if shape is {@code null}
+ * Sets the current clipping region to the given rectangular path.
+ *
+ * @param x X coordinate of top-left corner
+ * @param y Y coordinate of top-left corner
+ * @param w width
+ * @param h height
+ * @throws IllegalArgumentException if w or h is/are non-positive,
+ * or if any argument is negative, {@link Double#isInfinite infinite} or {@link Double#NaN NaN}
+ *
* @see #resetClip()
* @see #translate(double, double)
* @see #rotate(double)
* @see #scale(double, double)
*/
- void clip(Shape shape);
+ void clip(double x, double y, double w, double h);
/**
* Resets the clipping region to the default (typically the entire rendering surface).
* After calling this method, all drawing operations will not be clipped (except by
* the bounds of the rendering surface itself).
- *
- * @see #clip(Shape)
+ *
+ * @see #clip(double, double, double, double)
*/
void resetClip();
@@ -416,8 +441,8 @@ public interface RenderCanvas extends NonThrowingAutoCloseable {
* Creates a new sub-canvas that renders into an offscreen buffer.
*
* All drawing operations on the returned canvas are isolated and rasterized
- * into a procedural image when closed. The result can be retrieved via
- * {@link #getFinalImage()} and drawn like any other image.
+ * into a procedural image when closed. The result can be drawn onto the parent canvas via
+ * {@link #submitImage(double, double, double, double)}.
*
* This enables:
*
@@ -432,22 +457,20 @@ public interface RenderCanvas extends NonThrowingAutoCloseable {
* layer.setFillArgb(ARGB.RED);
* layer.fillRect(10, 10, 50, 50);
* layer.drawOval(30, 30, 40, 40);
- * try (Image img = layer.getFinalImage()) {
- * // If "canvas" has graphic effects, they'll be applied to the whole image, not to each component separately!
- * canvas.drawImage(img, 100, 100, 200, 200);
- * }
+ * // If "canvas" has graphic effects, they'll be applied to the whole image, not to each component separately!
+ * layer.submitImage(100, 100, 200, 200);
* }
* }
*
* @param width the width of the sub-canvas
* @param height the height of the sub-canvas
* @return a new render canvas targeting an offscreen buffer
- * @throws IllegalArgumentException if either dimension exceeds this canvas's respective dimension
+ * @throws IllegalArgumentException if either dimension exceeds this canvas's respective dimension or is non-positive
*/
RenderCanvas createSubCanvas(double width, double height);
/**
- * Checks whether this canvas is a sub-canvas. If {@code true}, then {@link #getFinalImage()} can be safely called.
+ * Checks whether this canvas is a sub-canvas. If {@code true}, then {@link #submitImage(double, double, double, double)} can be safely called.
*
* @return {@code true} for sub-canvases, {@code false} for the main canvas
*/
@@ -456,16 +479,30 @@ public interface RenderCanvas extends NonThrowingAutoCloseable {
}
/**
- * Returns the final rendered image, if this canvas is a sub-canvas.
- * The image is not cached anywhere and becomes invalid once the canvas is closed.
+ * Draws the final rendered image on the parent canvas as described in {@link #drawImage drawImage()}, if this canvas is a sub-canvas.
+ * @param x the X coordinate of the top-left corner
+ * @param y the Y coordinate of the top-left corner
+ * @param w the preferred width of the image or {@link #ORIGINAL_SIZE}
+ * @param h the preferred height of the image or {@link #ORIGINAL_SIZE}
* @throws IllegalStateException if this canvas is not a sub-canvas
* @see #isSubCanvas()
*/
- default Image getFinalImage() {
- // TODO maybe allow calling on main canvas? For screenshots?
+ default void submitImage(double x, double y, double w, double h) {
throw new IllegalStateException("This canvas is not a sub-canvas");
}
+ /**
+ * Vector version of {@link #submitImage(double, double, double, double)}.
+ *
+ * @param topLeft the top-left corner coordinates
+ * @param deltaSize the preferred dimensions of the image
+ * @throws IllegalStateException if this canvas is not a sub-canvas
+ * @see #isSubCanvas()
+ */
+ default void submitImage(Point2D topLeft, Point2D deltaSize) {
+ submitImage(topLeft.x(), topLeft.y(), deltaSize.x(), deltaSize.y());
+ }
+
// Getters
/**
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/render/RenderingContext.java b/src/main/java/net/fokinatorr/sparkle/graphics/render/RenderingContext.java
similarity index 69%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/render/RenderingContext.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/render/RenderingContext.java
index c6672a0..8994e43 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/render/RenderingContext.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/render/RenderingContext.java
@@ -1,11 +1,10 @@
-package ru.fokinatorr.sparkle.graphics.render;
+package net.fokinatorr.sparkle.graphics.render;
-import ru.fokinatorr.sparkle.assets.Assets;
-import ru.fokinatorr.sparkle.graphics.GraphicsManager;
-import ru.fokinatorr.sparkle.graphics.render.surface.RenderingSurface;
-import ru.fokinatorr.sparkle.stage.Stage;
-import ru.fokinatorr.sparkle.stage.StageCreator;
-import ru.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
+import net.fokinatorr.sparkle.graphics.GraphicsManager;
+import net.fokinatorr.sparkle.graphics.render.surface.RenderingSurface;
+import net.fokinatorr.sparkle.stage.Stage;
+import net.fokinatorr.sparkle.stage.StageCreator;
+import net.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
/**
* Represents a graphics environment. Binds together:
@@ -66,7 +65,7 @@ public interface RenderingContext extends NonThrowingAutoCloseable {
void present();
/**
- * Checks if the surface should close.
+ * Checks if the surface should close and clears this flag.
*
* @return whether a close was requested
*/
@@ -74,6 +73,13 @@ public interface RenderingContext extends NonThrowingAutoCloseable {
return getSurface().shouldClose();
}
+ /**
+ * Requests the surface to close; in other words, makes {@link #shouldClose()} return {@code true} on the next call.
+ */
+ default void setShouldClose() {
+ getSurface().setShouldClose();
+ }
+
/**
* Adds a resize listener to the surface.
*
@@ -82,4 +88,14 @@ public interface RenderingContext extends NonThrowingAutoCloseable {
default void onResize(RenderingSurface.ResizeListener callback) {
getSurface().onResize(callback);
}
+
+ /**
+ * {@inheritDoc}
+ * Note: contexts must not be closed manually; this is handled by the graphics manager.
+ * Use {@link #setShouldClose()} instead to signal a close request.
+ *
After calling this method, the context instance should not be used.
+ * Calling this method more than once does not have any effect.
+ */
+ @Override
+ void close();
}
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/render/framebuffer/Framebuffer.java b/src/main/java/net/fokinatorr/sparkle/graphics/render/framebuffer/Framebuffer.java
new file mode 100644
index 0000000..3ba7424
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/render/framebuffer/Framebuffer.java
@@ -0,0 +1,33 @@
+package net.fokinatorr.sparkle.graphics.render.framebuffer;
+
+import net.fokinatorr.sparkle.graphics.render.RenderCanvas;
+import net.fokinatorr.sparkle.phys2d.Point2D;
+import net.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
+
+/**
+ * Represents a render target to present on a rendering surface. This is usually a handle to native platform framebuffer.
+ *
This interface is not intended to be used directly in user code; it was made public solely to allow custom
+ * graphics engine implementations. Use {@link RenderCanvas} for drawing operations instead.
+ */
+public interface Framebuffer extends NonThrowingAutoCloseable {
+
+ /**
+ * Returns the width of underlying framebuffer.
+ * @return the width, always positive
+ */
+ int width();
+
+ /**
+ * Returns the height of underlying framebuffer.
+ * @return the height, always positive
+ */
+ int height();
+
+ /**
+ * Returns a vector representing the dimensions of underlying framebuffer's data.
+ * @return the dimensions, both always positive
+ */
+ default Point2D getDimensions() {
+ return new Point2D(width(), height());
+ }
+}
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/render/framebuffer/OffscreenFramebuffer.java b/src/main/java/net/fokinatorr/sparkle/graphics/render/framebuffer/OffscreenFramebuffer.java
similarity index 72%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/render/framebuffer/OffscreenFramebuffer.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/render/framebuffer/OffscreenFramebuffer.java
index a3529e6..9006e09 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/render/framebuffer/OffscreenFramebuffer.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/render/framebuffer/OffscreenFramebuffer.java
@@ -1,11 +1,12 @@
-package ru.fokinatorr.sparkle.graphics.render.framebuffer;
+package net.fokinatorr.sparkle.graphics.render.framebuffer;
import lombok.experimental.FieldDefaults;
-import ru.fokinatorr.sparkle.graphics.PixelReader;
-import ru.fokinatorr.sparkle.graphics.PixelWriter;
+import net.fokinatorr.sparkle.graphics.ARGB;
+import net.fokinatorr.sparkle.graphics.PixelReader;
+import net.fokinatorr.sparkle.graphics.PixelWriter;
import org.lwjgl.system.MemoryUtil;
-import ru.fokinatorr.sparkle.graphics.impl.IntBufferPixelAccessor;
+import net.fokinatorr.sparkle.graphics.impl.IntBufferPixelAccessor;
import java.nio.IntBuffer;
@@ -39,13 +40,21 @@ public final class OffscreenFramebuffer implements Framebuffer {
return height;
}
- @Override
+ /**
+ * Returns a pixel reader over this buffer, for reading its data as ARGB pixels.
+ * @return a new {@link PixelReader}
+ * @see ARGB
+ */
public synchronized PixelReader createPixelReader() {
ensureOpen();
return new IntBufferPixelAccessor(width, height, img, this::ensureOpen);
}
- @Override
+ /**
+ * Returns a pixel writer over this buffer, for writing ARGB pixels into it.
+ * @return a new {@code PixelWriter}
+ * @see ARGB
+ */
public synchronized PixelWriter createPixelWriter() {
ensureOpen();
return new IntBufferPixelAccessor(width, height, img, this::ensureOpen);
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/render/renderer/PhysicalRenderable2D.java b/src/main/java/net/fokinatorr/sparkle/graphics/render/renderer/PhysicalRenderable2D.java
new file mode 100644
index 0000000..3bea3d7
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/render/renderer/PhysicalRenderable2D.java
@@ -0,0 +1,65 @@
+package net.fokinatorr.sparkle.graphics.render.renderer;
+
+import net.fokinatorr.sparkle.graphics.render.RenderingContext;
+import net.fokinatorr.sparkle.phys.RotationMode;
+import net.fokinatorr.sparkle.phys2d.Hitbox2D;
+import net.fokinatorr.sparkle.phys2d.Physical2D;
+
+import java.awt.geom.AffineTransform;
+
+/**
+ * A 2D renderable object with physical properties.
+ */
+public interface PhysicalRenderable2D extends Renderable2D, Physical2D {
+ @Override
+ default double getScreenX(RenderingContext ctx) {
+ return (ctx.getStage().getWidth() - getPreferredCanvasSize(ctx).x()) / 2d + getX();
+ }
+
+ @Override
+ default double getScreenY(RenderingContext ctx) {
+ return (ctx.getStage().getHeight() - getPreferredCanvasSize(ctx).y()) / 2d - getY();
+ }
+
+ @Override
+ default double getAnchorX(RenderingContext ctx) {
+ return getPreferredCanvasSize(ctx).x() / 2;
+ }
+
+ @Override
+ default double getAnchorY(RenderingContext ctx) {
+ return getPreferredCanvasSize(ctx).y() / 2;
+ }
+
+ @Override
+ default double getRotation(RenderingContext ctx) {
+ return getRotationMode() == RotationMode.ALL_AROUND || getRotationMode() == RotationMode.LOOK_AT
+ ? (getDirection() - 90) % 360
+ : 0;
+ }
+
+ @Override
+ default double getScreenScaleX(RenderingContext ctx) {
+ double direction = getDirection() % 360;
+ return getRotationMode() == RotationMode.LEFT_RIGHT && direction > 180
+ ? getStretchX() / -100
+ : getStretchX() / 100;
+ }
+
+ @Override
+ default double getScreenScaleY(RenderingContext ctx) {
+ double direction = getDirection() % 360;
+ return (getRotationMode() == RotationMode.UP_DOWN && direction > 90 && direction < 270)
+ || (getRotationMode() == RotationMode.LOOK_AT && direction > 180)
+ ? getStretchY() / -100
+ : getStretchY() / 100;
+ }
+
+ @Override
+ default Hitbox2D getBounds(RenderingContext ctx) {
+ AffineTransform at = new AffineTransform();
+ at.translate(ctx.getStage().getWidth() / 2d, ctx.getStage().getHeight() / -2d);
+ at.scale(1, -1);
+ return getHitbox().transform(at);
+ }
+}
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/render/renderer/Renderable.java b/src/main/java/net/fokinatorr/sparkle/graphics/render/renderer/Renderable.java
new file mode 100644
index 0000000..e5d4f0c
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/render/renderer/Renderable.java
@@ -0,0 +1,46 @@
+package net.fokinatorr.sparkle.graphics.render.renderer;
+
+import net.fokinatorr.sparkle.effect.graphics.GraphicEffectMap;
+import net.fokinatorr.sparkle.graphics.render.RenderCanvas;
+import net.fokinatorr.sparkle.graphics.render.RenderingContext;
+import net.fokinatorr.sparkle.phys2d.Point2D;
+
+/**
+ * A renderable object is an object that knows how to draw itself. Objects of this type are
+ * by default drawn into a separate {@link RenderCanvas#createSubCanvas sub-canvas} of the
+ * {@link #getPreferredCanvasSize preferred size} and the resulting image is drawn in the top-left corner
+ * with the renderable's properties (e.g. graphic effects, translation, scaling) applied.
+ *
This base interface has these methods: {@link #render(RenderCanvas)} for drawing, {@link #isVisible()}
+ * for checking visibility, and {@link #getGraphicEffects()} for getting and editing graphic effects.
+ */
+public interface Renderable {
+
+ /**
+ * Render this object onto the given canvas. The canvas's size will not be more than
+ * values returned by {@link #getPreferredCanvasSize(RenderingContext)}.
+ * @param canvas the canvas
+ */
+ void render(RenderCanvas canvas);
+
+ /**
+ * Returns preferred dimensions of the object's render. If a dimension
+ * exceeds the canvas's dimension, the latter one is used instead.
+ *
Note: This method should not modify the given context in any way to avoid sudden side effects.
+ * @param ctx the rendering context
+ * @return the preferred dimensions
+ */
+ Point2D getPreferredCanvasSize(RenderingContext ctx);
+
+ /**
+ * Checks if this object is visible. This method is used as a hint for skipping rendering of this object.
+ * @return whether this object must be rendered
+ */
+ boolean isVisible();
+
+ /**
+ * Returns the graphic effect map to apply to this object's render. The map
+ * is mutable and can be also used to edit graphic effects.
+ * @return the graphic effect map of this object
+ */
+ GraphicEffectMap getGraphicEffects();
+}
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/render/renderer/Renderable2D.java b/src/main/java/net/fokinatorr/sparkle/graphics/render/renderer/Renderable2D.java
new file mode 100644
index 0000000..949200f
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/render/renderer/Renderable2D.java
@@ -0,0 +1,85 @@
+package net.fokinatorr.sparkle.graphics.render.renderer;
+
+import net.fokinatorr.sparkle.graphics.render.RenderCanvas;
+import net.fokinatorr.sparkle.graphics.render.RenderingContext;
+import net.fokinatorr.sparkle.phys2d.Hitbox2D;
+import net.fokinatorr.sparkle.phys2d.Physical2D;
+import net.fokinatorr.sparkle.stage.sprite.Sprite;
+
+/**
+ * A 2D {@linkplain Renderable renderable} object is a 2-dimensional object with screen bounds,
+ * screen translation, rotation, and X/Y axis scaling. These operations are anchored at origin in the
+ * top-left corner.
+ *
Property methods (getters) must be side-effect-free, i.e. they should not do any modifications
+ * to the given rendering context or other stateful data structures to avoid unexpected side effects.
+ *
+ * @see Sprite Sprite - a general-purpose physical 2D renderable
+ * @see Physical2D
+ */
+public interface Renderable2D extends Renderable {
+
+ /**
+ * {@inheritDoc}
+ * The object must be rendered as if without any transformations applied.
+ * @param canvas {@inheritDoc}
+ */
+ @Override
+ void render(RenderCanvas canvas);
+
+ /**
+ * {@return the X axis translation for this object}
+ * @param ctx the rendering context
+ */
+ double getScreenX(RenderingContext ctx);
+
+ /**
+ * {@return the Y axis translation for this object}
+ * @param ctx the rendering context
+ */
+ double getScreenY(RenderingContext ctx);
+
+ /**
+ * {@return the X coordinate of the point to rotate and scale around}
+ * Defaults to zero.
+ * @param ctx the rendering context
+ */
+ default double getAnchorX(RenderingContext ctx) {
+ return 0;
+ }
+
+ /**
+ * {@return the Y coordinate of the point to rotate and scale around}
+ * Defaults to zero.
+ * @param ctx the rendering context
+ */
+ default double getAnchorY(RenderingContext ctx) {
+ return 0;
+ }
+
+ /**
+ * {@return the rotation in degrees for this object}
+ * @param ctx the rendering context
+ */
+ double getRotation(RenderingContext ctx);
+
+ /**
+ * {@return the X scale coefficient for this object}
+ * @param ctx the rendering context
+ */
+ double getScreenScaleX(RenderingContext ctx);
+
+ /**
+ * {@return the Y scale coefficient for this object}
+ * @param ctx the rendering context
+ */
+ double getScreenScaleY(RenderingContext ctx);
+
+ /**
+ * Returns this object's on-screen bounding hitbox, as if without any transformations applied.
+ * This can be used to check what object was clicked, what objects intersect, etc.
+ *
Note: This method should not modify the given context in any way to avoid sudden side effects.
+ * @param ctx the rendering context
+ * @return the bounding box
+ */
+ Hitbox2D getBounds(RenderingContext ctx);
+}
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/render/renderer/Renderer.java b/src/main/java/net/fokinatorr/sparkle/graphics/render/renderer/Renderer.java
new file mode 100644
index 0000000..b74e828
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/render/renderer/Renderer.java
@@ -0,0 +1,230 @@
+package net.fokinatorr.sparkle.graphics.render.renderer;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+import net.fokinatorr.sparkle.graphics.render.RenderCanvas;
+import net.fokinatorr.sparkle.graphics.render.RenderingContext;
+import net.fokinatorr.sparkle.graphics.render.surface.RenderingSurface;
+import net.fokinatorr.sparkle.phys2d.Hitbox2D;
+import net.fokinatorr.sparkle.phys2d.Point2D;
+import net.fokinatorr.sparkle.phys2d.impl.*;
+import net.fokinatorr.sparkle.util.Mth;
+
+import java.awt.*;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Area;
+import java.awt.geom.Rectangle2D;
+
+import static lombok.AccessLevel.PRIVATE;
+import static net.fokinatorr.sparkle.graphics.render.RenderCanvas.ORIGINAL_SIZE;
+
+/**
+ * A renderer is an object that can render a specific type of objects. The objects don't have to
+ * implement {@link Renderable}. This interface allows for dynamic rendering implementations.
+ * @param the type this renderer can draw
+ * @see ForRenderable
+ * @see ForRenderable2D
+ * @see ForRenderable2DWithHitbox
+ * @see Renderable
+ */
+public interface Renderer {
+
+ /**
+ * Render the given object onto the given canvas.
+ * @param obj the object to render
+ * @param canvas the canvas
+ */
+ void render(T obj, RenderCanvas canvas);
+
+ /**
+ * Checks if the given object is visible. This method is used as a hint for skipping rendering of the object.
+ * @param obj the object to check
+ * @return whether the object should be rendered
+ */
+ boolean isVisible(T obj);
+
+ /**
+ * Returns the boundaries of the given object on a 2D surface.
+ *
+ * @param obj the object
+ * @param ctx the rendering context
+ * @return the object's 2D bounds
+ * @see RenderingSurface
+ */
+ Hitbox2D getBounds(T obj, RenderingContext ctx);
+
+ /**
+ * A simple implementation of {@link Renderer} which draws {@link Renderable} objects.
+ * It is possible to extend this class and add custom functionality.
+ * @param the type this renderer can draw
+ */
+ class ForRenderable implements Renderer {
+
+ /**
+ * {@inheritDoc} The default implementation renders the object into a sub-canvas,
+ * then submits the image with the object's preferred {@linkplain Renderable#getPreferredCanvasSize size}
+ * and its {@linkplain Renderable#getGraphicEffects graphic effects}.
+ * @param obj {@inheritDoc}
+ * @param canvas {@inheritDoc}
+ */
+ @Override
+ public void render(T obj, RenderCanvas canvas) {
+ canvas.save();
+ canvas.setEffects(obj.getGraphicEffects());
+ Point2D
+ dim = canvas.getDimensions(),
+ prefLayerDim = obj.getPreferredCanvasSize(canvas.getContext());
+ try (RenderCanvas layer = canvas.createSubCanvas(
+ Mth.clamp(1, prefLayerDim.x(), dim.x()),
+ Mth.clamp(1, prefLayerDim.y(), dim.y())
+ )) {
+ obj.render(layer);
+ layer.submitImage(0, 0, ORIGINAL_SIZE, ORIGINAL_SIZE);
+ }
+ canvas.restore();
+ }
+
+ /**
+ * {@inheritDoc} The default implementation calls the object's {@link Renderable#isVisible() isVisible()} method.
+ * @param obj {@inheritDoc}
+ * @return {@inheritDoc}
+ */
+ @Override
+ public boolean isVisible(T obj) {
+ return obj.isVisible();
+ }
+
+ /**
+ * {@inheritDoc} The default implementation returns {@link Hitbox2D#never()}.
+ *
+ * @param obj {@inheritDoc}
+ * @param ctx
+ * @return {@inheritDoc}
+ */
+ @Override
+ public Hitbox2D getBounds(T obj, RenderingContext ctx) {
+ return Hitbox2D.never();
+ }
+ }
+
+ /**
+ * An implementation of {@link Renderer} which draws {@link Renderable2D} objects,
+ * applying respective transformations.
+ * It is possible to extend this class and add custom functionality.
+ * @param the type this renderer can draw
+ */
+ @Slf4j
+ class ForRenderable2D extends ForRenderable {
+
+ @Override
+ public void render(T obj, RenderCanvas canvas) {
+ canvas.save();
+ RenderingContext ctx = canvas.getContext();
+
+ double rotation = obj.getRotation(ctx);
+ double scaleX = obj.getScreenScaleX(ctx), scaleY = obj.getScreenScaleY(ctx);
+ if (rotation % 360 != 0 || scaleX != 1 || scaleY != 1) {
+ double anchorX = obj.getAnchorX(ctx), anchorY = obj.getAnchorY(ctx);
+ canvas.translate(-anchorX, -anchorY);
+ canvas.rotate(obj.getRotation(ctx));
+ canvas.scale(obj.getScreenScaleX(ctx), obj.getScreenScaleY(ctx));
+ canvas.translate(obj.getScreenX(ctx) + anchorX, obj.getScreenY(ctx) + anchorY);
+ } else {
+ canvas.translate(obj.getScreenX(ctx), obj.getScreenY(ctx));
+ }
+
+ // Draw
+ super.render(obj, canvas);
+ canvas.restore();
+ }
+
+ /**
+ * {@inheritDoc} The default implementation calls the object's
+ * {@link Renderable2D#getBounds(RenderingContext) getBounds()} method and transforms it as needed.
+ *
+ * @param obj {@inheritDoc}
+ * @param ctx
+ * @return {@inheritDoc}
+ */
+ @Override
+ public Hitbox2D getBounds(T obj, RenderingContext ctx) {
+ AffineTransform affine = new AffineTransform();
+
+ double anchorX = obj.getAnchorX(ctx), anchorY = obj.getAnchorY(ctx);
+ affine.translate(-anchorX, -anchorY);
+ affine.rotate(obj.getRotation(ctx));
+ affine.scale(obj.getScreenScaleX(ctx), obj.getScreenScaleY(ctx));
+ affine.translate(obj.getScreenX(ctx) + anchorX, obj.getScreenY(ctx) + anchorY);
+
+ return obj.getBounds(ctx).transform(affine);
+ }
+ }
+
+ /**
+ * An implementation of {@link Renderer} which draws a {@link Renderable2D} and its hitbox on top.
+ * It is possible to extend this class and add custom functionality.
+ * @param the type this renderer can draw
+ */
+ @Getter
+ @RequiredArgsConstructor
+ @FieldDefaults(makeFinal = true, level = PRIVATE)
+ class ForRenderable2DWithHitbox extends ForRenderable2D {
+
+ /**
+ * The outline color of the hitbox's area, in ARGB format.
+ */
+ int outlineColor;
+ /**
+ * The fill color of the hitbox's area, in ARGB format.
+ */
+ int fillColor;
+
+ @Override
+ public void render(T obj, RenderCanvas canvas) {
+ super.render(obj, canvas);
+ renderHitbox(getBounds(obj, canvas.getContext()), canvas);
+ }
+
+ private void renderHitbox(Hitbox2D hitbox, RenderCanvas canvas) {
+ switch (hitbox) {
+ case ShapeHitbox2D hb -> fillShape(hb.shape(), canvas);
+ case AlwaysHitbox2D _ -> {
+ canvas.save();
+ canvas.setStrokeARGB(fillColor);
+ canvas.setFillARGB(fillColor);
+ canvas.fillRect(Point2D.ZERO, canvas.getDimensions());
+ canvas.restore();
+ }
+ case TransformedHitbox2D thb -> {
+ canvas.save();
+ canvas.mulTransform(thb.transform());
+ renderHitbox(thb.delegate(), canvas);
+ canvas.restore();
+ }
+ case NeverHitbox2D _ -> {
+ }
+ case NotHitbox2D hb -> hb.createArea().ifPresentOrElse(
+ area -> fillShape(area, canvas),
+ () -> hb.delegate().createArea().ifPresent(area -> {
+ // NotHitbox's delegate is usually finite
+ Point2D dimensions = canvas.getDimensions();
+ Area negated = new Area(new Rectangle2D.Double(0, 0, dimensions.x(), dimensions.y()));
+ negated.subtract(area);
+ fillShape(negated, canvas);
+ })
+ );
+ default -> hitbox.createArea().ifPresent(area -> fillShape(area, canvas));
+ }
+ }
+
+ private void fillShape(Shape shape, RenderCanvas canvas) {
+ canvas.save();
+ canvas.setStrokeARGB(outlineColor);
+ canvas.setFillARGB(fillColor);
+ canvas.fillShape(shape);
+ canvas.restore();
+ }
+ }
+}
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/render/renderer/RendererRegistry.java b/src/main/java/net/fokinatorr/sparkle/graphics/render/renderer/RendererRegistry.java
similarity index 96%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/render/renderer/RendererRegistry.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/render/renderer/RendererRegistry.java
index 665a3f8..b2802c7 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/render/renderer/RendererRegistry.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/render/renderer/RendererRegistry.java
@@ -1,11 +1,11 @@
-package ru.fokinatorr.sparkle.graphics.render.renderer;
+package net.fokinatorr.sparkle.graphics.render.renderer;
import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
import lombok.Getter;
import lombok.experimental.FieldDefaults;
import lombok.experimental.NonFinal;
import lombok.extern.slf4j.Slf4j;
-import ru.fokinatorr.sparkle.util.GUID;
+import net.fokinatorr.sparkle.util.GUID;
import java.util.HashSet;
import java.util.LinkedList;
@@ -112,7 +112,7 @@ public final class RendererRegistry {
* @throws NullPointerException if no renderers were found for the given type
* @param the type of the object
*/
- public Renderer get(Class type) {
+ public Renderer get(Class extends T> type) {
Renderer renderer = null;
if (debugEnabled) {
renderer = find(debugRenderers, type);
@@ -122,7 +122,6 @@ public final class RendererRegistry {
}
if (renderer != null) {
- log.trace("[RendererRegistry id={}] Resolved '{}' -> {}", id, type.getSimpleName(), renderer);
return renderer;
} else {
log.error(
@@ -158,7 +157,7 @@ public final class RendererRegistry {
* @return the best matching renderer, or {@code null} if none found
*/
@SuppressWarnings("unchecked")
- private static Renderer find(Map, Renderer>> m, Class type) {
+ private static Renderer find(Map, Renderer>> m, Class extends T> type) {
if (type == null) return null;
// Use a queue or stack to avoid deep recursion
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/render/surface/EmbeddedSurface.java b/src/main/java/net/fokinatorr/sparkle/graphics/render/surface/EmbeddedSurface.java
new file mode 100644
index 0000000..68f754d
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/render/surface/EmbeddedSurface.java
@@ -0,0 +1,50 @@
+package net.fokinatorr.sparkle.graphics.render.surface;
+
+import net.fokinatorr.sparkle.graphics.render.framebuffer.OffscreenFramebuffer;
+
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Set;
+
+/**
+ * An embedded surface (e.g. UI element). In general, more stationary than {@link WindowSurface}.
+ */
+public non-sealed interface EmbeddedSurface extends RenderingSurface {
+
+ @Override
+ default Set getFeatures() {
+ return Collections.unmodifiableSet(EnumSet.of(
+ Feature.RESIZABLE,
+ Feature.NAMEABLE // label or just for debugging
+ ));
+ }
+
+ @Override
+ void setSize(int newWidth, int newHeight);
+
+ @Override
+ String getName();
+
+ @Override
+ void setName(String name);
+
+ /**
+ * {@inheritDoc}
+ * Embedded surfaces typically cannot directly use GPU-accelerated rendering APIs due to
+ * hosting environment restrictions (e.g., Swing, JavaFX). Instead, they render into an off-screen buffer
+ * using software or indirect GPU rendering, which is then copied to the display surface.
+ * @param prefWidth {@inheritDoc}
+ * @param prefHeight {@inheritDoc}
+ * @return {@inheritDoc}
+ */
+ @Override
+ default OffscreenFramebuffer acquireBuffer(int prefWidth, int prefHeight) {
+ if (prefWidth < FB_ORIGINAL_SIZE || prefHeight < FB_ORIGINAL_SIZE) {
+ throw new IllegalArgumentException("Invalid framebuffer size: " + prefWidth + "x" + prefHeight);
+ }
+ return new OffscreenFramebuffer(
+ prefWidth == FB_ORIGINAL_SIZE ? getWidth() : prefWidth,
+ prefHeight == FB_ORIGINAL_SIZE ? getHeight() : prefHeight
+ );
+ }
+}
diff --git a/src/main/java/net/fokinatorr/sparkle/graphics/render/surface/HeadlessSurface.java b/src/main/java/net/fokinatorr/sparkle/graphics/render/surface/HeadlessSurface.java
new file mode 100644
index 0000000..2208a0b
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/render/surface/HeadlessSurface.java
@@ -0,0 +1,28 @@
+package net.fokinatorr.sparkle.graphics.render.surface;
+
+import net.fokinatorr.sparkle.graphics.PixelReader;
+
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Set;
+
+/**
+ * A headless surface; typically uses an offscreen buffer.
+ *
Such surfaces are not presented anywhere, so {@link #createPixelReader() readback} must be supported.
+ */
+public non-sealed interface HeadlessSurface extends RenderingSurface {
+
+ @Override
+ default Set getFeatures() {
+ return Collections.unmodifiableSet(EnumSet.of(
+ Feature.RESIZABLE,
+ Feature.READABLE
+ ));
+ }
+
+ @Override
+ void setSize(int newWidth, int newHeight);
+
+ @Override
+ PixelReader createPixelReader();
+}
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/render/surface/RenderingSurface.java b/src/main/java/net/fokinatorr/sparkle/graphics/render/surface/RenderingSurface.java
similarity index 62%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/render/surface/RenderingSurface.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/render/surface/RenderingSurface.java
index f40ae37..b1b1c02 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/render/surface/RenderingSurface.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/render/surface/RenderingSurface.java
@@ -1,16 +1,30 @@
-package ru.fokinatorr.sparkle.graphics.render.surface;
+package net.fokinatorr.sparkle.graphics.render.surface;
-import ru.fokinatorr.sparkle.graphics.render.framebuffer.Framebuffer;
-import ru.fokinatorr.sparkle.phys2d.Point2D;
-import ru.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
+import net.fokinatorr.sparkle.event.lifecycle.CloseRequestedEvent;
+import net.fokinatorr.sparkle.graphics.ARGB;
+import net.fokinatorr.sparkle.graphics.PixelReader;
+import net.fokinatorr.sparkle.graphics.render.RenderCanvas;
+import net.fokinatorr.sparkle.graphics.render.framebuffer.Framebuffer;
+import net.fokinatorr.sparkle.phys2d.Point2D;
+import net.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
import java.util.Set;
/**
* Represents a surface where rendering occurs (e.g. window, embedded UI element).
* Different implementations provide different capabilities.
+ *
Note on {@link #acquireBuffer(int, int)} and {@link #present(Framebuffer)}:
+ * These methods are not intended to be used directly in user code;
+ * they were made public solely to allow custom graphics engine implementations. Use {@link RenderCanvas} for drawing operations instead.
*/
-public interface RenderingSurface extends NonThrowingAutoCloseable {
+public sealed interface RenderingSurface extends NonThrowingAutoCloseable
+ permits EmbeddedSurface, HeadlessSurface, WindowSurface {
+
+ /**
+ * Pass this constant to {@link #acquireBuffer(int, int)} as one of the parameters
+ * to request original resolution.
+ */
+ int FB_ORIGINAL_SIZE = -1;
// Common features
@@ -34,6 +48,35 @@ public interface RenderingSurface extends NonThrowingAutoCloseable {
return new Point2D(getWidth(), getHeight());
}
+ /**
+ * Changes the resizable state of this surface, if {@link Feature#RESIZABLE} is supported.
+ * Surfaces that don't support this feature usually ignore calls to this method.
+ *
+ * @param resizable whether this surface must be resizable
+ */
+ default void setResizable(boolean resizable) {
+ }
+
+ /**
+ * Checks whether this surface is resizable, if {@link Feature#RESIZABLE} is supported.
+ * Surfaces that don't support this feature must always return {@code false} here.
+ *
+ * @return whether this surface is resizable
+ */
+ default boolean isResizable() {
+ return false;
+ }
+
+ /**
+ * Adds a resize listener to this surface.
+ *
It may be useful to check the {@linkplain #isResizable() resizable state} before
+ * adding a callback. Surfaces that are never resizable are free to ignore calls to this method.
+ *
+ * @param callback the listener to call every time this surface gets resized
+ */
+ default void onResize(ResizeListener callback) {
+ }
+
/**
* Checks whether this surface is translucent (only the rendered content is visible).
* This is, in general, determined at creation time and may not change later.
@@ -51,30 +94,46 @@ public interface RenderingSurface extends NonThrowingAutoCloseable {
/**
* Acquires the next available framebuffer for rendering, if any.
- *
Internal use only, do not call directly!
+ * This method is for internal use only; see {@linkplain RenderingSurface##framebuffer_methods_note this note} for details.
+ * @param prefWidth preferred framebuffer width or {@link #FB_ORIGINAL_SIZE}
+ * @param prefHeight preferred framebuffer height or {@link #FB_ORIGINAL_SIZE}
* @return an available render target or {@code null} if not available
+ * @throws IllegalArgumentException if any argument is negative (except {@link #FB_ORIGINAL_SIZE})
*/
- Framebuffer acquireBuffer();
+ Framebuffer acquireBuffer(int prefWidth, int prefHeight);
/**
* Presents the given frame buffer onto this surface and releases it.
- *
Internal use only, do not call directly!
+ * This method is for internal use only; see {@linkplain RenderingSurface##framebuffer_methods_note this note} for details.
* @param frameBuffer the frame buffer
*/
void present(Framebuffer frameBuffer);
/**
- * Check if this surface should close.
+ * Check if this surface should close and clears this flag.
+ *
A close may be either:
+ *
+ * explicit : triggered by {@link #setShouldClose()}
+ * implicit : triggered externally (e.g. window 'X' button or Alt+F4)
+ *
+ * Use {@link #isExplicitShouldClose()} to distinguish between them.
* @return whether a close was requested
*/
boolean shouldClose();
/**
- * Adds a resize listener to this surface.
- *
- * @param callback the listener to call every time this surface gets resized
+ * Requests this surface to close; in other words, makes {@link #shouldClose()} return {@code true} on the next call.
*/
- void onResize(ResizeListener callback);
+ void setShouldClose();
+
+ /**
+ * Returns whether a close was explicitly requested with {@link #setShouldClose()} and clears this flag.
+ * Used by the engine for headful surfaces that might be closed implicitly (e.g. with window 'X' button).
+ * @return whether closing has been explicitly requested
+ * @see CloseRequestedEvent
+ * @see #shouldClose()
+ */
+ boolean isExplicitShouldClose();
// Conditional features
@@ -205,7 +264,20 @@ public interface RenderingSurface extends NonThrowingAutoCloseable {
}
/**
- * {@inheritDoc} After calling this method, the surface instance should not be used.
+ * Returns a pixel reader that can read this surface's contents as {@linkplain ARGB} pixels, if
+ * {@link Feature#READABLE} is supported.
+ * @return an object that reads this surface by pixels, if supported
+ * @throws UnsupportedOperationException if not readable
+ */
+ default PixelReader createPixelReader() {
+ throw new UnsupportedOperationException("Feature.READABLE not supported");
+ }
+
+ /**
+ * {@inheritDoc}
+ *
Note: surfaces must not be closed manually; this is handled by the graphics manager.
+ * Use {@link #setShouldClose()} instead to signal a close request.
+ *
After calling this method, the surface instance should not be used.
* Calling this method more than once does not have any effect.
*/
@Override
@@ -222,7 +294,8 @@ public interface RenderingSurface extends NonThrowingAutoCloseable {
HIDEABLE,
NAMEABLE,
FULLSCREENABLE,
- TRANSLUCENT
+ TRANSLUCENT,
+ READABLE
}
/**
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/render/surface/WindowSurface.java b/src/main/java/net/fokinatorr/sparkle/graphics/render/surface/WindowSurface.java
similarity index 72%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/render/surface/WindowSurface.java
rename to src/main/java/net/fokinatorr/sparkle/graphics/render/surface/WindowSurface.java
index 656c74d..c252030 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/render/surface/WindowSurface.java
+++ b/src/main/java/net/fokinatorr/sparkle/graphics/render/surface/WindowSurface.java
@@ -1,6 +1,6 @@
-package ru.fokinatorr.sparkle.graphics.render.surface;
+package net.fokinatorr.sparkle.graphics.render.surface;
-import ru.fokinatorr.sparkle.graphics.GraphicsManager;
+import net.fokinatorr.sparkle.graphics.GraphicsManager;
import java.util.Collections;
import java.util.EnumSet;
@@ -12,7 +12,7 @@ import java.util.Set;
* {@link GraphicsManager#createWindowContext createWindowContext(...)} methods to create & obtain an instance of this interface.
* If you want to insert a stage into a UI framework's window (JavaFX, Swing, etc.) - implement {@link EmbeddedSurface} instead.
*/
-public interface WindowSurface extends RenderingSurface {
+public non-sealed interface WindowSurface extends RenderingSurface {
@Override
default Set getFeatures() {
@@ -21,13 +21,26 @@ public interface WindowSurface extends RenderingSurface {
Feature.MOVABLE,
Feature.HIDEABLE,
Feature.NAMEABLE,
- Feature.FULLSCREENABLE
+ Feature.FULLSCREENABLE,
+ Feature.TRANSLUCENT
));
}
+ @Override
+ boolean isTranslucent();
+
@Override
void setSize(int newWidth, int newHeight);
+ @Override
+ boolean isResizable();
+
+ @Override
+ void setResizable(boolean resizable);
+
+ @Override
+ void onResize(ResizeListener callback);
+
@Override
int getX();
diff --git a/src/main/java/net/fokinatorr/sparkle/internal/access/EventLifecycleAccess.java b/src/main/java/net/fokinatorr/sparkle/internal/access/EventLifecycleAccess.java
new file mode 100644
index 0000000..e4d02b7
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/internal/access/EventLifecycleAccess.java
@@ -0,0 +1,15 @@
+package net.fokinatorr.sparkle.internal.access;
+
+import net.fokinatorr.sparkle.event.lifecycle.StageStateChangeEvent;
+import net.fokinatorr.sparkle.event.lifecycle.TickEvent;
+import net.fokinatorr.sparkle.stage.Stage;
+
+public interface EventLifecycleAccess {
+
+ /// The class in which this interface is implemented.
+ Class> INIT = TickEvent.class;
+
+ StageStateChangeEvent.StartEvent newStartEvent(Stage stage);
+
+ StageStateChangeEvent.StopEvent newStopEvent(Stage stage);
+}
diff --git a/src/main/java/ru/fokinatorr/sparkle/internal/access/SharedSecrets.java b/src/main/java/net/fokinatorr/sparkle/internal/access/SharedSecrets.java
similarity index 98%
rename from src/main/java/ru/fokinatorr/sparkle/internal/access/SharedSecrets.java
rename to src/main/java/net/fokinatorr/sparkle/internal/access/SharedSecrets.java
index 7575ed5..793873b 100644
--- a/src/main/java/ru/fokinatorr/sparkle/internal/access/SharedSecrets.java
+++ b/src/main/java/net/fokinatorr/sparkle/internal/access/SharedSecrets.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.internal.access;
+package net.fokinatorr.sparkle.internal.access;
import lombok.SneakyThrows;
import lombok.experimental.UtilityClass;
diff --git a/src/main/java/net/fokinatorr/sparkle/internal/access/SpriteAccess.java b/src/main/java/net/fokinatorr/sparkle/internal/access/SpriteAccess.java
new file mode 100644
index 0000000..5636602
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/internal/access/SpriteAccess.java
@@ -0,0 +1,20 @@
+package net.fokinatorr.sparkle.internal.access;
+
+import it.unimi.dsi.fastutil.Pair;
+import net.fokinatorr.sparkle.stage.RenderableID;
+import net.fokinatorr.sparkle.stage.Stage;
+import net.fokinatorr.sparkle.stage.sprite.Sprite;
+
+public interface SpriteAccess {
+
+ /// The class in which this interface is implemented.
+ Class> INIT = Sprite.class;
+
+ Pair getParent(Sprite sprite);
+
+ void attach(Sprite sprite, Stage toStage, String spriteId, int cloneId);
+
+ void onRenderContextInitialized(Sprite sprite);
+
+ void detach(Sprite sprite);
+}
diff --git a/src/main/java/ru/fokinatorr/sparkle/internal/access/StageAccess.java b/src/main/java/net/fokinatorr/sparkle/internal/access/StageAccess.java
similarity index 55%
rename from src/main/java/ru/fokinatorr/sparkle/internal/access/StageAccess.java
rename to src/main/java/net/fokinatorr/sparkle/internal/access/StageAccess.java
index 28959e1..88ed57c 100644
--- a/src/main/java/ru/fokinatorr/sparkle/internal/access/StageAccess.java
+++ b/src/main/java/net/fokinatorr/sparkle/internal/access/StageAccess.java
@@ -1,11 +1,10 @@
-package ru.fokinatorr.sparkle.internal.access;
+package net.fokinatorr.sparkle.internal.access;
-import org.checkerframework.checker.units.qual.Current;
-import ru.fokinatorr.sparkle.assets.Assets;
-import ru.fokinatorr.sparkle.context.AppContext;
-import ru.fokinatorr.sparkle.graphics.image.Image;
-import ru.fokinatorr.sparkle.stage.Stage;
-import ru.fokinatorr.sparkle.stage.StageCreator;
+import net.fokinatorr.sparkle.assets.Assets;
+import net.fokinatorr.sparkle.context.AppContext;
+import net.fokinatorr.sparkle.graphics.render.RenderingContext;
+import net.fokinatorr.sparkle.stage.Stage;
+import net.fokinatorr.sparkle.stage.StageCreator;
public interface StageAccess {
@@ -18,7 +17,7 @@ public interface StageAccess {
Stage newStage(Assets assets, AppContext context);
- AppContext getContext(Stage stage);
+ void setRenderContext(Stage stage, RenderingContext renderContext);
default Stage newStage(StageCreator creator, AppContext context) {
Stage stage = newStage(creator.getStageAssets(), context);
diff --git a/src/main/java/net/fokinatorr/sparkle/phys/RotationMode.java b/src/main/java/net/fokinatorr/sparkle/phys/RotationMode.java
new file mode 100644
index 0000000..51ff849
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/phys/RotationMode.java
@@ -0,0 +1,33 @@
+package net.fokinatorr.sparkle.phys;
+
+import net.fokinatorr.sparkle.phys2d.Physical2D;
+import net.fokinatorr.sparkle.stage.sprite.Sprite;
+
+/**
+ * Changes the way a physical object should be transformed depending on its {@linkplain Physical2D#getDirection() direction} value.
+ * Note for Scratchers: This enum brings functionality similar to the "rotation style" feature of sprites.
+ */
+public enum RotationMode {
+ /**
+ * Apply rotation normally (default mode in {@link Sprite}).
+ */
+ ALL_AROUND,
+ /**
+ * Apply no rotation and mirror horizontally if sine of direction is negative.
+ */
+ LEFT_RIGHT,
+ /**
+ * Apply no rotation.
+ *
Note for Scratchers: This mode functions similarly to "don't rotate" rotation style in Scratch.
+ * It was named "no rotation" for grammar accuracy.
+ */
+ NO_ROTATION,
+ /**
+ * Apply rotation normally and mirror vertically if sine of direction is negative.
+ */
+ LOOK_AT,
+ /**
+ * Apply no rotation and mirror vertically if cosine of direction is negative.
+ */
+ UP_DOWN
+}
diff --git a/src/main/java/ru/fokinatorr/sparkle/phys2d/Hitbox2D.java b/src/main/java/net/fokinatorr/sparkle/phys2d/Hitbox2D.java
similarity index 61%
rename from src/main/java/ru/fokinatorr/sparkle/phys2d/Hitbox2D.java
rename to src/main/java/net/fokinatorr/sparkle/phys2d/Hitbox2D.java
index bbec3c9..a5ce835 100644
--- a/src/main/java/ru/fokinatorr/sparkle/phys2d/Hitbox2D.java
+++ b/src/main/java/net/fokinatorr/sparkle/phys2d/Hitbox2D.java
@@ -1,11 +1,11 @@
-package ru.fokinatorr.sparkle.phys2d;
+package net.fokinatorr.sparkle.phys2d;
-import ru.fokinatorr.sparkle.graphics.ARGB;
-import ru.fokinatorr.sparkle.graphics.render.renderer.Renderable2D;
-import ru.fokinatorr.sparkle.phys2d.impl.*;
+import net.fokinatorr.sparkle.phys2d.impl.*;
import java.awt.Shape;
+import java.awt.geom.AffineTransform;
import java.awt.geom.Area;
+import java.awt.geom.Rectangle2D;
import java.util.Optional;
/**
@@ -20,7 +20,7 @@ import java.util.Optional;
*
Design Notes
*
* Hitboxes may be infinite (e.g. {@link Hitbox2D#always()}) — always check {@link #isFinite()} when needed
- * Center may not exist (e.g. infinite or complex shapes) — {@link #getCenter()} returns {@code Optional}
+ * Bounds may not exist (e.g. infinite or complex shapes) — {@link #getBounds()} returns {@code Optional}
* Implementations should be immutable and thread-safe where possible
*
*
@@ -31,7 +31,7 @@ import java.util.Optional;
* @see #never()
* @see #always()
*/
-public interface Hitbox2D {
+public sealed interface Hitbox2D permits AlwaysHitbox2D, AndHitbox2D, NeverHitbox2D, NotHitbox2D, OrHitbox2D, ShapeHitbox2D, TransformedHitbox2D {
/**
* Checks whether the given point lies within this hitbox.
@@ -67,6 +67,7 @@ public interface Hitbox2D {
/**
* Returns whether this hitbox and the given one cover exactly the same points.
+ * This method may return false negative results. False positives must not occur.
* @param other the other hitbox
* @return whether the two hitboxes are equivalent
*/
@@ -83,21 +84,45 @@ public interface Hitbox2D {
*/
boolean isFinite();
+ /**
+ * Returns a rectangle that completely encloses this hitbox, if any.
+ *
+ * Typically returns empty for infinite hitboxes.
+ *
+ * @return the bounding box, or empty if undefined
+ * @see #getBounds(AffineTransform)
+ */
+ Optional getBounds();
+
+ /**
+ * Returns a rectangle that completely encloses this hitbox transformed using the provided {@link AffineTransform} instance.
+ * @param affine the transform
+ * @return the bounding box after transformation, or empty if undefined
+ * @see #getBounds()
+ */
+ default Optional getBounds(AffineTransform affine) {
+ return getBounds()
+ .map(affine::createTransformedShape)
+ .map(Shape::getBounds2D);
+ }
+
/**
* Creates an {@link Area} representing all points covered by this hitbox, if it's {@link #isFinite finite},
* otherwise returns an empty optional.
* @return a new area of this hitbox, if applicable
+ * @see #createArea(AffineTransform)
*/
Optional createArea();
/**
- * Gets the center point of this hitbox, if any.
- *
- * May return empty for non-symmetric or infinite hitboxes.
- *
- * @return the center, or empty if undefined
+ * Creates an {@link Area} representing all points covered by this hitbox and applies the given
+ * {@link AffineTransform} instance to it.
+ * @return a new area of this hitbox, if applicable
+ * @see #createArea()
*/
- Optional getCenter();
+ default Optional createArea(AffineTransform affine) {
+ return createArea().map(area -> area.createTransformedArea(affine));
+ }
// Factory methods
@@ -106,25 +131,11 @@ public interface Hitbox2D {
* Creates a 2D hitbox matching the given shape without rotating the shape.
* @param shape the shape
* @return a new 2D hitbox
- * @see #shape(Shape, double)
*/
static Hitbox2D shape(Shape shape) {
return new ShapeHitbox2D(shape);
}
- /**
- * Creates a 2D hitbox matching the given shape.
- *
- * @param shape the shape
- * @param direction the rotation angle of the shape in degrees, relative to upper vertical axis (0 is facing upwards, 90 is no rotation).
- * It will be {@link ru.fokinatorr.sparkle.util.Mth#wrapClamp(double, double, double) wrap-around clamped}
- * between {@code -180} and {@code 180}, so any finite value can be passed.
- * @return a new 2D hitbox
- */
- static Hitbox2D shape(Shape shape, double direction) {
- return new ShapeHitbox2D(shape, direction);
- }
-
/**
* Creates a 2D hitbox that is a union of the given hitboxes. The hitbox list is optimized
* (all hitboxes that are fully contained by other hitboxes in the list are removed).
@@ -169,18 +180,69 @@ public interface Hitbox2D {
return optimize ? and.optimize() : and;
}
+ /**
+ * Intersects this hitbox with the given one and returns the optimized intersection.
+ * @param hb the hitbox to intersect with
+ * @return a new 2D hitbox
+ * @see #and(Hitbox2D...)
+ */
+ default Hitbox2D and(Hitbox2D hb) {
+ return and(this, hb);
+ }
+
+ /**
+ * Intersects this hitbox with the given one and returns the intersection.
+ * @param optimize whether to optimize hitboxes
+ * @param hb the hitbox to intersect with
+ * @return a new 2D hitbox
+ * @see #and(boolean, Hitbox2D...)
+ */
+ default Hitbox2D and(boolean optimize, Hitbox2D hb) {
+ return and(optimize, this, hb);
+ }
+
+ /**
+ * Unites this hitbox with the given one and returns the optimized union.
+ * @param hb the hitbox to unite with
+ * @return a new 2D hitbox
+ * @see #or(Hitbox2D...)
+ */
+ default Hitbox2D or(Hitbox2D hb) {
+ return or(this, hb);
+ }
+
+ /**
+ * Unites this hitbox with the given one and returns the union.
+ * @param optimize whether to optimize hitboxes
+ * @param hb the hitbox to unite with
+ * @return a new 2D hitbox
+ * @see #or(boolean, Hitbox2D...)
+ */
+ default Hitbox2D or(boolean optimize, Hitbox2D hb) {
+ return or(optimize, this, hb);
+ }
+
/**
* Creates a 2D hitbox that covers every point except those covered by this hitbox. In other words,
- * returns a negation of this hitbox.
+ * returns a negation/complement of this hitbox.
* @return a new 2D hitbox
*/
default Hitbox2D not() {
return new NotHitbox2D(this);
}
+ /**
+ * Transforms this hitbox using the given {@link AffineTransform} instance.
+ * @param affine the transform object
+ * @return a new 2D hitbox
+ */
+ default Hitbox2D transform(AffineTransform affine) {
+ return affine.isIdentity() ? this : new TransformedHitbox2D(this, affine);
+ }
+
/**
* Returns a 2D hitbox that doesn't cover any points. Useful for purely visual objects, like particles, etc.
- * It doesn't have a {@link #getCenter center point} and {@link #createArea creates} empty {@link Area Areas}.
+ *
It doesn't have a {@linkplain #getBounds bounding box} and {@linkplain #createArea returns} an empty {@link Area}.
* @return an empty 2D hitbox
*/
static Hitbox2D never() {
@@ -189,23 +251,10 @@ public interface Hitbox2D {
/**
* Returns a 2D hitbox that covers all points.
- *
It doesn't have a {@link #getCenter center point} or an {@link Area}.
+ *
It doesn't have a {@linkplain #getBounds bounding box} or an {@link Area}.
* @return an "all-points" 2D hitbox
*/
static Hitbox2D always() {
return AlwaysHitbox2D.INSTANCE;
}
-
- /**
- * Creates a renderable object from this hitbox. Useful for debugging/cheat menu mods.
- * @param outlineColor the outline color of the hitbox's area in ARGB format (usually opaque)
- * @param fillColor the fill color of the hitbox's area in ARGB format (usually ~50% transparent)
- * @return this hitbox as a renderable object
- * @see ARGB
- */
- default Renderable2D asRenderable(int outlineColor, int fillColor) {
- return new RenderableHitbox2D(this, outlineColor, fillColor);
- }
-
-
}
\ No newline at end of file
diff --git a/src/main/java/net/fokinatorr/sparkle/phys2d/Physical2D.java b/src/main/java/net/fokinatorr/sparkle/phys2d/Physical2D.java
new file mode 100644
index 0000000..65cc01e
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/phys2d/Physical2D.java
@@ -0,0 +1,56 @@
+package net.fokinatorr.sparkle.phys2d;
+
+import net.fokinatorr.sparkle.phys.RotationMode;
+import net.fokinatorr.sparkle.graphics.render.renderer.PhysicalRenderable2D;
+
+/**
+ * A physical 2-dimensional object with properties like world coordinates, direction, X/Y axis stretching,
+ * and a hitbox. These properties are anchored to the object's center point.
+ *
It's important to distinguish between screen coordinate system (SCS; origin in top-left corner; X axis right,
+ * Y axis down ) vs. world coordinate system (WCS; origin in the center; X axis right, Y axis up ).
+ * SCS is more convenient for rendering, while WCS is preferred for physics calculations. While it's possible
+ * to convert between them if bounds are known, they should NOT be mixed together to prevent confusions and sudden bugs.
+ *
Therefore, do not implement this interface if you want a purely graphical entity!
+ * @see PhysicalRenderable2D
+ */
+public interface Physical2D {
+
+ /**
+ * {@return the current X coordinate}
+ */
+ double getX();
+
+ /**
+ * {@return the current Y coordinate}
+ */
+ double getY();
+
+ /**
+ * {@return the current direction in degrees} The direction is relative to the upper vertical axis: {@code 0}
+ * means facing up, {@code 90} means no rotation.
+ */
+ double getDirection();
+
+ /**
+ * {@return the rotation mode} The returned value changes how this object gets rendered depending on the
+ * {@linkplain #getDirection() direction}.
+ * @see RotationMode
+ */
+ RotationMode getRotationMode();
+
+ /**
+ * {@return the X axis stretch in percents} If you don't want to apply stretch, return {@code 100} (100% stretch - no change).
+ */
+ double getStretchX();
+
+ /**
+ * {@return the Y axis stretch in percents} If you don't want to apply stretch, return {@code 100} (100% stretch - no change).
+ */
+ double getStretchY();
+
+ /**
+ * Returns this object's collision box, as if without any transformations applied.
+ * @return the collision box
+ */
+ Hitbox2D getHitbox();
+}
diff --git a/src/main/java/ru/fokinatorr/sparkle/phys2d/Point2D.java b/src/main/java/net/fokinatorr/sparkle/phys2d/Point2D.java
similarity index 98%
rename from src/main/java/ru/fokinatorr/sparkle/phys2d/Point2D.java
rename to src/main/java/net/fokinatorr/sparkle/phys2d/Point2D.java
index a93b418..9c906e7 100644
--- a/src/main/java/ru/fokinatorr/sparkle/phys2d/Point2D.java
+++ b/src/main/java/net/fokinatorr/sparkle/phys2d/Point2D.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.phys2d;
+package net.fokinatorr.sparkle.phys2d;
/**
* Represents a point in 2D space.
diff --git a/src/main/java/ru/fokinatorr/sparkle/phys2d/impl/AlwaysHitbox2D.java b/src/main/java/net/fokinatorr/sparkle/phys2d/impl/AlwaysHitbox2D.java
similarity index 83%
rename from src/main/java/ru/fokinatorr/sparkle/phys2d/impl/AlwaysHitbox2D.java
rename to src/main/java/net/fokinatorr/sparkle/phys2d/impl/AlwaysHitbox2D.java
index 40f2a31..3c5713b 100644
--- a/src/main/java/ru/fokinatorr/sparkle/phys2d/impl/AlwaysHitbox2D.java
+++ b/src/main/java/net/fokinatorr/sparkle/phys2d/impl/AlwaysHitbox2D.java
@@ -1,9 +1,10 @@
-package ru.fokinatorr.sparkle.phys2d.impl;
+package net.fokinatorr.sparkle.phys2d.impl;
-import ru.fokinatorr.sparkle.phys2d.Hitbox2D;
-import ru.fokinatorr.sparkle.phys2d.Point2D;
+import net.fokinatorr.sparkle.phys2d.Hitbox2D;
+import net.fokinatorr.sparkle.phys2d.Point2D;
import java.awt.geom.Area;
+import java.awt.geom.Rectangle2D;
import java.util.Optional;
/**
@@ -39,7 +40,7 @@ public enum AlwaysHitbox2D implements Hitbox2D {
}
@Override
- public Optional getCenter() {
+ public Optional getBounds() {
return Optional.empty();
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/phys2d/impl/AndHitbox2D.java b/src/main/java/net/fokinatorr/sparkle/phys2d/impl/AndHitbox2D.java
similarity index 80%
rename from src/main/java/ru/fokinatorr/sparkle/phys2d/impl/AndHitbox2D.java
rename to src/main/java/net/fokinatorr/sparkle/phys2d/impl/AndHitbox2D.java
index 5704c65..cf97148 100644
--- a/src/main/java/ru/fokinatorr/sparkle/phys2d/impl/AndHitbox2D.java
+++ b/src/main/java/net/fokinatorr/sparkle/phys2d/impl/AndHitbox2D.java
@@ -1,13 +1,16 @@
-package ru.fokinatorr.sparkle.phys2d.impl;
+package net.fokinatorr.sparkle.phys2d.impl;
-import ru.fokinatorr.sparkle.phys2d.Hitbox2D;
-import ru.fokinatorr.sparkle.phys2d.Point2D;
+import net.fokinatorr.sparkle.phys2d.Hitbox2D;
+import net.fokinatorr.sparkle.phys2d.Point2D;
import java.awt.geom.Area;
+import java.awt.geom.Rectangle2D;
import java.util.*;
import java.util.function.Predicate;
-import static ru.fokinatorr.sparkle.phys2d.impl.OrHitbox2D.areaSize;
+import static java.lang.Double.NEGATIVE_INFINITY;
+import static java.lang.Double.POSITIVE_INFINITY;
+import static net.fokinatorr.sparkle.phys2d.impl.OrHitbox2D.areaSize;
/**
* An intersection of 2D hitboxes. This hitbox is finite only if at least one child hitbox is finite.
@@ -32,7 +35,7 @@ public record AndHitbox2D(Collection extends Hitbox2D> children) implements Hi
* @throws NullPointerException if children is {@code null}
*/
public AndHitbox2D(Hitbox2D... children) {
- this(Arrays.asList(Objects.requireNonNull(children, "children")));
+ this(Set.of(Objects.requireNonNull(children, "children")));
}
/**
@@ -48,7 +51,7 @@ public record AndHitbox2D(Collection extends Hitbox2D> children) implements Hi
} else if (children.stream().allMatch(IS_ALWAYS_HITBOX)) {
return AlwaysHitbox2D.INSTANCE;
}
- Collection extends Hitbox2D> optChildren = optimizeChildren(children);
+ Collection optChildren = optimizeChildren(children);
if (optChildren.isEmpty() || optChildren.contains(NeverHitbox2D.INSTANCE)) {
return NeverHitbox2D.INSTANCE;
} else if (ALWAYS_HITBOX_SET.equals(optChildren)) {
@@ -82,18 +85,26 @@ public record AndHitbox2D(Collection extends Hitbox2D> children) implements Hi
}
@Override
- public Optional getCenter() {
+ public Optional getBounds() {
if (children.isEmpty()) return Optional.empty();
- double xSum = 0, ySum = 0;
- int childCount = children.size();
+ double minX = NEGATIVE_INFINITY, minY = NEGATIVE_INFINITY;
+ double maxX = POSITIVE_INFINITY, maxY = POSITIVE_INFINITY;
+ boolean infinite = true;
for (Hitbox2D child : children) {
- Point2D childCenter = child.getCenter().orElse(null);
- if (childCenter != null) {
- xSum += childCenter.x();
- ySum += childCenter.y();
+ Rectangle2D childBounds = child.getBounds().orElse(null);
+ if (childBounds != null) {
+ minX = Math.max(minX, childBounds.getMinX()); // rightmost left
+ minY = Math.max(minY, childBounds.getMinY());
+ maxX = Math.min(maxX, childBounds.getMaxX()); // leftmost right
+ maxY = Math.min(maxY, childBounds.getMaxY());
+ infinite = false;
}
+ // If child is infinite, just ignore it
}
- return Optional.of(new Point2D(xSum / childCount, ySum / childCount));
+ if (infinite || maxX < minX || maxY < minY) {
+ return Optional.empty();
+ }
+ return Optional.of(new Rectangle2D.Double(minX, minY, maxX - minX, maxY - minY));
}
@Override
@@ -104,9 +115,9 @@ public record AndHitbox2D(Collection extends Hitbox2D> children) implements Hi
@Override
public Hitbox2D not() {
- // !c1 && !c2 && ... && !cn
+ // !(!c1 && !c2 && ... && !cn)
// can be replaced with
- // !(c1 || c2 || ... || cn)
+ // c1 || c2 || ... || cn
List newChildren = new ArrayList<>(children.size());
for (Hitbox2D child : children) {
if (child instanceof NotHitbox2D(Hitbox2D delegate)) {
@@ -115,7 +126,7 @@ public record AndHitbox2D(Collection extends Hitbox2D> children) implements Hi
return Hitbox2D.super.not();
}
}
- return new NotHitbox2D(new OrHitbox2D(newChildren));
+ return new OrHitbox2D(newChildren);
}
@@ -184,12 +195,12 @@ public record AndHitbox2D(Collection extends Hitbox2D> children) implements Hi
}
}
if (!intersectsWithAny) {
- return List.of();
+ return Set.of();
}
}
}
list.removeAll(toRemove);
- return Collections.unmodifiableList(list);
+ return Set.copyOf(list);
}
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/phys2d/impl/NeverHitbox2D.java b/src/main/java/net/fokinatorr/sparkle/phys2d/impl/NeverHitbox2D.java
similarity index 83%
rename from src/main/java/ru/fokinatorr/sparkle/phys2d/impl/NeverHitbox2D.java
rename to src/main/java/net/fokinatorr/sparkle/phys2d/impl/NeverHitbox2D.java
index 29caa79..db84d4d 100644
--- a/src/main/java/ru/fokinatorr/sparkle/phys2d/impl/NeverHitbox2D.java
+++ b/src/main/java/net/fokinatorr/sparkle/phys2d/impl/NeverHitbox2D.java
@@ -1,10 +1,10 @@
-package ru.fokinatorr.sparkle.phys2d.impl;
+package net.fokinatorr.sparkle.phys2d.impl;
-import ru.fokinatorr.sparkle.phys2d.Hitbox2D;
-import ru.fokinatorr.sparkle.phys2d.Point2D;
+import net.fokinatorr.sparkle.phys2d.Hitbox2D;
+import net.fokinatorr.sparkle.phys2d.Point2D;
import java.awt.geom.Area;
-import java.util.Collection;
+import java.awt.geom.Rectangle2D;
import java.util.Optional;
/**
@@ -39,7 +39,7 @@ public enum NeverHitbox2D implements Hitbox2D {
}
@Override
- public Optional getCenter() {
+ public Optional getBounds() {
return Optional.empty();
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/phys2d/impl/NotHitbox2D.java b/src/main/java/net/fokinatorr/sparkle/phys2d/impl/NotHitbox2D.java
similarity index 84%
rename from src/main/java/ru/fokinatorr/sparkle/phys2d/impl/NotHitbox2D.java
rename to src/main/java/net/fokinatorr/sparkle/phys2d/impl/NotHitbox2D.java
index 4fbdf59..86cb765 100644
--- a/src/main/java/ru/fokinatorr/sparkle/phys2d/impl/NotHitbox2D.java
+++ b/src/main/java/net/fokinatorr/sparkle/phys2d/impl/NotHitbox2D.java
@@ -1,10 +1,10 @@
-package ru.fokinatorr.sparkle.phys2d.impl;
+package net.fokinatorr.sparkle.phys2d.impl;
-import ru.fokinatorr.sparkle.phys2d.Hitbox2D;
-import ru.fokinatorr.sparkle.phys2d.Point2D;
+import net.fokinatorr.sparkle.phys2d.Hitbox2D;
+import net.fokinatorr.sparkle.phys2d.Point2D;
-import java.awt.*;
import java.awt.geom.Area;
+import java.awt.geom.Rectangle2D;
import java.util.Objects;
import java.util.Optional;
@@ -60,8 +60,10 @@ public record NotHitbox2D(Hitbox2D delegate) implements Hitbox2D {
}
@Override
- public Optional getCenter() {
- return delegate.getCenter();
+ public Optional getBounds() {
+ return delegate instanceof NotHitbox2D(Hitbox2D thatDelegate)
+ ? thatDelegate.getBounds()
+ : Optional.empty();
}
@Override
diff --git a/src/main/java/ru/fokinatorr/sparkle/phys2d/impl/OrHitbox2D.java b/src/main/java/net/fokinatorr/sparkle/phys2d/impl/OrHitbox2D.java
similarity index 82%
rename from src/main/java/ru/fokinatorr/sparkle/phys2d/impl/OrHitbox2D.java
rename to src/main/java/net/fokinatorr/sparkle/phys2d/impl/OrHitbox2D.java
index 642cf14..d2d3eb0 100644
--- a/src/main/java/ru/fokinatorr/sparkle/phys2d/impl/OrHitbox2D.java
+++ b/src/main/java/net/fokinatorr/sparkle/phys2d/impl/OrHitbox2D.java
@@ -1,13 +1,17 @@
-package ru.fokinatorr.sparkle.phys2d.impl;
+package net.fokinatorr.sparkle.phys2d.impl;
-import ru.fokinatorr.sparkle.phys2d.Hitbox2D;
-import ru.fokinatorr.sparkle.phys2d.Point2D;
+import net.fokinatorr.sparkle.phys2d.Hitbox2D;
+import net.fokinatorr.sparkle.phys2d.Point2D;
import java.awt.geom.Area;
+import java.awt.geom.Rectangle2D;
import java.util.*;
import java.util.List;
import java.util.function.Predicate;
+import static java.lang.Double.NEGATIVE_INFINITY;
+import static java.lang.Double.POSITIVE_INFINITY;
+
/**
* A union of 2D hitboxes. This hitbox is finite only if all child hitboxes are finite.
*
@@ -30,7 +34,7 @@ public record OrHitbox2D(Collection extends Hitbox2D> children) implements Hit
* @throws NullPointerException if children is {@code null}
*/
public OrHitbox2D(Hitbox2D... children) {
- this(Arrays.asList(Objects.requireNonNull(children, "children")));
+ this(Set.of(Objects.requireNonNull(children, "children")));
}
/**
@@ -81,17 +85,25 @@ public record OrHitbox2D(Collection extends Hitbox2D> children) implements Hit
}
@Override
- public Optional getCenter() {
+ public Optional getBounds() {
if (children.isEmpty()) return Optional.empty();
- double xSum = 0, ySum = 0;
- int childCount = children.size();
+ double minX = POSITIVE_INFINITY, minY = POSITIVE_INFINITY;
+ double maxX = NEGATIVE_INFINITY, maxY = NEGATIVE_INFINITY;
for (Hitbox2D child : children) {
- Point2D childCenter = child.getCenter().orElse(null);
- if (childCenter == null) return Optional.empty();
- xSum += childCenter.x();
- ySum += childCenter.y();
+ Rectangle2D childBounds = child.getBounds().orElse(null);
+ if (childBounds == null) {
+ // If child is infinite, we're infinite too
+ return Optional.empty();
+ }
+ minX = Math.min(minX, childBounds.getMinX()); // leftmost left
+ minY = Math.min(minY, childBounds.getMinY());
+ maxX = Math.max(maxX, childBounds.getMaxX()); // rightmost right
+ maxY = Math.max(maxY, childBounds.getMaxY());
}
- return Optional.of(new Point2D(xSum / childCount, ySum / childCount));
+ if (maxX <= minX || maxY <= minY) {
+ return Optional.empty();
+ }
+ return Optional.of(new Rectangle2D.Double(minX, minY, maxX - minX, maxY - minY));
}
@Override
@@ -101,9 +113,9 @@ public record OrHitbox2D(Collection extends Hitbox2D> children) implements Hit
@Override
public Hitbox2D not() {
- // !c1 || !c2 || ... || !cn
+ // !(!c1 || !c2 || ... || !cn)
// can be replaced with
- // !(c1 && c2 && ... && cn)
+ // c1 && c2 && ... && cn
List newChildren = new ArrayList<>(children.size());
for (Hitbox2D child : children) {
if (child instanceof NotHitbox2D(Hitbox2D delegate)) {
@@ -112,7 +124,7 @@ public record OrHitbox2D(Collection extends Hitbox2D> children) implements Hit
return Hitbox2D.super.not();
}
}
- return new NotHitbox2D(new AndHitbox2D(newChildren));
+ return new AndHitbox2D(newChildren);
}
@@ -183,7 +195,7 @@ public record OrHitbox2D(Collection extends Hitbox2D> children) implements Hit
}
list.removeAll(toRemove);
- return Collections.unmodifiableList(list);
+ return Set.copyOf(list);
}
/**
@@ -193,6 +205,6 @@ public record OrHitbox2D(Collection extends Hitbox2D> children) implements Hit
static double areaSize(Hitbox2D hitbox) {
return hitbox.createArea()
.map(area -> area.getBounds2D().getWidth() * area.getBounds2D().getHeight())
- .orElse(Double.POSITIVE_INFINITY);
+ .orElse(POSITIVE_INFINITY);
}
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/phys2d/impl/ShapeHitbox2D.java b/src/main/java/net/fokinatorr/sparkle/phys2d/impl/ShapeHitbox2D.java
similarity index 59%
rename from src/main/java/ru/fokinatorr/sparkle/phys2d/impl/ShapeHitbox2D.java
rename to src/main/java/net/fokinatorr/sparkle/phys2d/impl/ShapeHitbox2D.java
index 6408975..53f6115 100644
--- a/src/main/java/ru/fokinatorr/sparkle/phys2d/impl/ShapeHitbox2D.java
+++ b/src/main/java/net/fokinatorr/sparkle/phys2d/impl/ShapeHitbox2D.java
@@ -1,11 +1,9 @@
-package ru.fokinatorr.sparkle.phys2d.impl;
+package net.fokinatorr.sparkle.phys2d.impl;
-import ru.fokinatorr.sparkle.phys2d.Hitbox2D;
-import ru.fokinatorr.sparkle.phys2d.Point2D;
-import ru.fokinatorr.sparkle.util.Mth;
+import net.fokinatorr.sparkle.phys2d.Hitbox2D;
+import net.fokinatorr.sparkle.phys2d.Point2D;
import java.awt.Shape;
-import java.awt.geom.AffineTransform;
import java.awt.geom.Area;
import java.awt.geom.Rectangle2D;
import java.util.Objects;
@@ -25,35 +23,14 @@ public record ShapeHitbox2D(Shape shape) implements Hitbox2D {
Objects.requireNonNull(shape, "shape");
}
- /**
- * Creates a {@code ShapeHitbox2D} with the given shape rotated by the given amount of degrees
- * @param shape the shape
- * @param directionInDegrees the rotation angle in degrees, relative to upper vertical axis (0 is facing upwards, 90 is no rotation). It will
- * be {@link Mth#wrapClamp(double, double, double) wrap-around clamped} between {@code -180} and {@code 180}.
- * @throws NullPointerException if the shape is {@code null}
- */
- public ShapeHitbox2D(Shape shape, double directionInDegrees) {
- Objects.requireNonNull(shape, "shape");
- directionInDegrees = Mth.wrapClamp(directionInDegrees, -180.0, 180.0);
- if (directionInDegrees != 90) {
- Point2D center = getShapeCenter(shape);
- shape = AffineTransform.getRotateInstance(
- Math.toRadians(directionInDegrees), // angle
- center.x(), // anchor x
- center.y() // anchor y
- ).createTransformedShape(shape);
- }
- this(shape);
- }
-
@Override
public boolean contains(Point2D point) {
return shape.contains(point.x(), point.y());
}
@Override
- public Optional getCenter() {
- return Optional.of(getShapeCenter(shape));
+ public Optional getBounds() {
+ return Optional.of(shape.getBounds2D());
}
@Override
@@ -95,10 +72,7 @@ public record ShapeHitbox2D(Shape shape) implements Hitbox2D {
@Override
public boolean equals(Hitbox2D other) {
- if (other instanceof ShapeHitbox2D(Shape thatShape)) {
- return shape.equals(thatShape);
- }
- return Hitbox2D.super.equals(other);
+ return other instanceof ShapeHitbox2D(Shape thatShape) && shape.equals(thatShape) || Hitbox2D.super.equals(other);
}
@Override
diff --git a/src/main/java/net/fokinatorr/sparkle/phys2d/impl/TransformedHitbox2D.java b/src/main/java/net/fokinatorr/sparkle/phys2d/impl/TransformedHitbox2D.java
new file mode 100644
index 0000000..f8b5e1e
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/phys2d/impl/TransformedHitbox2D.java
@@ -0,0 +1,148 @@
+package net.fokinatorr.sparkle.phys2d.impl;
+
+import net.fokinatorr.sparkle.phys2d.Hitbox2D;
+import net.fokinatorr.sparkle.phys2d.Point2D;
+
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Area;
+import java.awt.geom.NoninvertibleTransformException;
+import java.awt.geom.Rectangle2D;
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * A 2D hitbox transformed with an {@link AffineTransform} instance.
+ * Uses bounds to check containment and intersection first, which quickly catches most cases. The rest
+ * cases and handled with actual hitbox transformation, which is more expensive.
+ * @param delegate the original hitbox
+ * @param transform the transform object
+ */
+public record TransformedHitbox2D(Hitbox2D delegate, AffineTransform transform) implements Hitbox2D {
+
+ /**
+ * @throws NullPointerException if any argument is {@code null}
+ */
+ public TransformedHitbox2D {
+ Objects.requireNonNull(delegate, "delegate");
+ Objects.requireNonNull(transform, "transform");
+ }
+
+ @Override
+ public boolean contains(Point2D point) {
+ try {
+ double[] flat = {point.x(), point.y()};
+ transform.inverseTransform(flat, 0, flat, 0, 1);
+ return delegate.contains(new Point2D(flat[0], flat[1]));
+ } catch (NoninvertibleTransformException e) {
+ // degenerate transform
+ return false;
+ }
+ }
+
+ @Override
+ public boolean intersects(Hitbox2D other) {
+ return intersects(delegate, transform, other);
+ }
+
+ @Override
+ public boolean contains(Hitbox2D other) {
+ return contains(delegate, transform, other);
+ }
+
+ @Override
+ public boolean isFinite() {
+ return delegate.isFinite();
+ }
+
+ @Override
+ public Optional getBounds() {
+ return delegate.getBounds(transform);
+ }
+
+ @Override
+ public Optional createArea() {
+ return delegate.createArea(transform);
+ }
+
+ @Override
+ public boolean equals(Hitbox2D other) {
+ if (other instanceof TransformedHitbox2D(Hitbox2D thatDelegate, AffineTransform thatTransform)) {
+ return delegate.equals(thatDelegate) && transform.equals(thatTransform);
+ }
+ return Hitbox2D.super.equals(other);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return obj instanceof Hitbox2D hb && equals(hb);
+ }
+
+ @Override
+ public Hitbox2D transform(AffineTransform affine) {
+ if (affine.isIdentity()) return this;
+ AffineTransform newTransform = (AffineTransform) transform.clone();
+ newTransform.concatenate(affine);
+ return new TransformedHitbox2D(delegate, newTransform); // don't stack TransformedHitbox2D instances
+ }
+
+ private static boolean intersects(Hitbox2D hb, AffineTransform tfm, Hitbox2D other) {
+ // using boolean algebra notation
+ if (AlwaysHitbox2D.INSTANCE.equals(hb)) {
+ return true; // ⊤ ∩ hb ≡ ⊤
+ } else if (NeverHitbox2D.INSTANCE.equals(hb)) {
+ return false; // ⊥ ∩ hb ≡ ⊥
+ } else if (hb instanceof NotHitbox2D(Hitbox2D negated)) {
+ return !contains(negated, tfm, other); // (¬hb) ∩ other ≡ ¬(hb ⊇ other)
+ } else {
+ // hb is highly likely finite
+ Optional bounds = hb.getBounds(tfm);
+ Optional thatBounds = other.getBounds();
+ // fast reject if bounds don't intersect
+ if (bounds.isPresent() && thatBounds.isPresent() && !bounds.get().intersects(thatBounds.get())) {
+ return false;
+ }
+
+ // hb ∩ ⊤ = ⊤ (anything intersects with always)
+ // hb ∩ ⊥ = ⊥ (nothing intersects with never)
+ // hb ∩ (¬other) = ¬(other ⊆ ¬hb) (symmetric complement property)
+ if (AlwaysHitbox2D.INSTANCE.equals(other)) {
+ return true; // other ∩ ⊤ ≡ ⊤
+ } else if (NeverHitbox2D.INSTANCE.equals(other)) {
+ return false; // other ∩ ⊥ ≡ ⊥
+ } else if (other instanceof NotHitbox2D(Hitbox2D negated)) {
+ try {
+ return !contains(negated, tfm.createInverse(), hb); // hb ∩ (¬other) ≡ ¬(other ⊆ ¬hb)
+ } catch (NoninvertibleTransformException e) {
+ return false; // degenerate transform
+ }
+ } else {
+ Area thisArea = hb.createArea(tfm).orElseThrow();
+ Area thatArea = other.createArea().orElseThrow();
+ thisArea.intersect(thatArea);
+ return !thisArea.isEmpty();
+ }
+ }
+ }
+
+ private static boolean contains(Hitbox2D hb, AffineTransform tfm, Hitbox2D other) {
+ if (AlwaysHitbox2D.INSTANCE.equals(hb)) {
+ return true; // ⊤ ⊇ hb ≡ ⊤
+ } else if (NeverHitbox2D.INSTANCE.equals(hb)) {
+ return false; // ⊥ ⊇ hb ≡ ⊥
+ } else if (hb instanceof NotHitbox2D(Hitbox2D negated)) {
+ return !intersects(negated, tfm, other); // (¬hb) ⊇ other ≡ ¬(hb ∩ other)
+ } else {
+ // hb is highly likely finite
+ Optional bounds = hb.getBounds(tfm);
+ Optional thatBounds = other.getBounds();
+ // fast reject with bounds and other is infinite (finite can't contain infinite):
+ if (thatBounds.isEmpty() || bounds.isPresent() && !bounds.get().contains(thatBounds.get())) {
+ return false;
+ }
+ Area thisArea = hb.createArea(tfm).orElseThrow();
+ Area thatArea = other.createArea().orElseThrow();
+ thatArea.subtract(thisArea);
+ return thatArea.isEmpty();
+ }
+ }
+}
diff --git a/src/main/java/net/fokinatorr/sparkle/stage/ControlPanel.java b/src/main/java/net/fokinatorr/sparkle/stage/ControlPanel.java
new file mode 100644
index 0000000..3450433
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/stage/ControlPanel.java
@@ -0,0 +1,336 @@
+package net.fokinatorr.sparkle.stage;
+
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.NonFinal;
+import net.fokinatorr.sparkle.effect.graphics.GraphicEffectMap;
+import net.fokinatorr.sparkle.event.dispatcher.EventDispatcher;
+import net.fokinatorr.sparkle.event.input.MouseEvent;
+import net.fokinatorr.sparkle.graphics.GraphicsManager;
+import net.fokinatorr.sparkle.graphics.image.Image;
+import net.fokinatorr.sparkle.graphics.render.RenderCanvas;
+import net.fokinatorr.sparkle.graphics.render.RenderingContext;
+import net.fokinatorr.sparkle.graphics.render.renderer.Renderable2D;
+import net.fokinatorr.sparkle.phys2d.Hitbox2D;
+import net.fokinatorr.sparkle.phys2d.Point2D;
+import net.fokinatorr.sparkle.util.Constants;
+import net.fokinatorr.sparkle.util.DebugUtils;
+import net.fokinatorr.sparkle.util.GraphicsUtils;
+
+import java.awt.*;
+import java.awt.geom.Path2D;
+import java.awt.geom.Rectangle2D;
+import java.nio.file.Path;
+import java.util.Comparator;
+import java.util.EnumSet;
+
+import static lombok.AccessLevel.PRIVATE;
+import static net.fokinatorr.sparkle.util.Constants.ROOT;
+
+/**
+ * A stage panel that contains control buttons. Pressing these buttons may change the stage's state
+ * (e.g. {@linkplain Stage#start start} or {@linkplain Stage#stop stop} its loop).
+ */
+@FieldDefaults(makeFinal = true, level = PRIVATE)
+@RequiredArgsConstructor(access = PRIVATE)
+public class ControlPanel implements Renderable2D {
+
+ /**
+ * Control panel properties.
+ */
+ private static final double
+ WIDTH_PER_BUTTON = 40,
+ HEIGHT = 40,
+ BUTTON_WIDTH = 35,
+ BUTTON_HEIGHT = 35;
+
+ private static final double
+ MARGIN_X = (WIDTH_PER_BUTTON - BUTTON_WIDTH) / 2,
+ MARGIN_Y = (HEIGHT - BUTTON_HEIGHT) / 2;
+
+ private static final Path
+ START_IMG = ROOT.resolve("assets/textures/control_buttons/start.svg"),
+ PAUSE_IMG = ROOT.resolve("assets/textures/control_buttons/pause.svg"),
+ STOP_IMG = ROOT.resolve("assets/textures/control_buttons/stop.svg");
+
+ @NonNull
+ Stage stage;
+ @NonNull
+ String id;
+ @NonNull
+ Corner corner;
+ EnumSet visibleButtons = DebugUtils.isDebuggerAttached()
+ ? EnumSet.allOf(Button.class)
+ : EnumSet.of(Button.START, Button.STOP);
+
+ @NonFinal
+ Image start, pause, stop;
+ @NonFinal
+ Hitbox2D cachedHB;
+
+ /**
+ * Whether this control panel should be visible.
+ */
+ @NonFinal
+ @Getter
+ @Setter
+ boolean visible = true;
+ /**
+ * This control panel's graphic effects.
+ */
+ @Getter
+ GraphicEffectMap graphicEffects = new GraphicEffectMap();
+
+ /**
+ * Creates a control panel and registers it in the given stage under specified ID anchored at the given corner.
+ *
+ * @param stage the stage to attach to
+ * @param id the unique identifier of this panel in the stage
+ * @param corner the corner to anchor to
+ * @return a new control panel
+ */
+ public static ControlPanel register(Stage stage, String id, Corner corner) {
+ ControlPanel result = new ControlPanel(stage, id, corner);
+ stage.registerRenderable(id, result);
+ stage.getContext().get(EventDispatcher.class).addListener(MouseEvent.MouseClickedEvent.class, result::clicked);
+ return result;
+ }
+
+ /**
+ * Represents a button controlling state of a stage.
+ */
+ public enum Button {
+ /**
+ * Starts the stage with {@link Stage#start()}.
+ */
+ START,
+ /**
+ * Suspends execution using {@link DebugUtils#debugSuspend()}, if a debugger is attached.
+ */
+ PAUSE,
+ /**
+ * Stops the stage with {@link Stage#stop()}.
+ */
+ STOP
+ }
+
+ /**
+ * Represents a stage's corner to anchor a control panel to.
+ */
+ public enum Corner {
+ TOP_LEFT {
+ @Override
+ double getX(Stage stage, int buttonCount) {
+ return 0;
+ }
+
+ @Override
+ double getY(Stage stage) {
+ return 0;
+ }
+ },
+ TOP_RIGHT {
+ @Override
+ double getX(Stage stage, int buttonCount) {
+ return stage.getWidth() - WIDTH_PER_BUTTON * buttonCount;
+ }
+
+ @Override
+ double getY(Stage stage) {
+ return 0;
+ }
+ },
+ BOTTOM_LEFT {
+ @Override
+ double getX(Stage stage, int buttonCount) {
+ return 0;
+ }
+
+ @Override
+ double getY(Stage stage) {
+ return stage.getHeight() - HEIGHT;
+ }
+ },
+ BOTTOM_RIGHT {
+ @Override
+ double getX(Stage stage, int buttonCount) {
+ return stage.getWidth() - WIDTH_PER_BUTTON * buttonCount;
+ }
+
+ @Override
+ double getY(Stage stage) {
+ return stage.getHeight() - HEIGHT;
+ }
+ };
+
+ abstract double getX(Stage stage, int buttonCount);
+
+ abstract double getY(Stage stage);
+ }
+
+ /**
+ * Enables the given control button in this panel.
+ * @throws NullPointerException if the button is {@code null}
+ */
+ public void enableButton(Button button) {
+ cachedHB = null;
+ visibleButtons.add(button);
+ }
+
+ /**
+ * Disables the given control button in this panel.
+ */
+ public void disableButton(Button button) {
+ cachedHB = null;
+ visibleButtons.remove(button);
+ }
+
+ private void clicked(MouseEvent.MouseClickedEvent event) {
+ if (visible
+ && event.stage() == stage
+ && GraphicsUtils.getTargetObject(event) instanceof RenderableID.OtherID(String thatId)
+ && id.equals(thatId)
+ ) {
+ double relativeClickX = event.x() - corner.getX(stage, visibleButtons.size());
+ double relativeClickY = event.y() - corner.getY(stage);
+ if (relativeClickY >= 0 && relativeClickY < HEIGHT && relativeClickX >= 0 && relativeClickX < WIDTH_PER_BUTTON * visibleButtons.size()) {
+ switch (visibleButtons.size()) {
+ case 1 -> buttonClicked(visibleButtons.iterator().next());
+ case 2 ->
+ // If relativeClickX < WIDTH_PER_BUTTON then it's the first button, otherwise the second
+ buttonClicked(
+ visibleButtons.stream()
+ .min(relativeClickX < WIDTH_PER_BUTTON ? Comparator.naturalOrder() : Comparator.reverseOrder())
+ .orElseThrow()
+ );
+ case 3 -> {
+ // There are only 3 buttons, so order is known
+ if (relativeClickX < WIDTH_PER_BUTTON) {
+ stage.start();
+ } else if (relativeClickX < WIDTH_PER_BUTTON * 2) {
+ DebugUtils.debugSuspend();
+ } else {
+ stage.stop();
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private void buttonClicked(Button button) {
+ switch (button) {
+ case START -> stage.start();
+ case PAUSE -> DebugUtils.debugSuspend();
+ case STOP -> stage.stop();
+ }
+ }
+
+
+ @Override
+ public double getRotation(RenderingContext ctx) {
+ return 0;
+ }
+
+ @Override
+ public Hitbox2D getBounds(RenderingContext ctx) {
+ if (cachedHB == null) {
+ double width = WIDTH_PER_BUTTON * visibleButtons.size();
+ cachedHB = width == 0
+ ? Hitbox2D.never()
+ : Hitbox2D.shape(new Rectangle2D.Double(0, 0, width, HEIGHT));
+ }
+ return cachedHB;
+ }
+
+ @Override
+ public double getScreenScaleX(RenderingContext ctx) {
+ return 1;
+ }
+
+ @Override
+ public double getScreenScaleY(RenderingContext ctx) {
+ return 1;
+ }
+
+ @Override
+ public double getScreenX(RenderingContext ctx) {
+ return corner.getX(stage, visibleButtons.size());
+ }
+
+ @Override
+ public double getScreenY(RenderingContext ctx) {
+ return corner.getY(stage);
+ }
+
+ @Override
+ public void render(RenderCanvas canvas) {
+ if (!visibleButtons.isEmpty()) {
+ canvas.save();
+ Point2D dim = canvas.getDimensions();
+ canvas.setStrokeARGB(0x80_00_00_00);
+ canvas.setFillARGB(0x80_00_00_00);
+ canvas.setLineWidth(1);
+ canvas.fillRect(0, 0, dim.x(), dim.y());
+ double currentX = MARGIN_X;
+ if (visibleButtons.contains(Button.START)) {
+ canvas.drawImage(getStartButton(), currentX, MARGIN_Y, BUTTON_WIDTH, BUTTON_HEIGHT);
+ currentX += WIDTH_PER_BUTTON;
+ }
+ if (visibleButtons.contains(Button.PAUSE)) {
+ canvas.drawImage(getPauseButton(), currentX, MARGIN_Y, BUTTON_WIDTH, BUTTON_HEIGHT);
+ currentX += WIDTH_PER_BUTTON;
+ }
+ if (visibleButtons.contains(Button.STOP)) {
+ canvas.drawImage(getStopButton(), currentX, MARGIN_Y, BUTTON_WIDTH, BUTTON_HEIGHT);
+ }
+ canvas.restore();
+ }
+ }
+
+ @Override
+ public Point2D getPreferredCanvasSize(RenderingContext ctx) {
+ return new Point2D(WIDTH_PER_BUTTON * visibleButtons.size(), HEIGHT);
+ }
+
+
+ private Image getStartButton() {
+ if (start == null) {
+ GraphicsManager graphics = stage.getContext().get(GraphicsManager.class);
+ start = graphics.hasLoadedImage(START_IMG)
+ ? graphics.getLoadedImage(START_IMG)
+ : graphics.loadImage(START_IMG, false);
+ }
+ return start;
+ }
+
+ private Image getPauseButton() {
+ if (pause == null) {
+ GraphicsManager graphics = stage.getContext().get(GraphicsManager.class);
+ if (Constants.RANDOM.nextFloat() < 0.02f) {
+ Path nothingToSeeHerePleaseKeepGoing = ROOT.resolve("assets/textures/control_buttons/test.svg");
+ pause = graphics.hasLoadedImage(nothingToSeeHerePleaseKeepGoing)
+ ? graphics.getLoadedImage(nothingToSeeHerePleaseKeepGoing)
+ : graphics.loadImage(nothingToSeeHerePleaseKeepGoing, false);
+ } else {
+ pause = graphics.hasLoadedImage(PAUSE_IMG)
+ ? graphics.getLoadedImage(PAUSE_IMG)
+ : graphics.loadImage(PAUSE_IMG, false);
+ }
+ }
+ return pause;
+ }
+
+ private Image getStopButton() {
+ if (stop == null) {
+ GraphicsManager graphics = stage.getContext().get(GraphicsManager.class);
+ stop = graphics.hasLoadedImage(STOP_IMG)
+ ? graphics.getLoadedImage(STOP_IMG)
+ : graphics.loadImage(STOP_IMG, false);
+ }
+ return stop;
+ }
+}
diff --git a/src/main/java/ru/fokinatorr/sparkle/stage/RenderableID.java b/src/main/java/net/fokinatorr/sparkle/stage/RenderableID.java
similarity index 92%
rename from src/main/java/ru/fokinatorr/sparkle/stage/RenderableID.java
rename to src/main/java/net/fokinatorr/sparkle/stage/RenderableID.java
index b77f4a9..cdb1efd 100644
--- a/src/main/java/ru/fokinatorr/sparkle/stage/RenderableID.java
+++ b/src/main/java/net/fokinatorr/sparkle/stage/RenderableID.java
@@ -1,6 +1,6 @@
-package ru.fokinatorr.sparkle.stage;
+package net.fokinatorr.sparkle.stage;
-import ru.fokinatorr.sparkle.stage.sprite.Sprite;
+import net.fokinatorr.sparkle.stage.sprite.Sprite;
/**
* Represents an ID of a renderable object on a stage.
diff --git a/src/main/java/ru/fokinatorr/sparkle/stage/Stage.java b/src/main/java/net/fokinatorr/sparkle/stage/Stage.java
similarity index 85%
rename from src/main/java/ru/fokinatorr/sparkle/stage/Stage.java
rename to src/main/java/net/fokinatorr/sparkle/stage/Stage.java
index 6160144..b6934ba 100644
--- a/src/main/java/ru/fokinatorr/sparkle/stage/Stage.java
+++ b/src/main/java/net/fokinatorr/sparkle/stage/Stage.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.stage;
+package net.fokinatorr.sparkle.stage;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectMaps;
@@ -6,31 +6,38 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
+import lombok.Setter;
import lombok.experimental.FieldDefaults;
import lombok.experimental.NonFinal;
import lombok.extern.slf4j.Slf4j;
-import ru.fokinatorr.sparkle.assets.Assets;
-import ru.fokinatorr.sparkle.audio.SoundInstance;
-import ru.fokinatorr.sparkle.context.AppContext;
-import ru.fokinatorr.sparkle.context.AppContextHolder;
-import ru.fokinatorr.sparkle.event.BackdropChangeEvent;
-import ru.fokinatorr.sparkle.event.lifecycle.StageStateChangeEvent;
-import ru.fokinatorr.sparkle.event.lifecycle.StageStateChangeEvent.StartEvent;
-import ru.fokinatorr.sparkle.event.dispatcher.EventDispatcher;
-import ru.fokinatorr.sparkle.event.lifecycle.TickEvent;
-import ru.fokinatorr.sparkle.graphics.GraphicsManager;
-import ru.fokinatorr.sparkle.graphics.GraphicsUtils;
-import ru.fokinatorr.sparkle.graphics.image.Image;
-import ru.fokinatorr.sparkle.graphics.render.RenderCanvas;
-import ru.fokinatorr.sparkle.graphics.render.renderer.RendererRegistry;
-import ru.fokinatorr.sparkle.internal.access.*;
-import ru.fokinatorr.sparkle.stage.RenderableID.OtherID;
-import ru.fokinatorr.sparkle.stage.RenderableID.SpriteID;
-import ru.fokinatorr.sparkle.stage.sprite.Sprite;
-import ru.fokinatorr.sparkle.util.*;
-import ru.fokinatorr.sparkle.variable.AbstractVariableStorage;
-import ru.fokinatorr.sparkle.variable.Variable;
+import net.fokinatorr.sparkle.assets.Assets;
+import net.fokinatorr.sparkle.audio.AudioManager;
+import net.fokinatorr.sparkle.audio.SoundInstance;
+import net.fokinatorr.sparkle.context.AppContext;
+import net.fokinatorr.sparkle.context.AppContextHolder;
+import net.fokinatorr.sparkle.event.BackdropChangeEvent;
+import net.fokinatorr.sparkle.event.lifecycle.StageStateChangeEvent;
+import net.fokinatorr.sparkle.event.lifecycle.StageStateChangeEvent.StartEvent;
+import net.fokinatorr.sparkle.event.dispatcher.EventDispatcher;
+import net.fokinatorr.sparkle.event.lifecycle.TickEvent;
+import net.fokinatorr.sparkle.graphics.GraphicsManager;
+import net.fokinatorr.sparkle.util.GraphicsUtils;
+import net.fokinatorr.sparkle.graphics.image.Image;
+import net.fokinatorr.sparkle.graphics.render.RenderCanvas;
+import net.fokinatorr.sparkle.graphics.render.RenderingContext;
+import net.fokinatorr.sparkle.graphics.render.renderer.RendererRegistry;
+import net.fokinatorr.sparkle.internal.access.EventLifecycleAccess;
+import net.fokinatorr.sparkle.internal.access.SharedSecrets;
+import net.fokinatorr.sparkle.internal.access.SpriteAccess;
+import net.fokinatorr.sparkle.internal.access.StageAccess;
+import net.fokinatorr.sparkle.util.*;
+import net.fokinatorr.sparkle.stage.RenderableID.OtherID;
+import net.fokinatorr.sparkle.stage.RenderableID.SpriteID;
+import net.fokinatorr.sparkle.stage.sprite.Sprite;
+import net.fokinatorr.sparkle.variable.AbstractVariableStorage;
+import net.fokinatorr.sparkle.variable.Variable;
+import java.io.IOException;
import java.nio.file.Path;
import java.util.*;
import java.util.concurrent.*;
@@ -40,12 +47,13 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import static ru.fokinatorr.sparkle.graphics.render.RenderCanvas.ORIGINAL_SIZE;
-import static ru.fokinatorr.sparkle.util.Constants.MILLIS_PER_SECOND;
-import static ru.fokinatorr.sparkle.util.Constants.NANOS_PER_MILLISECOND;
+import static net.fokinatorr.sparkle.graphics.render.RenderCanvas.ORIGINAL_SIZE;
+import static net.fokinatorr.sparkle.util.Constants.MILLIS_PER_SECOND;
+import static net.fokinatorr.sparkle.util.Constants.NANOS_PER_MILLISECOND;
+import static net.fokinatorr.sparkle.util.WaitUtils.*;
/**
- * A stage, containing {@link Sprite sprites}, arbitrary renderable objects and background.
+ * A stage, containing backdrop, {@link Sprite sprites} and other renderable objects.
* Note for Scratchers: The default stage size, unlike in Scratch, is 640x360 (16:9 ratio)
* and not 480x360 (4:3 ratio). The default framerate limit is also different, being {@code 60} instead of {@code 30}.
*/
@@ -72,8 +80,12 @@ public class Stage extends AbstractVariableStorage {
}
@Override
- public AppContext getContext(Stage stage) {
- return stage.context;
+ public void setRenderContext(Stage stage, RenderingContext renderContext) {
+ if (stage.renderContext != null) {
+ throw new IllegalStateException("Parent render context already initialized");
+ }
+ stage.renderContext = renderContext;
+ stage.sprites.values().forEach(m -> m.values().forEach(spriteAcc::onRenderContextInitialized));
}
});
}
@@ -89,11 +101,20 @@ public class Stage extends AbstractVariableStorage {
/**
* The application context.
*/
+ @Getter
AppContext context;
+ /**
+ * The parent rendering context.
+ */
+ @Getter
+ @NonFinal // changed only once when it's created
+ RenderingContext renderContext;
/**
* A unique ID of this stage, for debug & exception messages.
*/
@Getter
+ @NonFinal
+ @Setter(AccessLevel.PACKAGE)
String id = GUID.generate();
// Maps sprite IDs to the main sprite and its clones.
// element with key 0 always represents the main sprite
@@ -107,9 +128,6 @@ public class Stage extends AbstractVariableStorage {
AtomicInteger backdropIndex = new AtomicInteger();
AtomicReference state = new AtomicReference<>(State.NEW);
- EnumSet visibleButtons = DebugUtils.isDebuggerAttached()
- ? EnumSet.allOf(ControlButton.class)
- : EnumSet.of(ControlButton.START, ControlButton.STOP);
AtomicInteger width = new AtomicInteger(640);
AtomicInteger height = new AtomicInteger(360);
@@ -121,7 +139,7 @@ public class Stage extends AbstractVariableStorage {
Lock renderablesLock = new ReentrantLock();
Int2ObjectMap loadedBackdrops = Int2ObjectMaps.synchronize(new Int2ObjectOpenHashMap<>());
- Int2ObjectMap> loadedSounds = Int2ObjectMaps.synchronize(new Int2ObjectOpenHashMap<>());
+ Int2ObjectMap loadedSounds = Int2ObjectMaps.synchronize(new Int2ObjectOpenHashMap<>());
/* *********************
* *
@@ -538,7 +556,7 @@ public class Stage extends AbstractVariableStorage {
if (newHeight <= 0) {
throw new IllegalArgumentException("height is non-positive: " + newHeight);
}
- width.set(newHeight);
+ width.set(newWidth);
height.set(newHeight);
}
@@ -634,10 +652,11 @@ public class Stage extends AbstractVariableStorage {
}
/**
- * Fires the start event on this stage. Doesn't do anything if the stage is already running or stopping. Returns immediately.
+ * Fires the start event on this stage, then, after its dispatch completes,
+ * starts the stage's loop thread. Doesn't do anything if the stage is already running or stopping. Returns immediately.
*
- * @return a {@link CompletableFuture} that completes when the {@link StartEvent} was dispatched by every listener and the
- * stage stopped afterward.
+ * @return a {@link CompletableFuture} that completes when the {@link StartEvent} was dispatched by every listener
+ * and the loop thread was started.
*/
public CompletableFuture start() {
State current = state.get();
@@ -657,9 +676,11 @@ public class Stage extends AbstractVariableStorage {
Thread loopThread;
/**
- * Fires the stop event on this stage. Returns immediately.
+ * Fires the stop event on this stage, then, after its dispatch completes,
+ * stops the stage's loop thread. Returns immediately.
*
- * @return a {@link CompletableFuture} that completes when the {@link StageStateChangeEvent.StopEvent} was dispatched by every listener.
+ * @return a {@link CompletableFuture} that completes when the {@link StageStateChangeEvent.StopEvent} was dispatched by every listener
+ * and the loop thread was stopped.
*/
public CompletableFuture stop() {
State current = state.get();
@@ -676,45 +697,13 @@ public class Stage extends AbstractVariableStorage {
} finally {
loopThread = null;
state.set(State.STOPPED);
- log.debug("[Stage id={}] Stopped.", id);
+ log.trace("[Stage id={}] Stopped.", id);
}
});
}
return CompletableFuture.completedFuture(null);
}
- /* *********************
- * *
- * Visible buttons *
- * *
- ***********************/
-
- /**
- * Represents a button controlling state of a stage.
- */
- public enum ControlButton {
- /**
- * Starts the stage with {@link #start()}.
- */
- START,
- /**
- * Suspends execution using {@link DebugUtils#debugSuspend()}, if a debugger is attached.
- */
- PAUSE,
- /**
- * Stops the stage with {@link #stop()}.
- */
- STOP
- }
-
- /**
- * Returns a mutable set containing currently enabled control buttons. The set does not permit {@code null} values.
- * @return the visible control buttons set
- */
- public Set getVisibleButtons() {
- return visibleButtons;
- }
-
/* *********************
* *
* Backdrops, sounds *
@@ -760,6 +749,22 @@ public class Stage extends AbstractVariableStorage {
}
}
+ /**
+ * Increments the backdrop index, wrapping around if necessary.
+ */
+ public void incrementBackdrop() {
+ int size = assets.texturesByIndex().size();
+ backdropIndex.getAndUpdate(index -> (index + 1) % size);
+ }
+
+ /**
+ * Decrements the backdrop index, wrapping around if necessary.
+ */
+ public void decrementBackdrop() {
+ int size = assets.texturesByIndex().size();
+ backdropIndex.getAndUpdate(index -> (index - 1 + size) % size);
+ }
+
/**
* Sets the backdrop name to the given one. This action is not guaranteed to be done since event listeners
* can cancel the event. This method does not wait for the event to be processed by listeners.
@@ -813,7 +818,49 @@ public class Stage extends AbstractVariableStorage {
canvas.restore();
}
- // TODO sounds
+ /**
+ * Starts playing a sound with the given name.
+ *
+ * @param soundName the sound name
+ * @return the control ID of the sound. Can be used to stop the sound or change its effects.
+ * @throws IndexOutOfBoundsException if there is no sound with the given name in assets.
+ */
+ public String startSound(String soundName) {
+ return startSound(soundName, false);
+ }
+
+ /**
+ * Starts playing a sound with the given name.
+ *
+ * @param soundName the sound name
+ * @param waitForDone whether to wait until the sound finished playing. If set to {@code true}, the return value
+ * is essentially useless.
+ * @return the control ID of the sound. Can be used to stop the sound or change its effects.
+ * @throws IndexOutOfBoundsException if there is no sound with the given name in assets.
+ */
+ public String startSound(String soundName, boolean waitForDone) {
+ AudioManager audioManager = context.get(AudioManager.class);
+ String soundId = loadedSounds.computeIfAbsent(
+ assets.soundsIndexesByName().getInt(soundName),
+ index -> {
+ Path location = assets.soundsByIndex().get(index).location();
+ if (!audioManager.hasLoadedSound(location)) {
+ try {
+ audioManager.loadSound(location);
+ } catch (IOException e) {
+ log.error("Failed to load sound: {}", location, e);
+ }
+ }
+ return audioManager.createStaticSoundInstance(location).left();
+ }
+ );
+ SoundInstance> sound = audioManager.getSoundInstance(soundId);
+ sound.play();
+ if (waitForDone) {
+ waitUntil(() -> sound.getState() == SoundInstance.State.STOPPED);
+ }
+ return soundId;
+ }
/* ********************
* *
diff --git a/src/main/java/ru/fokinatorr/sparkle/stage/StageCreator.java b/src/main/java/net/fokinatorr/sparkle/stage/StageCreator.java
similarity index 77%
rename from src/main/java/ru/fokinatorr/sparkle/stage/StageCreator.java
rename to src/main/java/net/fokinatorr/sparkle/stage/StageCreator.java
index 438fe14..b106f3d 100644
--- a/src/main/java/ru/fokinatorr/sparkle/stage/StageCreator.java
+++ b/src/main/java/net/fokinatorr/sparkle/stage/StageCreator.java
@@ -1,11 +1,8 @@
-package ru.fokinatorr.sparkle.stage;
+package net.fokinatorr.sparkle.stage;
-import ru.fokinatorr.sparkle.assets.Assets;
-import ru.fokinatorr.sparkle.event.input.Key;
-import ru.fokinatorr.sparkle.graphics.render.RenderingContext;
-import ru.fokinatorr.sparkle.stage.sprite.Sprite;
-
-import ru.fokinatorr.sparkle.event.input.KeyboardEvent;
+import net.fokinatorr.sparkle.assets.Assets;
+import net.fokinatorr.sparkle.graphics.render.RenderingContext;
+import net.fokinatorr.sparkle.stage.sprite.Sprite;
/**
* A factory interface for controlled creation and customization of {@link Stage} instances.
@@ -31,41 +28,32 @@ import ru.fokinatorr.sparkle.event.input.KeyboardEvent;
* Example usage
* {@code
* public class MyGameStage implements StageCreator {
- * private final Assets assets;
*
- * public MyGameStage(Assets assets) {
- * this.assets = assets;
- * }
+ * private static final Assets STAGE_ASSETS = ...;
+ * private static final Assets PLAYER_ASSETS = ...;
+ * // ...
*
* @Override
* public Assets getStageAssets() {
- * return assets;
+ * return STAGE_ASSETS;
* }
*
- * private static final Assets PLAYER_ASSETS = ...;
- *
* @Override
* public void customize(Stage stage) {
+ * stage.setBackdrop("sky_blue");
+ *
* Sprite player = new Sprite(PLAYER_ASSETS);
* player.setCostume("idle");
* stage.registerSprite("player", player);
*
- * stage.setBackdrop("sky_blue");
- * Global.when(KeyboardEvent.KeyPressedEvent.class, e -> {
- * if (e.stage() == stage && e.key() == Key.SPACE) {
- * player.jump();
- * }
- * });
* // ...
* }
* }
* }
*
* @see RenderingContext#getStage()
- * @see KeyboardEvent.KeyPressedEvent
* @see Stage
* @see Sprite
- * @see Key
*/
public interface StageCreator {
diff --git a/src/main/java/ru/fokinatorr/sparkle/stage/sprite/BubbleState.java b/src/main/java/net/fokinatorr/sparkle/stage/sprite/BubbleState.java
similarity index 95%
rename from src/main/java/ru/fokinatorr/sparkle/stage/sprite/BubbleState.java
rename to src/main/java/net/fokinatorr/sparkle/stage/sprite/BubbleState.java
index 09c9c78..1fe9ab1 100644
--- a/src/main/java/ru/fokinatorr/sparkle/stage/sprite/BubbleState.java
+++ b/src/main/java/net/fokinatorr/sparkle/stage/sprite/BubbleState.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.stage.sprite;
+package net.fokinatorr.sparkle.stage.sprite;
import lombok.*;
import lombok.experimental.FieldDefaults;
diff --git a/src/main/java/net/fokinatorr/sparkle/stage/sprite/PixelContourCreator.java b/src/main/java/net/fokinatorr/sparkle/stage/sprite/PixelContourCreator.java
new file mode 100644
index 0000000..faa3807
--- /dev/null
+++ b/src/main/java/net/fokinatorr/sparkle/stage/sprite/PixelContourCreator.java
@@ -0,0 +1,95 @@
+package net.fokinatorr.sparkle.stage.sprite;
+
+import lombok.experimental.UtilityClass;
+import net.fokinatorr.sparkle.graphics.ARGB;
+import net.fokinatorr.sparkle.graphics.PixelReader;
+import net.fokinatorr.sparkle.phys2d.Point2D;
+
+import java.awt.Shape;
+import java.awt.geom.Path2D;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Outlines a {@link PixelReader}'s contents with a {@link java.awt.Shape}.
+ */
+@UtilityClass
+class PixelContourCreator {
+
+ /**
+ * Offsets from a point to its neighbors.
+ */
+ private static final int[]
+ dx = {-1, 0, 1, -1, 1, -1, 0, 1},
+ dy = {-1, -1, -1, 0, 0, 1, 1, 1};
+
+ /**
+ * Outlines the given image's contents with a {@link Shape} instance.
+ * @param reader the pixel source
+ */
+ public Shape createEdgeContour(PixelReader reader) {
+ Set allPixels = collectOpaquePixels(reader);
+ if (allPixels.isEmpty()) return new Path2D.Double();
+ Set edgePixels = filterEdgePixels(allPixels);
+
+ return createPathFromPoints(edgePixels);
+ }
+
+ private Set filterEdgePixels(Set allPixels) {
+ Set result = new HashSet<>();
+ for (Point2D pixel : allPixels) {
+ if (isNotInteriorPixel(allPixels, pixel)) {
+ result.add(pixel);
+ }
+ }
+ return result;
+ }
+
+ private Set collectOpaquePixels(PixelReader reader) {
+ Set result = new HashSet<>();
+ for (int x = 0; x < reader.getWidth(); x++) {
+ for (int y = 0; y < reader.getHeight(); y++) {
+ int color = reader.getARGB(x, y);
+ if (ARGB.alpha(color) != 0) {
+ result.add(new Point2D(x, y));
+ }
+ }
+ }
+ return result;
+ }
+
+ private boolean isNotInteriorPixel(Set allPixels, Point2D pixel) {
+ for (int i = 0; i < 8; i++) {
+ if (!allPixels.contains(pixel.translate(dx[i], dy[i]))) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private Shape createPathFromPoints(Set edgePixels) {
+ if (edgePixels.isEmpty()) return new Path2D.Double();
+
+ Point2D sum = edgePixels.stream().reduce(Point2D.ZERO, Point2D::translate);
+ Point2D center = new Point2D(sum.x() / edgePixels.size(), sum.y() / edgePixels.size());
+ List sorted = new ArrayList<>(edgePixels);
+
+ sorted.sort((p1, p2) -> {
+ double angle1 = Math.atan2(p1.y() - center.y(), p1.x() - center.x());
+ double angle2 = Math.atan2(p2.y() - center.y(), p2.x() - center.x());
+ return Double.compare(angle1, angle2);
+ });
+
+ Path2D.Double path = new Path2D.Double();
+ path.moveTo(sorted.getFirst().x(), sorted.getFirst().y());
+
+ for (int i = 1; i < sorted.size(); i++) {
+ path.lineTo(sorted.get(i).x(), sorted.get(i).y());
+ }
+ path.closePath();
+
+ return path;
+ }
+}
diff --git a/src/main/java/ru/fokinatorr/sparkle/stage/sprite/Sprite.java b/src/main/java/net/fokinatorr/sparkle/stage/sprite/Sprite.java
similarity index 79%
rename from src/main/java/ru/fokinatorr/sparkle/stage/sprite/Sprite.java
rename to src/main/java/net/fokinatorr/sparkle/stage/sprite/Sprite.java
index 2278c4f..e1f1031 100644
--- a/src/main/java/ru/fokinatorr/sparkle/stage/sprite/Sprite.java
+++ b/src/main/java/net/fokinatorr/sparkle/stage/sprite/Sprite.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.stage.sprite;
+package net.fokinatorr.sparkle.stage.sprite;
import it.unimi.dsi.fastutil.Pair;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
@@ -9,42 +9,43 @@ import lombok.AccessLevel;
import lombok.NonNull;
import lombok.experimental.FieldDefaults;
import lombok.experimental.PackagePrivate;
-import ru.fokinatorr.sparkle.assets.Assets;
-import ru.fokinatorr.sparkle.audio.AudioManager;
-import ru.fokinatorr.sparkle.audio.SoundInstance;
-import ru.fokinatorr.sparkle.context.AppContext;
-import ru.fokinatorr.sparkle.effect.graphics.GraphicEffectMap;
-import ru.fokinatorr.sparkle.effect.sounds.SoundEffectMap;
-import ru.fokinatorr.sparkle.event.dispatcher.EventDispatcher;
-import ru.fokinatorr.sparkle.graphics.GraphicsManager;
-import ru.fokinatorr.sparkle.graphics.GraphicsUtils;
-import ru.fokinatorr.sparkle.graphics.PixelReader;
-import ru.fokinatorr.sparkle.graphics.image.Image;
-import ru.fokinatorr.sparkle.graphics.image.RasterImage;
-import ru.fokinatorr.sparkle.graphics.image.SVGImage;
-import ru.fokinatorr.sparkle.graphics.render.RenderCanvas;
-import ru.fokinatorr.sparkle.graphics.render.renderer.Renderable2D;
-import ru.fokinatorr.sparkle.graphics.vector.SVGVector;
-import ru.fokinatorr.sparkle.internal.access.SharedSecrets;
-import ru.fokinatorr.sparkle.internal.access.SpriteAccess;
-import ru.fokinatorr.sparkle.internal.access.StageAccess;
-import ru.fokinatorr.sparkle.phys2d.Hitbox2D;
-import ru.fokinatorr.sparkle.phys2d.Point2D;
-import ru.fokinatorr.sparkle.stage.RenderableID;
-import ru.fokinatorr.sparkle.stage.Stage;
-import ru.fokinatorr.sparkle.util.WaitUtils;
-import ru.fokinatorr.sparkle.util.GUID;
-import ru.fokinatorr.sparkle.util.Mth;
-import ru.fokinatorr.sparkle.util.concurrent.atomic.AtomicDouble;
-import ru.fokinatorr.sparkle.util.stopwatch.InstantStopwatch;
-import ru.fokinatorr.sparkle.util.stopwatch.Stopwatch;
-import ru.fokinatorr.sparkle.variable.AbstractVariableStorage;
-import ru.fokinatorr.sparkle.variable.Variable;
+import lombok.extern.slf4j.Slf4j;
+import net.fokinatorr.sparkle.assets.Assets;
+import net.fokinatorr.sparkle.audio.AudioManager;
+import net.fokinatorr.sparkle.audio.SoundInstance;
+import net.fokinatorr.sparkle.effect.graphics.GraphicEffectMap;
+import net.fokinatorr.sparkle.effect.sounds.SoundEffectMap;
+import net.fokinatorr.sparkle.event.dispatcher.EventDispatcher;
+import net.fokinatorr.sparkle.graphics.GraphicsManager;
+import net.fokinatorr.sparkle.graphics.render.renderer.PhysicalRenderable2D;
+import net.fokinatorr.sparkle.util.GraphicsUtils;
+import net.fokinatorr.sparkle.graphics.image.RasterImage;
+import net.fokinatorr.sparkle.graphics.image.VectorImage;
+import net.fokinatorr.sparkle.graphics.render.RenderingContext;
+import net.fokinatorr.sparkle.phys.RotationMode;
+import net.fokinatorr.sparkle.graphics.image.Image;
+import net.fokinatorr.sparkle.graphics.render.RenderCanvas;
+import net.fokinatorr.sparkle.graphics.render.renderer.Renderable2D;
+import net.fokinatorr.sparkle.internal.access.SharedSecrets;
+import net.fokinatorr.sparkle.internal.access.SpriteAccess;
+import net.fokinatorr.sparkle.internal.access.StageAccess;
+import net.fokinatorr.sparkle.phys2d.Hitbox2D;
+import net.fokinatorr.sparkle.phys2d.Point2D;
+import net.fokinatorr.sparkle.stage.RenderableID;
+import net.fokinatorr.sparkle.stage.Stage;
+import net.fokinatorr.sparkle.util.WaitUtils;
+import net.fokinatorr.sparkle.util.GUID;
+import net.fokinatorr.sparkle.util.concurrent.atomic.AtomicDouble;
+import net.fokinatorr.sparkle.util.stopwatch.InstantStopwatch;
+import net.fokinatorr.sparkle.util.stopwatch.Stopwatch;
+import net.fokinatorr.sparkle.variable.AbstractVariableStorage;
+import net.fokinatorr.sparkle.variable.Variable;
-import java.awt.*;
-import java.awt.geom.Rectangle2D;
+import java.awt.geom.AffineTransform;
+import java.io.IOException;
import java.io.Serial;
import java.io.Serializable;
+import java.io.UncheckedIOException;
import java.nio.file.Path;
import java.util.*;
import java.util.List;
@@ -53,8 +54,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
-import static ru.fokinatorr.sparkle.graphics.render.RenderCanvas.ORIGINAL_SIZE;
-import static ru.fokinatorr.sparkle.util.WaitUtils.*;
+import static net.fokinatorr.sparkle.graphics.render.RenderCanvas.ORIGINAL_SIZE;
+import static net.fokinatorr.sparkle.util.WaitUtils.*;
/**
* A general-purpose {@link Renderable2D 2D renderable} with Scratch-like API.
@@ -67,8 +68,9 @@ import static ru.fokinatorr.sparkle.util.WaitUtils.*;
* So, to access the current backdrop, you should use {@link Stage#getBackdropIndex()} or {@link Stage#getBackdropName()}
* on a {@code Stage} instance.
*/
+@Slf4j
@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-public class Sprite extends AbstractVariableStorage implements Serializable, Renderable2D {
+public class Sprite extends AbstractVariableStorage implements Serializable, PhysicalRenderable2D {
static {
SharedSecrets.setSpriteAccess(new SpriteAccess() {
@@ -81,28 +83,29 @@ public class Sprite extends AbstractVariableStorage implements Serializa
@Override
public void attach(Sprite sprite, Stage toStage, String spriteId, int cloneId) {
sprite.parentStage.set(new ReferenceObjectImmutablePair<>(toStage, new RenderableID.SpriteID(spriteId, cloneId)));
+ if (toStage.getRenderContext() != null) onRenderContextInitialized(sprite); // re-evaluate on resize
+ }
+
+ @Override
+ public void onRenderContextInitialized(Sprite sprite) {
+ sprite.parentStage.get().left().getRenderContext().onResize((_, _, _) -> sprite.loadedCostumes.clear());
}
@Override
public void detach(Sprite sprite) {
sprite.parentStage.set(null);
- }
-
- @Override
- public Sprite newSprite(Assets assets, GraphicEffectMap graphicEffects, SoundEffectMap soundEffects) {
- return new Sprite(assets, graphicEffects, soundEffects);
+ sprite.loadedCostumes.clear();
}
});
}
@Serial
private static final long serialVersionUID = -7283596994843063991L;
- private static final StageAccess stageAcc = SharedSecrets.getStageAccess();
AtomicDouble x = new AtomicDouble();
AtomicDouble y = new AtomicDouble();
AtomicDouble direction = new AtomicDouble(90);
- AtomicReference rotationStyle = new AtomicReference<>(RotationStyle.ALL_AROUND);
+ AtomicReference rotationMode = new AtomicReference<>(RotationMode.ALL_AROUND);
AtomicDouble stretchX = new AtomicDouble(100);
AtomicDouble stretchY = new AtomicDouble(100);
AtomicReference bubbleState = new AtomicReference<>(BubbleState.EMPTY);
@@ -115,7 +118,7 @@ public class Sprite extends AbstractVariableStorage implements Serializa
@PackagePrivate
final AtomicReference> parentStage = new AtomicReference<>();
- final Int2ObjectMap loadedCostumes = Int2ObjectMaps.synchronize(new Int2ObjectOpenHashMap<>());
+ final Int2ObjectMap loadedCostumes = Int2ObjectMaps.synchronize(new Int2ObjectOpenHashMap<>());
final Int2ObjectMap loadedSounds = Int2ObjectMaps.synchronize(new Int2ObjectOpenHashMap<>());
@@ -131,7 +134,7 @@ public class Sprite extends AbstractVariableStorage implements Serializa
}
/**
- * Internal constructor which is also used in {@link #copy()} method.
+ * Internal constructor which is used in the {@link #copy()} method.
*/
Sprite(Assets assets, GraphicEffectMap graphicEffectMap, SoundEffectMap soundEffectMap) {
this.assets = assets;
@@ -149,7 +152,7 @@ public class Sprite extends AbstractVariableStorage implements Serializa
copy.x.set(x.get());
copy.y.set(y.get());
copy.direction.set(direction.get());
- copy.rotationStyle.set(rotationStyle.get());
+ copy.rotationMode.set(rotationMode.get());
copy.stretchX.set(stretchX.get());
copy.stretchY.set(stretchY.get());
copy.bubbleState.set(bubbleState.get());
@@ -182,7 +185,7 @@ public class Sprite extends AbstractVariableStorage implements Serializa
public void rotateRight(double degrees) {
while (true) {
double currentDir = direction.get();
- double newDir = Mth.wrapClamp(currentDir + degrees, -180, 180);
+ double newDir = (currentDir + degrees) % 360;
if (direction.compareAndSet(currentDir, newDir)) {
break;
}
@@ -274,7 +277,7 @@ public class Sprite extends AbstractVariableStorage implements Serializa
* @param dir the new direction
*/
public void setDirection(double dir) {
- direction.set(Mth.wrapClamp(dir, -180, 180));
+ direction.set(dir % 360);
}
/**
@@ -343,12 +346,7 @@ public class Sprite extends AbstractVariableStorage implements Serializa
* @see Stage#registerSprite(String, Sprite)
*/
public void bounce() {
- var parentProps = parentStage.get();
- if (parentProps == null) {
- throw new IllegalStateException("No registered in a stage");
- }
-
- Stage parent = parentProps.left();
+ Stage parent = getParentStage();
int width = parent.getWidth(), height = parent.getHeight();
double dir = Math.toRadians(90 - getDirection());
double dx = Math.cos(dir), dy = -Math.sin(dir); // negative dy to point away
@@ -388,26 +386,29 @@ public class Sprite extends AbstractVariableStorage implements Serializa
}
/**
- * Updates the rotation style to the given value.
+ * Updates the rotation mode to the given value.
*
- * @param newStyle the new rotation style
+ * @param newMode the new rotation mode
* @throws NullPointerException if the given value is {@code null}
*/
- public void setRotationStyle(RotationStyle newStyle) {
- Objects.requireNonNull(newStyle, "The given rotation style is null");
- rotationStyle.set(newStyle);
+ public void setRotationMode(RotationMode newMode) {
+ Objects.requireNonNull(newMode, "The given rotation mode is null");
+ rotationMode.set(newMode);
}
/**
- * {@return the current rotation style}
+ * {@return the current rotation mode}
*/
- public RotationStyle getRotationStyle() {
- return rotationStyle.get();
+ @NonNull
+ @Override
+ public RotationMode getRotationMode() {
+ return rotationMode.get();
}
/**
* {@return the current X coordinate}
*/
+ @Override
public double getX() {
return x.get();
}
@@ -415,14 +416,16 @@ public class Sprite extends AbstractVariableStorage implements Serializa
/**
* {@return the current Y coordinate}
*/
+ @Override
public double getY() {
return y.get();
}
/**
- * {@return the current direction} The minimal value is {@code -180} and the maximal value is
- * {@code 180}.
+ * {@return the current direction} The minimal value is {@code 0} and the maximal value is
+ * {@code 360} (not inclusive).
*/
+ @Override
public double getDirection() {
return direction.get();
}
@@ -614,7 +617,7 @@ public class Sprite extends AbstractVariableStorage implements Serializa
* Note for Scratchers: This method can be used for both changing effect values, setting them, and clearing,
* either all effects, or the preferred one. Example usages:
*
- * sprite.getGraphicEffects().put(GraphicEffect.OPACITY, 100.0); // Equivalent to "set ghost effect to 100" block
+ * sprite.getGraphicEffects().put(GraphicEffect.FADE, 100.0); // Equivalent to "set ghost effect to 100" block
* // To convert Scratch's "color" effect value to hue degrees, multiply it by 1.8
* sprite.getGraphicEffects().increment(GraphicEffect.HUE_SHIFT, 45.0); // Equivalent to "change color effect by 25" block
* sprite.getGraphicEffects().clear(); // Equivalent to "clear graphic effects" block
@@ -624,6 +627,8 @@ public class Sprite extends AbstractVariableStorage implements Serializa
*
* @return the graphic effect map
*/
+ @NonNull
+ @Override
public GraphicEffectMap getGraphicEffects() {
return graphicEffectMap;
}
@@ -642,52 +647,20 @@ public class Sprite extends AbstractVariableStorage implements Serializa
@Override
public void render(RenderCanvas canvas) {
- var parentProps = parentStage.get();
- if (parentProps == null) {
- throw new IllegalStateException("Not registered in a stage");
- }
+ Stage parent = canvas.getContext().getStage();
+ Image costumeImg = getCurrentCostume(parent).image();
+ GraphicsUtils.drawImageOriginCenter(canvas, costumeImg, 0, 0, ORIGINAL_SIZE, ORIGINAL_SIZE);
+ // TODO draw the text bubble when text support added
+ }
- canvas.save();
- canvas.setEffects(graphicEffectMap);
- Stage parent = parentProps.left();
- Image costumeAsImage = getCurrentCostumeImage(stageAcc.getContext(parent));
- GraphicsUtils.drawImageOriginCenter(canvas, costumeAsImage, 0, 0, ORIGINAL_SIZE, ORIGINAL_SIZE);
- canvas.restore();
+ @Override
+ public Point2D getPreferredCanvasSize(RenderingContext ctx) {
+ return getCurrentCostume(ctx.getStage()).canvasDim();
}
@Override
public Hitbox2D getHitbox() {
- var parentProps = parentStage.get();
- if (parentProps == null) {
- throw new IllegalStateException("Not registered in a stage");
- }
-
- Stage parent = parentProps.left();
- AppContext context = stageAcc.getContext(parent);
- Image costumeAsImage = getCurrentCostumeImage(stageAcc.getContext(parent));
-
- if (costumeAsImage instanceof SVGImage svg) {
- List vectors = svg.getVectors();
- return Hitbox2D.or(
- vectors.stream()
- .map(SVGVector::vector)
- .map(Hitbox2D::shape)
- .toArray(Hitbox2D[]::new)
- );
- } else if (costumeAsImage instanceof RasterImage raster) {
- PixelReader reader = costumeAsImage.createPixelReader();
- // TODO outline
- return null;
- } else {
- // Fallback: bounding box
- PixelReader reader = costumeAsImage.createPixelReader();
- return Hitbox2D.shape(new Rectangle2D.Double(
- getX() - reader.getWidth() / 2d,
- getY() - reader.getHeight() / 2d,
- reader.getWidth(),
- reader.getHeight()
- ));
- }
+ return getCurrentCostume(getParentStage()).hitbox();
}
/**
@@ -697,6 +670,7 @@ public class Sprite extends AbstractVariableStorage implements Serializa
*
* @return {@code true} if this sprite is visible, {@code false} otherwise.
*/
+ @Override
public boolean isVisible() {
return visible.get();
}
@@ -713,7 +687,7 @@ public class Sprite extends AbstractVariableStorage implements Serializa
* {@return the current costume name}
*/
public String getCostumeName() {
- return getAssets().texturesByIndex().get(costumeIndex.get()).name();
+ return assets.texturesByIndex().get(costumeIndex.get()).name();
}
/**
@@ -721,6 +695,7 @@ public class Sprite extends AbstractVariableStorage implements Serializa
*
* @return the X axis stretch
*/
+ @Override
public double getStretchX() {
return stretchX.get();
}
@@ -730,6 +705,7 @@ public class Sprite extends AbstractVariableStorage implements Serializa
*
* @return the Y axis stretch
*/
+ @Override
public double getStretchY() {
return stretchY.get();
}
@@ -805,17 +781,21 @@ public class Sprite extends AbstractVariableStorage implements Serializa
* @throws IndexOutOfBoundsException if there is no sound with the given name in assets.
*/
public String startSound(String soundName, boolean waitForDone, SoundEffectMap soundEffects) {
- var parentProps = parentStage.get();
- if (parentProps == null) {
- throw new IllegalStateException("Not registered in a stage");
- }
-
- Stage parent = parentProps.left();
- AudioManager audioManager = stageAcc.getContext(parent).get(AudioManager.class);
+ AudioManager audioManager = getParentStage().getContext().get(AudioManager.class);
String soundId = loadedSounds.computeIfAbsent(
- getAssets().texturesIndexesByName().getInt(soundName),
- index -> audioManager.createStaticSoundInstance(getAssets().soundsByIndex().get(index).location()).left()
+ assets.soundsIndexesByName().getInt(soundName),
+ index -> {
+ Path location = assets.soundsByIndex().get(index).location();
+ if (!audioManager.hasLoadedSound(location)) {
+ try {
+ audioManager.loadSound(location);
+ } catch (IOException e) {
+ log.error("Failed to load sound: {}", location, e);
+ }
+ }
+ return audioManager.createStaticSoundInstance(location).left();
+ }
);
SoundInstance> sound = audioManager.getSoundInstance(soundId);
sound.attachProperties(soundEffects);
@@ -833,7 +813,7 @@ public class Sprite extends AbstractVariableStorage implements Serializa
* either all effects, or the preferred one. Example usages:
*
* sprite.getSoundEffects().put(SoundEffect.VOLUME, 80.0); // Equivalent to "set volume to 80" block
- * sprite.getSoundEffects().increment(SoundEffect.PITCH, 45.0); // Equivalent to "change pitch effect by 25" block
+ * sprite.getSoundEffects().increment(SoundEffect.PITCH, 25.0); // Equivalent to "change pitch effect by 25" block
* sprite.getSoundEffects().clear(); // Equivalent to "clear sound effects" block
* double panValue = sprite.getSoundEffects().getDouble(SoundEffect.PAN); // retrieve the current value
*
@@ -877,17 +857,54 @@ public class Sprite extends AbstractVariableStorage implements Serializa
return new ConcurrentHashMap<>();
}
+ private Stage getParentStage() {
+ var parentProps = parentStage.get();
+ if (parentProps == null) {
+ throw new IllegalStateException("Not registered in a stage");
+ }
- private Image getCurrentCostumeImage(AppContext ctx) {
+ return parentProps.left();
+ }
+
+ private CostumeInfo getCurrentCostume(Stage parent) {
return loadedCostumes.computeIfAbsent(
getCostumeIndex(),
idx -> {
- GraphicsManager graphicsManager = ctx.get(GraphicsManager.class);
+ GraphicsManager graphicsManager = parent.getContext().get(GraphicsManager.class);
Path imgPath = assets.texturesByIndex().get(idx).location();
- return graphicsManager.hasLoadedImage(imgPath)
- ? graphicsManager.loadImage(imgPath, true)
- : graphicsManager.getLoadedImage(imgPath);
+
+ Image img = graphicsManager.hasLoadedImage(imgPath)
+ ? graphicsManager.getLoadedImage(imgPath)
+ : graphicsManager.loadImage(imgPath, true);
+ img.prepare();
+ Point2D dim = new Point2D(img.getIntrinsicWidth() * 2, img.getIntrinsicHeight() * 2);
+
+ Hitbox2D hb;
+ switch (img) {
+ case VectorImage vector -> {
+ List vectors = vector.getVectors();
+ hb = Hitbox2D.or(
+ vectors.stream()
+ .map(VectorImage.Vector::vector)
+ .map(Hitbox2D::shape)
+ .toArray(Hitbox2D[]::new)
+ );
+ }
+ case RasterImage raster -> hb = Hitbox2D.shape(PixelContourCreator.createEdgeContour(raster.createPixelReader()));
+ default -> throw new InternalError("BUG: Missing case in image switch");
+ }
+ AffineTransform at = new AffineTransform();
+ at.translate(dim.x() / -2d, dim.y() / -2d);
+ return new CostumeInfo(img, dim, hb.transform(at));
}
);
}
+
+ /**
+ * Stores sprite's behavior depending on the current costume.
+ * @param image the costume image
+ * @param canvasDim the canvas dimensions for the image
+ * @param hitbox the hitbox matching the costume image
+ */
+ private record CostumeInfo(Image image, Point2D canvasDim, Hitbox2D hitbox) {}
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/util/BufferUtils.java b/src/main/java/net/fokinatorr/sparkle/util/BufferUtils.java
similarity index 99%
rename from src/main/java/ru/fokinatorr/sparkle/util/BufferUtils.java
rename to src/main/java/net/fokinatorr/sparkle/util/BufferUtils.java
index c2eb1b6..dbd7414 100644
--- a/src/main/java/ru/fokinatorr/sparkle/util/BufferUtils.java
+++ b/src/main/java/net/fokinatorr/sparkle/util/BufferUtils.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.util;
+package net.fokinatorr.sparkle.util;
import lombok.experimental.UtilityClass;
import org.lwjgl.system.MemoryUtil;
diff --git a/src/main/java/ru/fokinatorr/sparkle/util/Constants.java b/src/main/java/net/fokinatorr/sparkle/util/Constants.java
similarity index 53%
rename from src/main/java/ru/fokinatorr/sparkle/util/Constants.java
rename to src/main/java/net/fokinatorr/sparkle/util/Constants.java
index b2e3d34..f892701 100644
--- a/src/main/java/ru/fokinatorr/sparkle/util/Constants.java
+++ b/src/main/java/net/fokinatorr/sparkle/util/Constants.java
@@ -1,17 +1,17 @@
-package ru.fokinatorr.sparkle.util;
+package net.fokinatorr.sparkle.util;
import lombok.experimental.UtilityClass;
-import ru.fokinatorr.sparkle.context.AppContext;
-import ru.fokinatorr.sparkle.context.AppContextHolder;
+import lombok.extern.slf4j.Slf4j;
+import net.fokinatorr.sparkle.context.AppContext;
+import net.fokinatorr.sparkle.context.AppContextHolder;
-import java.io.IOException;
import java.net.URI;
-import java.net.URISyntaxException;
import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
import java.nio.file.Path;
import java.util.Map;
import java.util.Random;
+import java.util.random.RandomGenerator;
/**
* Utility class holding public constants.
@@ -20,13 +20,14 @@ import java.util.Random;
* @see AppContextHolder
* @see Global
*/
+@Slf4j
@UtilityClass
public class Constants {
/**
* The common random generator.
*/
- public static final Random RANDOM = new Random();
+ public static final RandomGenerator RANDOM = new Random();
/**
* The resources root path (useful for loading).
*/
@@ -47,7 +48,22 @@ public class Constants {
static {
try {
//noinspection DataFlowIssue
- ROOT = Path.of(Constants.class.getResource("/").toURI());
+ URI url = Constants.class.getResource("").toURI();
+ if (url.getScheme().equals("file")) {
+ //noinspection DataFlowIssue
+ ROOT = Path.of(Constants.class.getResource("/").toURI()).toRealPath();
+ } else {
+ //noinspection resource
+ FileSystem jarFs = FileSystems.newFileSystem(url, Map.of("accessMode", "readOnly"));
+ Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+ try {
+ jarFs.close();
+ } catch (Exception e) {
+ log.error("Failed to close JAR filesystem", e);
+ }
+ }));
+ ROOT = jarFs.getPath("/");
+ }
} catch (Exception e) {
throw new ExceptionInInitializerError(e);
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/util/DebugUtils.java b/src/main/java/net/fokinatorr/sparkle/util/DebugUtils.java
similarity index 97%
rename from src/main/java/ru/fokinatorr/sparkle/util/DebugUtils.java
rename to src/main/java/net/fokinatorr/sparkle/util/DebugUtils.java
index d024423..8abd1ce 100644
--- a/src/main/java/ru/fokinatorr/sparkle/util/DebugUtils.java
+++ b/src/main/java/net/fokinatorr/sparkle/util/DebugUtils.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.util;
+package net.fokinatorr.sparkle.util;
import lombok.experimental.UtilityClass;
import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/ru/fokinatorr/sparkle/util/GUID.java b/src/main/java/net/fokinatorr/sparkle/util/GUID.java
similarity index 97%
rename from src/main/java/ru/fokinatorr/sparkle/util/GUID.java
rename to src/main/java/net/fokinatorr/sparkle/util/GUID.java
index c55c380..ad25db3 100644
--- a/src/main/java/ru/fokinatorr/sparkle/util/GUID.java
+++ b/src/main/java/net/fokinatorr/sparkle/util/GUID.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.util;
+package net.fokinatorr.sparkle.util;
import lombok.experimental.UtilityClass;
diff --git a/src/main/java/ru/fokinatorr/sparkle/util/Global.java b/src/main/java/net/fokinatorr/sparkle/util/Global.java
similarity index 90%
rename from src/main/java/ru/fokinatorr/sparkle/util/Global.java
rename to src/main/java/net/fokinatorr/sparkle/util/Global.java
index 4cbb446..6866a9a 100644
--- a/src/main/java/ru/fokinatorr/sparkle/util/Global.java
+++ b/src/main/java/net/fokinatorr/sparkle/util/Global.java
@@ -1,18 +1,18 @@
-package ru.fokinatorr.sparkle.util;
+package net.fokinatorr.sparkle.util;
import lombok.experimental.UtilityClass;
-import ru.fokinatorr.sparkle.audio.AudioManager;
-import ru.fokinatorr.sparkle.audio.io.SoundDecoder;
-import ru.fokinatorr.sparkle.context.AppContext;
-import ru.fokinatorr.sparkle.context.AppContextHolder;
-import ru.fokinatorr.sparkle.context.DefaultAppContext;
-import ru.fokinatorr.sparkle.event.Event;
-import ru.fokinatorr.sparkle.event.annotation.EventListener;
-import ru.fokinatorr.sparkle.event.dispatcher.EventDispatcher;
-import ru.fokinatorr.sparkle.event.dispatcher.ListenerRemover;
-import ru.fokinatorr.sparkle.graphics.GraphicsManager;
-import ru.fokinatorr.sparkle.graphics.font.FontProvider;
-import ru.fokinatorr.sparkle.graphics.render.renderer.RendererRegistry;
+import net.fokinatorr.sparkle.audio.AudioManager;
+import net.fokinatorr.sparkle.audio.io.SoundDecoder;
+import net.fokinatorr.sparkle.context.AppContext;
+import net.fokinatorr.sparkle.context.AppContextHolder;
+import net.fokinatorr.sparkle.context.DefaultAppContext;
+import net.fokinatorr.sparkle.event.Event;
+import net.fokinatorr.sparkle.event.annotation.EventListener;
+import net.fokinatorr.sparkle.event.dispatcher.EventDispatcher;
+import net.fokinatorr.sparkle.event.dispatcher.ListenerRemover;
+import net.fokinatorr.sparkle.graphics.GraphicsManager;
+import net.fokinatorr.sparkle.graphics.font.FontProvider;
+import net.fokinatorr.sparkle.graphics.render.renderer.RendererRegistry;
import java.lang.ref.Cleaner;
import java.lang.reflect.InaccessibleObjectException;
@@ -40,7 +40,7 @@ import java.util.function.Consumer;
* {@link Cleaner} (lazy) : can be used to clean up resources once an object is no longer used;
*
*
- * {@link AudioManager} (lazy, not in {@link DefaultAppContext#createHeadless() headless}) : loads & plays sounds;
+ * {@link AudioManager} (lazy, not in {@linkplain DefaultAppContext#createHeadless() headless}) : loads & plays sounds;
*
*
* {@link SoundDecoder} (not in headless) : decodes sound files (mostly used by the audio manager);
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/GraphicsUtils.java b/src/main/java/net/fokinatorr/sparkle/util/GraphicsUtils.java
similarity index 57%
rename from src/main/java/ru/fokinatorr/sparkle/graphics/GraphicsUtils.java
rename to src/main/java/net/fokinatorr/sparkle/util/GraphicsUtils.java
index 9906bd4..049ff15 100644
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/GraphicsUtils.java
+++ b/src/main/java/net/fokinatorr/sparkle/util/GraphicsUtils.java
@@ -1,18 +1,22 @@
-package ru.fokinatorr.sparkle.graphics;
+package net.fokinatorr.sparkle.util;
import lombok.experimental.UtilityClass;
-import ru.fokinatorr.sparkle.graphics.image.Image;
-import ru.fokinatorr.sparkle.graphics.render.RenderCanvas;
-import ru.fokinatorr.sparkle.internal.access.SharedSecrets;
-import ru.fokinatorr.sparkle.internal.access.StageAccess;
-import ru.fokinatorr.sparkle.phys2d.Point2D;
-import ru.fokinatorr.sparkle.stage.Stage;
+import net.fokinatorr.sparkle.event.input.MouseEvent;
+import net.fokinatorr.sparkle.graphics.image.Image;
+import net.fokinatorr.sparkle.graphics.render.RenderCanvas;
+import net.fokinatorr.sparkle.graphics.render.renderer.Renderer;
+import net.fokinatorr.sparkle.graphics.render.renderer.RendererRegistry;
+import net.fokinatorr.sparkle.internal.access.SharedSecrets;
+import net.fokinatorr.sparkle.internal.access.StageAccess;
+import net.fokinatorr.sparkle.phys2d.Hitbox2D;
+import net.fokinatorr.sparkle.phys2d.Point2D;
+import net.fokinatorr.sparkle.stage.RenderableID;
+import net.fokinatorr.sparkle.stage.Stage;
-import javax.imageio.ImageIO;
import java.util.Objects;
import java.util.function.Supplier;
-import static ru.fokinatorr.sparkle.graphics.render.RenderCanvas.ORIGINAL_SIZE;
+import static net.fokinatorr.sparkle.graphics.render.RenderCanvas.ORIGINAL_SIZE;
/**
* Graphics-related utilities.
@@ -38,11 +42,10 @@ public class GraphicsUtils {
Objects.requireNonNull(canvas, "canvas");
Objects.requireNonNull(image, "image");
+ if (!image.isReady()) image.prepare();
if (w == ORIGINAL_SIZE || h == ORIGINAL_SIZE) {
- if (!image.isReady()) image.prepare(); // perform lazy loading
- var reader = image.createPixelReader();
- if (w == ORIGINAL_SIZE) w = reader.getWidth();
- if (h == ORIGINAL_SIZE) h = reader.getHeight();
+ if (w == ORIGINAL_SIZE) w = image.getIntrinsicWidth();
+ if (h == ORIGINAL_SIZE) h = image.getIntrinsicHeight();
}
Point2D dim = canvas.getDimensions();
@@ -88,4 +91,25 @@ public class GraphicsUtils {
stageAcc.setSuppressRedraw(stage, false);
}
}
+
+ /**
+ * Returns the ID of the object that the mouse cursor hovers over as specified by the given {@link MouseEvent}
+ * instance. If no object was targeted, returns {@code null}. This can be treated as the stage itself being targeted.
+ * @param event a certain event related to mouse
+ * @return the target renderable object, or {@code null} if no object was targeted
+ */
+ public RenderableID> getTargetObject(MouseEvent event) {
+ Point2D pos = event.position();
+ Stage stage = event.stage();
+ RendererRegistry renderers = stage.getContext().get(RendererRegistry.class);
+ for (RenderableID> id : stage.getLayers().reversed()) {
+ Object obj = id.getFrom(stage);
+ Renderer renderer = renderers.get(obj.getClass());
+ Hitbox2D objHitbox = renderer.getBounds(obj, stage.getRenderContext());
+ if (objHitbox.contains(pos)) {
+ return id;
+ }
+ }
+ return null;
+ }
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/util/Mth.java b/src/main/java/net/fokinatorr/sparkle/util/Mth.java
similarity index 53%
rename from src/main/java/ru/fokinatorr/sparkle/util/Mth.java
rename to src/main/java/net/fokinatorr/sparkle/util/Mth.java
index 0599298..caf536c 100644
--- a/src/main/java/ru/fokinatorr/sparkle/util/Mth.java
+++ b/src/main/java/net/fokinatorr/sparkle/util/Mth.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.util;
+package net.fokinatorr.sparkle.util;
import lombok.experimental.UtilityClass;
@@ -72,4 +72,54 @@ public class Mth {
}
return min + wrapped;
}
+
+ /**
+ * Calculates a point on cubic Bézier curve using the Bernstein formula:
+ *
+ * B(t, n=3) = (1−t)³·p₀ + 3(1−t)²t·p₁ + 3(1−t)t²·p₂ + t³·p₃
+ *
+ * @param t the t coefficient (0 <= t <= 1)
+ * @param p0 start coordinate
+ * @param p1 first control coordinate
+ * @param p2 second control coordinate
+ * @param p3 end coordinate
+ * @return the calculated coordinate
+ * @throws IllegalArgumentException if {@code t} is out of bounds
+ */
+ public double cubicCurve(double t, double p0, double p1, double p2, double p3) {
+ if (t > 1 || t < 0) {
+ throw new IllegalArgumentException("Invalid 't' coefficient: " + t);
+ }
+ // p₀(1-t)³ + 3(1-t)²tp₁ + 3(1-t)t²p₂ + t³p₃
+ double oneMinusT = 1 - t;
+ double tSquared = t * t;
+ double oneMinusTSquared = oneMinusT * oneMinusT;
+ return oneMinusTSquared * oneMinusT * p0 +
+ 3 * oneMinusTSquared * t * p1 +
+ 3 * oneMinusT * tSquared * p2 +
+ tSquared * t * p3;
+ }
+
+ /**
+ * Calculates a point on a quadratic Bézier curve using the Bernstein formula:
+ *
+ * B(t, n=2) = (1-t)²·p₀ + 2(1-t)t·p₁ + t²·p₂
+ *
+ * @param t the t coefficient (0 <= t <= 1)
+ * @param p0 start coordinate
+ * @param p1 control coordinate
+ * @param p2 end coordinate
+ * @return the calculated coordinate
+ * @throws IllegalArgumentException if {@code t} is out of bounds
+ */
+ public double quadCurve(double t, double p0, double p1, double p2) {
+ if (t > 1 || t < 0) {
+ throw new IllegalArgumentException("Invalid 't' coefficient: " + t);
+ }
+ // p₀(1-t)² + 2(1-t)tp₁ + t²p₂
+ double oneMinusT = 1 - t;
+ return oneMinusT * oneMinusT * p0 +
+ 2 * oneMinusT * t * p1 +
+ t * t * p2;
+ }
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/util/NonThrowingAutoCloseable.java b/src/main/java/net/fokinatorr/sparkle/util/NonThrowingAutoCloseable.java
similarity index 51%
rename from src/main/java/ru/fokinatorr/sparkle/util/NonThrowingAutoCloseable.java
rename to src/main/java/net/fokinatorr/sparkle/util/NonThrowingAutoCloseable.java
index a840074..583ddc6 100644
--- a/src/main/java/ru/fokinatorr/sparkle/util/NonThrowingAutoCloseable.java
+++ b/src/main/java/net/fokinatorr/sparkle/util/NonThrowingAutoCloseable.java
@@ -1,8 +1,7 @@
-package ru.fokinatorr.sparkle.util;
+package net.fokinatorr.sparkle.util;
/**
* An {@link AutoCloseable} that doesn't throw checked exceptions in its {@link #close()} method.
- * This interface can be also converted into {@link Runnable} for convenience.
*/
public interface NonThrowingAutoCloseable extends AutoCloseable {
@@ -11,11 +10,4 @@ public interface NonThrowingAutoCloseable extends AutoCloseable {
*/
@Override
void close();
-
- /**
- * Creates and returns a {@link Runnable} which closes this object when run.
- */
- default Runnable asRunnable() {
- return this::close;
- }
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/util/TypeReference.java b/src/main/java/net/fokinatorr/sparkle/util/TypeReference.java
similarity index 96%
rename from src/main/java/ru/fokinatorr/sparkle/util/TypeReference.java
rename to src/main/java/net/fokinatorr/sparkle/util/TypeReference.java
index 135acb6..a97c6fe 100644
--- a/src/main/java/ru/fokinatorr/sparkle/util/TypeReference.java
+++ b/src/main/java/net/fokinatorr/sparkle/util/TypeReference.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.util;
+package net.fokinatorr.sparkle.util;
import lombok.Getter;
diff --git a/src/main/java/ru/fokinatorr/sparkle/util/Version.java b/src/main/java/net/fokinatorr/sparkle/util/Version.java
similarity index 56%
rename from src/main/java/ru/fokinatorr/sparkle/util/Version.java
rename to src/main/java/net/fokinatorr/sparkle/util/Version.java
index e323e83..d94a206 100644
--- a/src/main/java/ru/fokinatorr/sparkle/util/Version.java
+++ b/src/main/java/net/fokinatorr/sparkle/util/Version.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.util;
+package net.fokinatorr.sparkle.util;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -14,9 +14,9 @@ import static lombok.AccessLevel.PRIVATE;
@RequiredArgsConstructor
@FieldDefaults(makeFinal = true, level = PRIVATE)
public enum Version {
- V0_1_BETA(0, 1, 0, "0.1-beta");
+ V0_1_BETA(0, 1, 0, "beta");
- // Prepend new versions to the top
+ // NOTE: Prepend new versions to the top!
/**
* Major version (0 for betas).
@@ -33,13 +33,17 @@ public enum Version {
* Incremented for purely bugfix updates.
*/
int patch;
+ /**
+ * Variant string. Examples: empty for stable releases, "beta" for beta builds.
+ */
+ String variant;
/**
* Name of the version.
*/
String name;
- Version(int major, int minor, int patch) {
- this(major, minor, patch, major + "." + minor + "." + patch);
+ Version(int major, int minor, int patch, String variant) {
+ this(major, minor, patch, variant, makeVersionString(major, minor, patch, variant));
}
@Override
@@ -54,4 +58,12 @@ public enum Version {
public static Version current() {
return values()[0];
}
+
+ /**
+ * {@return a name string in major.minor.patch-variant format}
+ *
Patch omitted if zero, variant omitted if empty
+ */
+ private static String makeVersionString(int major, int minor, int patch, String variant) {
+ return major + "." + minor + (patch != 0 ? "." + patch : "") + (variant.isEmpty() ? "" : "-" + variant);
+ }
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/util/WaitUtils.java b/src/main/java/net/fokinatorr/sparkle/util/WaitUtils.java
similarity index 95%
rename from src/main/java/ru/fokinatorr/sparkle/util/WaitUtils.java
rename to src/main/java/net/fokinatorr/sparkle/util/WaitUtils.java
index b7f01df..7767b88 100644
--- a/src/main/java/ru/fokinatorr/sparkle/util/WaitUtils.java
+++ b/src/main/java/net/fokinatorr/sparkle/util/WaitUtils.java
@@ -1,11 +1,11 @@
-package ru.fokinatorr.sparkle.util;
+package net.fokinatorr.sparkle.util;
import lombok.experimental.UtilityClass;
import java.util.concurrent.locks.LockSupport;
import java.util.function.BooleanSupplier;
-import static ru.fokinatorr.sparkle.util.Constants.NANOS_PER_MILLISECOND;
+import static net.fokinatorr.sparkle.util.Constants.NANOS_PER_MILLISECOND;
/**
* This class has methods for accurate waiting.
diff --git a/src/main/java/ru/fokinatorr/sparkle/util/concurrent/ContextInheritingThreadFactory.java b/src/main/java/net/fokinatorr/sparkle/util/concurrent/ContextInheritingThreadFactory.java
similarity index 87%
rename from src/main/java/ru/fokinatorr/sparkle/util/concurrent/ContextInheritingThreadFactory.java
rename to src/main/java/net/fokinatorr/sparkle/util/concurrent/ContextInheritingThreadFactory.java
index 1e1dc9b..5757245 100644
--- a/src/main/java/ru/fokinatorr/sparkle/util/concurrent/ContextInheritingThreadFactory.java
+++ b/src/main/java/net/fokinatorr/sparkle/util/concurrent/ContextInheritingThreadFactory.java
@@ -1,11 +1,10 @@
-package ru.fokinatorr.sparkle.util.concurrent;
+package net.fokinatorr.sparkle.util.concurrent;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.experimental.FieldDefaults;
-import ru.fokinatorr.sparkle.context.AppContext;
-import ru.fokinatorr.sparkle.context.AppContextHolder;
-import ru.fokinatorr.sparkle.internal.access.SharedSecrets;
+import net.fokinatorr.sparkle.context.AppContext;
+import net.fokinatorr.sparkle.context.AppContextHolder;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicLong;
diff --git a/src/main/java/ru/fokinatorr/sparkle/util/concurrent/ThreadType.java b/src/main/java/net/fokinatorr/sparkle/util/concurrent/ThreadType.java
similarity index 96%
rename from src/main/java/ru/fokinatorr/sparkle/util/concurrent/ThreadType.java
rename to src/main/java/net/fokinatorr/sparkle/util/concurrent/ThreadType.java
index a76258a..4b6c08a 100644
--- a/src/main/java/ru/fokinatorr/sparkle/util/concurrent/ThreadType.java
+++ b/src/main/java/net/fokinatorr/sparkle/util/concurrent/ThreadType.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.util.concurrent;
+package net.fokinatorr.sparkle.util.concurrent;
/**
* Different kinds of threads. Can be represented as a {@link Thread.Builder}.
diff --git a/src/main/java/ru/fokinatorr/sparkle/util/concurrent/atomic/AtomicDouble.java b/src/main/java/net/fokinatorr/sparkle/util/concurrent/atomic/AtomicDouble.java
similarity index 96%
rename from src/main/java/ru/fokinatorr/sparkle/util/concurrent/atomic/AtomicDouble.java
rename to src/main/java/net/fokinatorr/sparkle/util/concurrent/atomic/AtomicDouble.java
index a2d9e28..e020b0a 100644
--- a/src/main/java/ru/fokinatorr/sparkle/util/concurrent/atomic/AtomicDouble.java
+++ b/src/main/java/net/fokinatorr/sparkle/util/concurrent/atomic/AtomicDouble.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.util.concurrent.atomic;
+package net.fokinatorr.sparkle.util.concurrent.atomic;
import java.io.Serializable;
import java.lang.invoke.VarHandle;
@@ -180,7 +180,7 @@ public class AtomicDouble extends Number implements Serializable {
* @return the previous value
*/
public final double getAndUpdate(DoubleUnaryOperator updateFunction) {
- return value.getAndUpdate(toLongUnaryOperator(updateFunction));
+ return Double.longBitsToDouble(value.getAndUpdate(toLongUnaryOperator(updateFunction)));
}
/**
@@ -194,7 +194,7 @@ public class AtomicDouble extends Number implements Serializable {
* @return the updated value
*/
public final double updateAndGet(DoubleUnaryOperator updateFunction) {
- return value.updateAndGet(toLongUnaryOperator(updateFunction));
+ return Double.longBitsToDouble(value.updateAndGet(toLongUnaryOperator(updateFunction)));
}
@Override
diff --git a/src/main/java/ru/fokinatorr/sparkle/util/concurrent/atomic/AtomicDoubleArray.java b/src/main/java/net/fokinatorr/sparkle/util/concurrent/atomic/AtomicDoubleArray.java
similarity index 98%
rename from src/main/java/ru/fokinatorr/sparkle/util/concurrent/atomic/AtomicDoubleArray.java
rename to src/main/java/net/fokinatorr/sparkle/util/concurrent/atomic/AtomicDoubleArray.java
index 9b85ad9..3d1b2bc 100644
--- a/src/main/java/ru/fokinatorr/sparkle/util/concurrent/atomic/AtomicDoubleArray.java
+++ b/src/main/java/net/fokinatorr/sparkle/util/concurrent/atomic/AtomicDoubleArray.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.util.concurrent.atomic;
+package net.fokinatorr.sparkle.util.concurrent.atomic;
import it.unimi.dsi.fastutil.doubles.AbstractDoubleIterator;
import it.unimi.dsi.fastutil.doubles.DoubleIterable;
@@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicLongArray;
import java.util.function.DoubleConsumer;
import java.util.function.DoubleUnaryOperator;
-import static ru.fokinatorr.sparkle.util.concurrent.atomic.AtomicDouble.toLongUnaryOperator;
+import static net.fokinatorr.sparkle.util.concurrent.atomic.AtomicDouble.toLongUnaryOperator;
/**
* A {@code double} array in which elements can be updated atomically. Internally stores a {@code long[]}.
diff --git a/src/main/java/ru/fokinatorr/sparkle/util/concurrent/atomic/AtomicFloat.java b/src/main/java/net/fokinatorr/sparkle/util/concurrent/atomic/AtomicFloat.java
similarity index 99%
rename from src/main/java/ru/fokinatorr/sparkle/util/concurrent/atomic/AtomicFloat.java
rename to src/main/java/net/fokinatorr/sparkle/util/concurrent/atomic/AtomicFloat.java
index 30835f0..e350f80 100644
--- a/src/main/java/ru/fokinatorr/sparkle/util/concurrent/atomic/AtomicFloat.java
+++ b/src/main/java/net/fokinatorr/sparkle/util/concurrent/atomic/AtomicFloat.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.util.concurrent.atomic;
+package net.fokinatorr.sparkle.util.concurrent.atomic;
import it.unimi.dsi.fastutil.floats.FloatUnaryOperator;
diff --git a/src/main/java/ru/fokinatorr/sparkle/util/stopwatch/AbstractStopwatch.java b/src/main/java/net/fokinatorr/sparkle/util/stopwatch/AbstractStopwatch.java
similarity index 98%
rename from src/main/java/ru/fokinatorr/sparkle/util/stopwatch/AbstractStopwatch.java
rename to src/main/java/net/fokinatorr/sparkle/util/stopwatch/AbstractStopwatch.java
index 1cc8fee..f799783 100644
--- a/src/main/java/ru/fokinatorr/sparkle/util/stopwatch/AbstractStopwatch.java
+++ b/src/main/java/net/fokinatorr/sparkle/util/stopwatch/AbstractStopwatch.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.util.stopwatch;
+package net.fokinatorr.sparkle.util.stopwatch;
/**
* Base implementation of {@link Stopwatch} interface.
diff --git a/src/main/java/ru/fokinatorr/sparkle/util/stopwatch/IllegalStopwatchStateException.java b/src/main/java/net/fokinatorr/sparkle/util/stopwatch/IllegalStopwatchStateException.java
similarity index 97%
rename from src/main/java/ru/fokinatorr/sparkle/util/stopwatch/IllegalStopwatchStateException.java
rename to src/main/java/net/fokinatorr/sparkle/util/stopwatch/IllegalStopwatchStateException.java
index e4cb313..e341071 100644
--- a/src/main/java/ru/fokinatorr/sparkle/util/stopwatch/IllegalStopwatchStateException.java
+++ b/src/main/java/net/fokinatorr/sparkle/util/stopwatch/IllegalStopwatchStateException.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.util.stopwatch;
+package net.fokinatorr.sparkle.util.stopwatch;
/**
* Thrown when an operation cannot be performed because of the current stopwatch state
diff --git a/src/main/java/ru/fokinatorr/sparkle/util/stopwatch/InstantStopwatch.java b/src/main/java/net/fokinatorr/sparkle/util/stopwatch/InstantStopwatch.java
similarity index 97%
rename from src/main/java/ru/fokinatorr/sparkle/util/stopwatch/InstantStopwatch.java
rename to src/main/java/net/fokinatorr/sparkle/util/stopwatch/InstantStopwatch.java
index f8ee1ef..7f0167a 100644
--- a/src/main/java/ru/fokinatorr/sparkle/util/stopwatch/InstantStopwatch.java
+++ b/src/main/java/net/fokinatorr/sparkle/util/stopwatch/InstantStopwatch.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.util.stopwatch;
+package net.fokinatorr.sparkle.util.stopwatch;
import java.time.Instant;
diff --git a/src/main/java/ru/fokinatorr/sparkle/util/stopwatch/Stopwatch.java b/src/main/java/net/fokinatorr/sparkle/util/stopwatch/Stopwatch.java
similarity index 98%
rename from src/main/java/ru/fokinatorr/sparkle/util/stopwatch/Stopwatch.java
rename to src/main/java/net/fokinatorr/sparkle/util/stopwatch/Stopwatch.java
index dbb8177..471119f 100644
--- a/src/main/java/ru/fokinatorr/sparkle/util/stopwatch/Stopwatch.java
+++ b/src/main/java/net/fokinatorr/sparkle/util/stopwatch/Stopwatch.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.util.stopwatch;
+package net.fokinatorr.sparkle.util.stopwatch;
import java.time.Instant;
diff --git a/src/main/java/ru/fokinatorr/sparkle/variable/AbstractVariableStorage.java b/src/main/java/net/fokinatorr/sparkle/variable/AbstractVariableStorage.java
similarity index 75%
rename from src/main/java/ru/fokinatorr/sparkle/variable/AbstractVariableStorage.java
rename to src/main/java/net/fokinatorr/sparkle/variable/AbstractVariableStorage.java
index 846ed69..7564202 100644
--- a/src/main/java/ru/fokinatorr/sparkle/variable/AbstractVariableStorage.java
+++ b/src/main/java/net/fokinatorr/sparkle/variable/AbstractVariableStorage.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.variable;
+package net.fokinatorr.sparkle.variable;
import java.util.Collections;
import java.util.Map;
@@ -19,7 +19,8 @@ public abstract class AbstractVariableStorage implements VariableStorage
}
/**
- * Creates a new {@link Map} to store variables in.
+ * Creates a new {@link Map} to store variables in. This method must not have side effects
+ * and must solely create a new empty mutable map instance (e.g., using constructor).
* @return a new variable map
*/
protected abstract Map> createVariables();
@@ -48,9 +49,11 @@ public abstract class AbstractVariableStorage implements VariableStorage
* {@inheritDoc}
* @param id {@inheritDoc}
* @return {@inheritDoc}
+ * @throws ClassCastException {@inheritDoc}
*/
@Override
- public Variable> getVariable(ID id) {
- return variables.get(id);
+ @SuppressWarnings("unchecked")
+ public Variable getVariable(ID id) {
+ return (Variable) variables.get(id);
}
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/variable/BooleanVariable.java b/src/main/java/net/fokinatorr/sparkle/variable/BooleanVariable.java
similarity index 95%
rename from src/main/java/ru/fokinatorr/sparkle/variable/BooleanVariable.java
rename to src/main/java/net/fokinatorr/sparkle/variable/BooleanVariable.java
index df2c4ad..72cc055 100644
--- a/src/main/java/ru/fokinatorr/sparkle/variable/BooleanVariable.java
+++ b/src/main/java/net/fokinatorr/sparkle/variable/BooleanVariable.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.variable;
+package net.fokinatorr.sparkle.variable;
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
@@ -6,7 +6,7 @@ import lombok.experimental.FieldDefaults;
import java.util.concurrent.atomic.AtomicBoolean;
-import static ru.fokinatorr.sparkle.variable.ObjectVariable.PRIMITIVE_TO_WRAPPER;
+import static net.fokinatorr.sparkle.variable.ObjectVariable.PRIMITIVE_TO_WRAPPER;
/**
* A variable storing a {@code boolean} value.
diff --git a/src/main/java/ru/fokinatorr/sparkle/variable/ByteVariable.java b/src/main/java/net/fokinatorr/sparkle/variable/ByteVariable.java
similarity index 97%
rename from src/main/java/ru/fokinatorr/sparkle/variable/ByteVariable.java
rename to src/main/java/net/fokinatorr/sparkle/variable/ByteVariable.java
index 41f1222..0545f37 100644
--- a/src/main/java/ru/fokinatorr/sparkle/variable/ByteVariable.java
+++ b/src/main/java/net/fokinatorr/sparkle/variable/ByteVariable.java
@@ -1,10 +1,10 @@
-package ru.fokinatorr.sparkle.variable;
+package net.fokinatorr.sparkle.variable;
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.experimental.FieldDefaults;
-import static ru.fokinatorr.sparkle.variable.ObjectVariable.PRIMITIVE_TO_WRAPPER;
+import static net.fokinatorr.sparkle.variable.ObjectVariable.PRIMITIVE_TO_WRAPPER;
/**
* A variable storing a {@code byte} value.
diff --git a/src/main/java/ru/fokinatorr/sparkle/variable/CharVariable.java b/src/main/java/net/fokinatorr/sparkle/variable/CharVariable.java
similarity index 94%
rename from src/main/java/ru/fokinatorr/sparkle/variable/CharVariable.java
rename to src/main/java/net/fokinatorr/sparkle/variable/CharVariable.java
index c5a7132..4d1cb78 100644
--- a/src/main/java/ru/fokinatorr/sparkle/variable/CharVariable.java
+++ b/src/main/java/net/fokinatorr/sparkle/variable/CharVariable.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.variable;
+package net.fokinatorr.sparkle.variable;
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
@@ -6,7 +6,7 @@ import lombok.experimental.FieldDefaults;
import java.util.concurrent.atomic.AtomicInteger;
-import static ru.fokinatorr.sparkle.variable.ObjectVariable.PRIMITIVE_TO_WRAPPER;
+import static net.fokinatorr.sparkle.variable.ObjectVariable.PRIMITIVE_TO_WRAPPER;
/**
* A variable storing a {@code char} value.
diff --git a/src/main/java/ru/fokinatorr/sparkle/variable/DoubleVariable.java b/src/main/java/net/fokinatorr/sparkle/variable/DoubleVariable.java
similarity index 96%
rename from src/main/java/ru/fokinatorr/sparkle/variable/DoubleVariable.java
rename to src/main/java/net/fokinatorr/sparkle/variable/DoubleVariable.java
index f113630..cfe76e9 100644
--- a/src/main/java/ru/fokinatorr/sparkle/variable/DoubleVariable.java
+++ b/src/main/java/net/fokinatorr/sparkle/variable/DoubleVariable.java
@@ -1,11 +1,11 @@
-package ru.fokinatorr.sparkle.variable;
+package net.fokinatorr.sparkle.variable;
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.experimental.FieldDefaults;
-import ru.fokinatorr.sparkle.util.concurrent.atomic.AtomicDouble;
+import net.fokinatorr.sparkle.util.concurrent.atomic.AtomicDouble;
-import static ru.fokinatorr.sparkle.variable.ObjectVariable.PRIMITIVE_TO_WRAPPER;
+import static net.fokinatorr.sparkle.variable.ObjectVariable.PRIMITIVE_TO_WRAPPER;
/**
* A variable storing a {@code double} value.
diff --git a/src/main/java/ru/fokinatorr/sparkle/variable/FloatVariable.java b/src/main/java/net/fokinatorr/sparkle/variable/FloatVariable.java
similarity index 96%
rename from src/main/java/ru/fokinatorr/sparkle/variable/FloatVariable.java
rename to src/main/java/net/fokinatorr/sparkle/variable/FloatVariable.java
index 629a49a..a2d687c 100644
--- a/src/main/java/ru/fokinatorr/sparkle/variable/FloatVariable.java
+++ b/src/main/java/net/fokinatorr/sparkle/variable/FloatVariable.java
@@ -1,11 +1,11 @@
-package ru.fokinatorr.sparkle.variable;
+package net.fokinatorr.sparkle.variable;
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.experimental.FieldDefaults;
-import ru.fokinatorr.sparkle.util.concurrent.atomic.AtomicFloat;
+import net.fokinatorr.sparkle.util.concurrent.atomic.AtomicFloat;
-import static ru.fokinatorr.sparkle.variable.ObjectVariable.PRIMITIVE_TO_WRAPPER;
+import static net.fokinatorr.sparkle.variable.ObjectVariable.PRIMITIVE_TO_WRAPPER;
/**
* A variable storing a {@code double} value.
diff --git a/src/main/java/ru/fokinatorr/sparkle/variable/IntVariable.java b/src/main/java/net/fokinatorr/sparkle/variable/IntVariable.java
similarity index 97%
rename from src/main/java/ru/fokinatorr/sparkle/variable/IntVariable.java
rename to src/main/java/net/fokinatorr/sparkle/variable/IntVariable.java
index a461db9..50ee64b 100644
--- a/src/main/java/ru/fokinatorr/sparkle/variable/IntVariable.java
+++ b/src/main/java/net/fokinatorr/sparkle/variable/IntVariable.java
@@ -1,11 +1,11 @@
-package ru.fokinatorr.sparkle.variable;
+package net.fokinatorr.sparkle.variable;
import lombok.EqualsAndHashCode;
import lombok.experimental.FieldDefaults;
import java.util.concurrent.atomic.AtomicInteger;
-import static ru.fokinatorr.sparkle.variable.ObjectVariable.PRIMITIVE_TO_WRAPPER;
+import static net.fokinatorr.sparkle.variable.ObjectVariable.PRIMITIVE_TO_WRAPPER;
/**
* A variable storing an {@code int} value.
diff --git a/src/main/java/ru/fokinatorr/sparkle/variable/LongVariable.java b/src/main/java/net/fokinatorr/sparkle/variable/LongVariable.java
similarity index 97%
rename from src/main/java/ru/fokinatorr/sparkle/variable/LongVariable.java
rename to src/main/java/net/fokinatorr/sparkle/variable/LongVariable.java
index b643f3e..a8b3b77 100644
--- a/src/main/java/ru/fokinatorr/sparkle/variable/LongVariable.java
+++ b/src/main/java/net/fokinatorr/sparkle/variable/LongVariable.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.variable;
+package net.fokinatorr.sparkle.variable;
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
@@ -6,7 +6,7 @@ import lombok.experimental.FieldDefaults;
import java.util.concurrent.atomic.AtomicLong;
-import static ru.fokinatorr.sparkle.variable.ObjectVariable.PRIMITIVE_TO_WRAPPER;
+import static net.fokinatorr.sparkle.variable.ObjectVariable.PRIMITIVE_TO_WRAPPER;
/**
* A variable storing a {@code long} value.
diff --git a/src/main/java/ru/fokinatorr/sparkle/variable/ObjectVariable.java b/src/main/java/net/fokinatorr/sparkle/variable/ObjectVariable.java
similarity index 63%
rename from src/main/java/ru/fokinatorr/sparkle/variable/ObjectVariable.java
rename to src/main/java/net/fokinatorr/sparkle/variable/ObjectVariable.java
index 0658b64..f9bc504 100644
--- a/src/main/java/ru/fokinatorr/sparkle/variable/ObjectVariable.java
+++ b/src/main/java/net/fokinatorr/sparkle/variable/ObjectVariable.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.variable;
+package net.fokinatorr.sparkle.variable;
import it.unimi.dsi.fastutil.objects.Reference2ReferenceMap;
import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap;
@@ -44,20 +44,42 @@ public class ObjectVariable implements Variable {
Map.entry(void.class, Void.class)
));
+ Class type;
AtomicReference value;
/**
* Constructs a new {@code ObjectVariable} with the initial value {@code null}.
+ * Note: If you want to call the {@link #ObjectVariable(Object)} constructor with a {@link Class} argument, explicitly
+ * specify the generic parameter as {@code Class}. Example:
+ *
{@code new ObjectVariable>(String.class)}
+ * @param type the runtime type of this variable (required due to type erasure)
+ * @throws NullPointerException if type is {@code null}
*/
- public ObjectVariable() {
+ public ObjectVariable(Class type) {
+ this.type = Objects.requireNonNull(type, "type");
value = new AtomicReference<>();
}
/**
- * Constructs a new {@code ObjectVariable} with the given initial value.
- * @param initialValue the initial value (nullable)
+ * Constructs a new {@code ObjectVariable} with the given initial value. The type is inferred
+ * from the initial value's runtime type, so the value must not be {@code null}!
+ * @param initialValue the initial value (should not be {@code null})
+ * @throws NullPointerException if initial value is {@code null}
*/
+ @SuppressWarnings("unchecked")
public ObjectVariable(T initialValue) {
+ type = (Class) Objects.requireNonNull(initialValue, "initial value").getClass(); // safe cast in this case
+ value = new AtomicReference<>(initialValue);
+ }
+
+ /**
+ * Constructs a new {@code ObjectVariable} with the given initial value.
+ * @param type the runtime type of this variable
+ * @param initialValue the initial value (nullable)
+ * @throws NullPointerException if type is {@code null}
+ */
+ public ObjectVariable(Class type, T initialValue) {
+ this.type = Objects.requireNonNull(type, "type");
value = new AtomicReference<>(initialValue);
}
@@ -78,7 +100,14 @@ public class ObjectVariable implements Variable {
*/
@Override
public void setValue(T newValue) {
- value.set(newValue);
+ if (newValue == null || type.isInstance(newValue)) {
+ value.set(newValue);
+ } else {
+ throw new ClassCastException(
+ "Value of type " + newValue.getClass().getName() +
+ " is not assignable to " + type.getName()
+ );
+ }
}
/**
@@ -91,9 +120,8 @@ public class ObjectVariable implements Variable {
@Override
public boolean is(Class> cls) {
Objects.requireNonNull(cls, "class");
- T value = this.value.get();
cls = PRIMITIVE_TO_WRAPPER.getOrDefault(cls, cls);
- return value == null ? !cls.isPrimitive() : cls.isInstance(value);
+ return type.isAssignableFrom(cls); // for consistency, don't return true if value is null
}
/**
@@ -102,7 +130,7 @@ public class ObjectVariable implements Variable {
*/
@Override
public ObjectVariable copy() {
- return new ObjectVariable<>(value.get());
+ return new ObjectVariable<>(type, value.get());
}
/**
diff --git a/src/main/java/ru/fokinatorr/sparkle/variable/ShortVariable.java b/src/main/java/net/fokinatorr/sparkle/variable/ShortVariable.java
similarity index 97%
rename from src/main/java/ru/fokinatorr/sparkle/variable/ShortVariable.java
rename to src/main/java/net/fokinatorr/sparkle/variable/ShortVariable.java
index e82bd0d..90b81dd 100644
--- a/src/main/java/ru/fokinatorr/sparkle/variable/ShortVariable.java
+++ b/src/main/java/net/fokinatorr/sparkle/variable/ShortVariable.java
@@ -1,10 +1,10 @@
-package ru.fokinatorr.sparkle.variable;
+package net.fokinatorr.sparkle.variable;
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.experimental.FieldDefaults;
-import static ru.fokinatorr.sparkle.variable.ObjectVariable.PRIMITIVE_TO_WRAPPER;
+import static net.fokinatorr.sparkle.variable.ObjectVariable.PRIMITIVE_TO_WRAPPER;
/**
* A variable storing a {@code short} value.
diff --git a/src/main/java/ru/fokinatorr/sparkle/variable/Variable.java b/src/main/java/net/fokinatorr/sparkle/variable/Variable.java
similarity index 97%
rename from src/main/java/ru/fokinatorr/sparkle/variable/Variable.java
rename to src/main/java/net/fokinatorr/sparkle/variable/Variable.java
index e231a25..ccbbc7b 100644
--- a/src/main/java/ru/fokinatorr/sparkle/variable/Variable.java
+++ b/src/main/java/net/fokinatorr/sparkle/variable/Variable.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.variable;
+package net.fokinatorr.sparkle.variable;
/**
* Base interface for all variables stored within a sprite or a stage.
@@ -31,7 +31,8 @@ public interface Variable {
boolean is(Class> cls);
/**
- * Creates and returns a copy of this variable. The copy should not be a view over the source {@code Variable}.
+ * Creates and returns a shallow copy of this variable. The copy should not reflect changes to
+ * the source {@code Variable}, however, the value's state may be shared.
* @return a copy of this variable
*/
Variable copy();
diff --git a/src/main/java/ru/fokinatorr/sparkle/variable/VariableStorage.java b/src/main/java/net/fokinatorr/sparkle/variable/VariableStorage.java
similarity index 55%
rename from src/main/java/ru/fokinatorr/sparkle/variable/VariableStorage.java
rename to src/main/java/net/fokinatorr/sparkle/variable/VariableStorage.java
index 104dce3..b3918c2 100644
--- a/src/main/java/ru/fokinatorr/sparkle/variable/VariableStorage.java
+++ b/src/main/java/net/fokinatorr/sparkle/variable/VariableStorage.java
@@ -1,4 +1,4 @@
-package ru.fokinatorr.sparkle.variable;
+package net.fokinatorr.sparkle.variable;
import java.util.Map;
@@ -22,10 +22,14 @@ public interface VariableStorage {
void registerVariable(ID id, Variable> variable);
/**
- * Returns a variable with the given ID.
- * Equivalent to {@code getVariables().get(id)}.
+ * Returns a variable with the given ID. Equivalent to {@code getVariables().get(id)}, except
+ * it can return a generically typed variable.
* @param id the ID
* @return the respective variable
+ * @param the requested variable type
+ * @throws ClassCastException if the variable's actual type does not match the requested one.
+ * Note: Java erases generic types at runtime, so the error might appear only when an attempt is made
+ * to read or write the variable's value, not when the variable itself is retrieved.
*/
- Variable> getVariable(ID id);
+ Variable getVariable(ID id);
}
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/image/Image.java b/src/main/java/ru/fokinatorr/sparkle/graphics/image/Image.java
deleted file mode 100644
index 039f2ea..0000000
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/image/Image.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package ru.fokinatorr.sparkle.graphics.image;
-
-import ru.fokinatorr.sparkle.graphics.PixelReader;
-import ru.fokinatorr.sparkle.graphics.render.RenderCanvas;
-import ru.fokinatorr.sparkle.util.NonThrowingAutoCloseable;
-
-/**
- * An image that can be rendered on a canvas.
- *
- * This interface abstracts over various image formats (raster, vector, procedural)
- * and enables uniform handling across rendering pipelines. Implementations may represent:
- *
- * Raster images (PNG, JPEG)
- * Vector graphics (SVG)
- * Dynamic/procedural textures
- * Animation frames
- *
- *
- * Resource Management
- * Images may hold native resources (e.g. GPU textures). Callers should ensure
- * {@link #prepare()} is called before drawing, and consider disposal
- * if the image supports it.
- * To potentially release these resources, {@link #close()} must be called when the image
- * is no longer in use.
- *
- *
Thread Safety
- * Implementations must be safe to pass between threads, but are not required to support
- * concurrent drawing from multiple canvases unless explicitly documented.
- *
- * @see RasterImage
- * @see SVGImage
- * @see AnimatedImage
- */
-public interface Image extends NonThrowingAutoCloseable {
-
- /**
- * Prepares the image for rendering.
- *
- * This may involve:
- *
- * Lazy decoding of compressed data
- * Rasterization of vector content
- * Creating internal rendering structures
- *
- *
- * Idempotent: calling multiple times has no additional effect.
- *
- * @throws NullPointerException if context is {@code null}
- */
- void prepare();
-
- /**
- * Checks whether this image is ready to be drawn.
- *
- * Returns {@code false} only if:
- *
- * The image is still loading asynchronously
- * Required resources failed to load
- * {@link #prepare()} hasn't been called yet
- *
- *
- * @return true if safe to pass to {@link RenderCanvas#drawImage RenderCanvas.drawImage()}
- */
- boolean isReady();
-
- /**
- * Returns a pixel reader that can read this image's contents as pixels.
- * The image must be {@link #prepare() prepared} before calling this method.
- *
- * @return an object that reads this image by pixels
- * @see #isReady()
- * @see #prepare()
- */
- PixelReader createPixelReader();
-
- /**
- * Optional hint about the MIME type of this image.
- *
- * Examples: {@code "image/png"}, {@code "image/svg+xml"}
- *
- * May return {@code null} if unknown or irrelevant (e.g. procedural images).
- *
- * @return the MIME type, or null if unavailable
- */
- default String getMimeType() {
- return null;
- }
-
- /**
- * {@inheritDoc}
- * The image can not be used after calling this method.
- * Calling this method more than once does not have any effect.
- */
- @Override
- void close();
-}
\ No newline at end of file
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/image/SVGImage.java b/src/main/java/ru/fokinatorr/sparkle/graphics/image/SVGImage.java
deleted file mode 100644
index 9b1277d..0000000
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/image/SVGImage.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package ru.fokinatorr.sparkle.graphics.image;
-
-import lombok.AccessLevel;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.FieldDefaults;
-import org.lwjgl.nanovg.NSVGImage;
-import ru.fokinatorr.sparkle.graphics.ARGB;
-import ru.fokinatorr.sparkle.graphics.PixelReader;
-import ru.fokinatorr.sparkle.graphics.impl.IntBufferPixelAccessor;
-import ru.fokinatorr.sparkle.graphics.vector.SVGVector;
-
-import java.net.URL;
-import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.lwjgl.system.MemoryUtil.*;
-import static org.lwjgl.nanovg.NanoSVG.*;
-
-/**
- * An SVG image is a vector-based format.
- */
-@FieldDefaults(level = AccessLevel.PRIVATE)
-@RequiredArgsConstructor
-public class SVGImage implements Image {
- /**
- * Location of the image data.
- */
- @NonNull
- final URL resource;
- volatile NSVGImage decoded;
- volatile IntBuffer rasterized;
-
- @Override
- public void prepare() {
- if (decoded == null) {
- try {
- decoded = nsvgParseFromFile(resource.getPath(), "px", 96f);
- rasterize();
- } catch (Exception e) {
- throw new RuntimeException("Failed to decode SVG image from path: " + resource, e);
- }
- if (decoded == null) {
- throw new RuntimeException("Failed to decode SVG image from path: " + resource);
- }
- }
- }
-
- @Override
- public boolean isReady() {
- return rasterized != null;
- }
-
- @Override
- public PixelReader createPixelReader() {
- prepare();
- return new IntBufferPixelAccessor((int) decoded.width(), (int) decoded.height(), rasterized, () -> {
- if (rasterized == null) {
- throw new IllegalStateException("Image has not been prepared yet");
- }
- });
- }
-
- @Override
- public String getMimeType() {
- return "image/svg+xml";
- }
-
- public List getVectors() {
- prepare();
-
- List vectors = new ArrayList<>();
- return vectors;//TODO
- }
-
- @Override
- public void close() {
- memFree(rasterized);
- rasterized = null;
- nsvgDelete(decoded);
- decoded = null;
- }
-
- // Private implementation
-
- private void rasterize() {
- long rasterizer /*pointer*/ = nsvgCreateRasterizer();
- ByteBuffer rasterizedBB = memAlloc((int) (decoded.width() * decoded.height() * Integer.BYTES));
- try {
- nsvgRasterize(
- rasterizer,
- decoded,
- 0f, 0f,
- 1f,
- rasterizedBB,
- (int) decoded.width(), (int) decoded.height(),
- (int) (decoded.width() * Integer.BYTES)
- );
- } catch (Exception e) {
- memFree(rasterizedBB);
- throw new RuntimeException("Failed to rasterise SVG image", e);
- } finally {
- nnsvgDeleteRasterizer(rasterizer);
- }
- rasterized = rasterizedBB.asIntBuffer();
- // convert from RGBA to ARGB
- for (int i = 0; i < rasterized.capacity(); i++) {
- int rgba = rasterized.get(i);
- int argb = ARGB.color(
- (byte) (rgba & 0xFF),
- (byte) (rgba >>> 24 & 0xFF),
- (byte) (rgba >>> 16 & 0xFF),
- (byte) (rgba >>> 8 & 0xFF)
- );
- rasterized.put(i, argb);
- }
- }
-}
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/GraphicsState.java b/src/main/java/ru/fokinatorr/sparkle/graphics/impl/GraphicsState.java
deleted file mode 100644
index 90c464e..0000000
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/GraphicsState.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package ru.fokinatorr.sparkle.graphics.impl;
-
-import lombok.Data;
-import lombok.NonNull;
-import lombok.experimental.FieldDefaults;
-import ru.fokinatorr.sparkle.effect.graphics.GraphicEffectMap;
-import ru.fokinatorr.sparkle.graphics.BlendMode;
-import ru.fokinatorr.sparkle.graphics.render.RenderCanvas;
-import ru.fokinatorr.sparkle.phys2d.Point2D;
-import ru.fokinatorr.sparkle.util.Mth;
-
-import java.awt.*;
-
-import static lombok.AccessLevel.PRIVATE;
-
-/**
- * Represents the current graphics state of a {@link RenderCanvas}.
- *
- * @see RenderCanvas
- * @see RenderCanvas#save()
- * @see RenderCanvas#restore()
- */
-@FieldDefaults(level = PRIVATE)
-@Data
-public class GraphicsState {
-
- double translateX;
- double translateY;
- double rotationDegrees;
- double scaleX = 1.0;
- double scaleY = 1.0;
-
- int fillARGB = 0xFF_00_00_00; // Default black
- int strokeARGB = 0xFF_00_00_00; // Default black
- double lineWidth = 1.0;
- /**
- * Unsigned byte representing the opacity multiplier.
- * {@code 0} - fully transparent, {@code 255} ({@code -1}) - fully opaque.
- */
- byte alpha = (byte) 255;
-
- @NonNull
- BlendMode blendMode = BlendMode.ADD;
- @NonNull
- GraphicEffectMap effects = new GraphicEffectMap();
-
- Shape clip;
-
-
- /**
- * Creates a deep copy of this graphics state.
- *
- * @return a new {@code GraphicsState} with identical property values
- */
- public GraphicsState copy() {
- GraphicsState copy = new GraphicsState();
- copy.translateX = this.translateX;
- copy.translateY = this.translateY;
- copy.rotationDegrees = this.rotationDegrees;
- copy.scaleX = this.scaleX;
- copy.scaleY = this.scaleY;
- copy.fillARGB = this.fillARGB;
- copy.strokeARGB = this.strokeARGB;
- copy.lineWidth = this.lineWidth;
- copy.alpha = this.alpha;
- copy.blendMode = this.blendMode;
- copy.effects = this.effects.copy();
- copy.clip = this.clip;
- return copy;
- }
-
- /**
- * Sets the new X coordinate translation.
- * @param translateX the new translation
- * @throws IllegalArgumentException if translateX is infinite or NaN
- */
- public void setTranslateX(double translateX) {
- if (Double.isInfinite(translateX) || Double.isNaN(translateX)) {
- throw new IllegalArgumentException("Translation must be finite, got: " + translateX);
- }
- this.translateX = translateX;
- }
-
- /**
- * Sets the new Y coordinate translation.
- * @param translateY the new translation
- * @throws IllegalArgumentException if translateY is infinite or NaN
- */
- public void setTranslateY(double translateY) {
- if (Double.isInfinite(translateY) || Double.isNaN(translateY)) {
- throw new IllegalArgumentException("Translation must be finite, got: " + translateY);
- }
- this.translateY = translateY;
- }
-
- /**
- * Translates the state by the given deltas.
- * @param dx the X delta
- * @param dy the Y delta
- * @throws IllegalArgumentException if any argument is infinite or NaN
- */
- public void translate(double dx, double dy) {
- setTranslateX(translateX + dx);
- setTranslateY(translateY + dy);
- }
-
- /**
- * Sets the new rotation, in degrees.
- * @param rotationDegrees the new rotation
- * @throws IllegalArgumentException if rotationDegrees is infinite, or NaN
- */
- public void setRotationDegrees(double rotationDegrees) {
- if (Double.isInfinite(rotationDegrees) || Double.isNaN(rotationDegrees)) {
- throw new IllegalArgumentException("Rotation must be positive and finite, got: " + rotationDegrees);
- }
- this.rotationDegrees = Mth.wrapClamp(rotationDegrees, -360d, 360d);
- }
-
- /**
- * Adds the given delta (in degrees) to the current rotation.
- * @param dr the rotation delta
- * @throws IllegalArgumentException if dr is infinite, or NaN
- */
- public void rotate(double dr) {
- setRotationDegrees(rotationDegrees + dr);
- }
-
- /**
- * Sets the new X axis scale.
- * @param scaleX the new X axis scale
- * @throws IllegalArgumentException if scaleX is non-positive, infinite, or NaN
- */
- public void setScaleX(double scaleX) {
- if (scaleX <= 0 || Double.isInfinite(scaleX) || Double.isNaN(scaleX)) {
- throw new IllegalArgumentException("Scale must be positive and finite, got: " + scaleX);
- }
- this.scaleX = scaleX;
- }
-
- /**
- * Sets the new Y axis scale.
- * @param scaleY the new Y axis scale
- * @throws IllegalArgumentException if scaleY is non-positive, infinite, or NaN
- */
- public void setScaleY(double scaleY) {
- if (scaleY <= 0 || Double.isInfinite(scaleY) || Double.isNaN(scaleY)) {
- throw new IllegalArgumentException("Scale must be positive and finite, got: " + scaleY);
- }
- this.scaleY = scaleY;
- }
-
- /**
- * Scales the state by the given deltas.
- * @param sx the X axis scale delta
- * @param sy the Y axis scale delta
- * @throws IllegalArgumentException if any argument is non-positive, infinite or NaN
- */
- public void scale(double sx, double sy) {
- setScaleX(scaleX * sx);
- setScaleY(scaleY * sy);
- }
-
- /**
- * Sets the new line width.
- * @param lineWidth the new line width
- * @throws IllegalArgumentException if lineWidth is non-positive, infinite, or NaN
- */
- public void setLineWidth(double lineWidth) {
- if (lineWidth <= 0 || Double.isInfinite(lineWidth) || Double.isNaN(lineWidth)) {
- throw new IllegalArgumentException("Line width must be positive and finite, got: " + lineWidth);
- }
- this.lineWidth = lineWidth;
- }
-
- /**
- * Transforms the given point by this state's transformation matrix.
- * @param x the X coordinate
- * @param y the Y coordinate
- * @return a new {@link Point2D} with transformed coordinates
- */
- public Point2D transformPoint(double x, double y) {
- // Apply scale
- double tx = x * scaleX;
- double ty = y * scaleY;
-
- // Apply rotation (clockwise)
- double cos = Math.cos(Math.toRadians(rotationDegrees));
- double sin = Math.sin(Math.toRadians(rotationDegrees));
- double rx = tx * cos + ty * sin;
- double ry = -tx * sin + ty * cos;
-
- // Apply translation
- return new Point2D(rx + translateX, ry + translateY);
- }
-
- /**
- * Checks whether this state has any non-identity transformations.
- * @return true if translation, rotation, or scaling is applied
- */
- public boolean hasTransform() {
- return translateX != 0 || translateY != 0 ||
- rotationDegrees != 0 ||
- scaleX != 1.0 || scaleY != 1.0;
- }
-}
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/GLFramebuffer.java b/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/GLFramebuffer.java
deleted file mode 100644
index 8c9ec07..0000000
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/GLFramebuffer.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package ru.fokinatorr.sparkle.graphics.impl.gl;
-
-import ru.fokinatorr.sparkle.graphics.ARGB;
-import ru.fokinatorr.sparkle.graphics.PixelReader;
-import ru.fokinatorr.sparkle.graphics.PixelWriter;
-import ru.fokinatorr.sparkle.graphics.render.framebuffer.Framebuffer;
-
-import java.nio.ByteBuffer;
-
-import static org.lwjgl.opengl.GL46.*;
-
-/**
- * A wrapper for an OpenGL framebuffer.
- */
-public record GLFramebuffer(int fboId, int width, int height) implements Framebuffer {
-
- public GLFramebuffer {
- if (width <= 0 || height <= 0) {
- throw new IllegalArgumentException("Width and height must be positive");
- }
- }
-
- /**
- * Creates a new FBO with the given default dimensions.
- * @param width the initial width
- * @param height the initial height
- */
- public GLFramebuffer(int width, int height) {
- this(glGenFramebuffers(), width, height);
- }
-
- @Override
- public PixelReader createPixelReader() {
- ensureOpen();
- if (fboId == 0) {
- return new Accessor();
- }
- throw new UnsupportedOperationException();
- }
-
- /**
- * {@inheritDoc}
- *
- * @return {@inheritDoc}
- * @deprecated By-pixel writing to a GL buffer is much slower than using GL operations
- * directly and may not work. Prefer GL operations instead of this method.
- */
- @Override
- @Deprecated(since = "0.1-beta")
- public PixelWriter createPixelWriter() {
- ensureOpen();
- if (fboId == 0) {
- return new Accessor();
- }
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void close() {
- if (fboId != 0) {
- glDeleteFramebuffers(fboId);
- }
- }
-
- private void ensureOpen() {
- if (!glIsFramebuffer(fboId)) {
- throw new IllegalStateException("The framebuffer is closed");
- }
- }
-
- private void checkBoundsX(int x) {
- if (x >= width) {
- throw new IllegalArgumentException("X coordinate out of bounds for " + width + "x" + height + " image: " + x);
- }
- }
-
- private void checkBoundsY(int y) {
- if (y >= height) {
- throw new IllegalArgumentException("Y coordinate out of bounds for " + width + "x" + height + " image: " + y);
- }
- }
-
- private void checkBounds(int x, int y) {
- checkBoundsX(x);
- checkBoundsY(y);
- }
-
-
- // not thread-safe!
- private class Accessor implements PixelReader, PixelWriter {
-
- private final ByteBuffer byteBuffer = ByteBuffer.allocateDirect(Math.max(width, height) * Integer.BYTES);
- // can't use MemoryUtil.memAlloc since no chance to clean up (PixelReader/Writer are not closeable)
-
- private static void rgbaToArgb(ByteBuffer src, int[] dest) {
- for (int i = 0; i < dest.length; i++) {
- byte
- r = src.get(),
- g = src.get(),
- b = src.get(),
- a = src.get();
- dest[i] = ARGB.color(a, r, g, b);
- }
- }
-
- private static void argbToRgba(int argb, ByteBuffer dest) {
- dest
- .put(ARGB.red (argb))
- .put(ARGB.green(argb))
- .put(ARGB.blue (argb))
- .put(ARGB.alpha(argb))
- .flip();
- }
-
- //
-
- @Override
- public int getARGB(int x, int y) {
- ensureOpen();
- checkBounds(x, y);
- byteBuffer.limit(Integer.BYTES).rewind();
- glReadPixels(x, y, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, byteBuffer);
- return ARGB.color(
- byteBuffer.get(3),
- byteBuffer.get(0),
- byteBuffer.get(1),
- byteBuffer.get(2)
- );
- }
-
- @Override
- public int[] getRow(int y) {
- ensureOpen();
- checkBoundsY(y);
- int[] row = new int[width];
- byteBuffer.limit(width * Integer.BYTES).rewind();
- glReadPixels(0, y, width, 1, GL_RGBA, GL_UNSIGNED_BYTE, byteBuffer);
- rgbaToArgb(byteBuffer, row);
- return row;
- }
-
- @Override
- public int[] getColumn(int x) {
- ensureOpen();
- checkBoundsX(x);
- int[] column = new int[height];
- byteBuffer.limit(height * Integer.BYTES).rewind();
- glReadPixels(x, 0, 1, height, GL_RGBA, GL_UNSIGNED_BYTE, byteBuffer);
- rgbaToArgb(byteBuffer, column);
- return column;
- }
-
- @Override
- public int[][] getAll() {
- int[][] data = new int[height][width];
- byteBuffer.limit(width * Integer.BYTES).rewind();
- for (int y = 0; y < height; y++) {
- glReadPixels(0, y, width, 1, GL_RGBA, GL_UNSIGNED_BYTE, byteBuffer);
- rgbaToArgb(byteBuffer, data[y]);
- byteBuffer.rewind();
- }
- return data;
- }
-
- @Override
- public int getWidth() {
- return width;
- }
-
- @Override
- public int getHeight() {
- return height;
- }
-
- //
-
- //
-
-
- @Override
- @Deprecated(since = "0.1-beta")
- public void setARGB(int x, int y, int argb) {
- ensureOpen();
- checkBounds(x, y);
- argbToRgba(argb, byteBuffer.rewind());
- glRasterPos2i(x, height - 1 - y);
- glDrawPixels(1, 1, GL_RGBA, GL_UNSIGNED_BYTE, byteBuffer);
- }
-
- @Override
- @Deprecated(since = "0.1-beta")
- public void fillARGB(int x, int y, int w, int h, int argb) {
- ensureOpen();
- checkBounds(x, y);
- checkBounds(x + w - 1, y + h - 1);
- argbToRgba(argb, byteBuffer.rewind());
- glRasterPos2i(x, height - 1 - y);
- glDrawPixels(w, h, GL_RGBA, GL_UNSIGNED_BYTE, byteBuffer);
- }
-
- //
- }
-}
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/GLRenderCanvas.java b/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/GLRenderCanvas.java
deleted file mode 100644
index 60c621f..0000000
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/GLRenderCanvas.java
+++ /dev/null
@@ -1,697 +0,0 @@
-package ru.fokinatorr.sparkle.graphics.impl.gl;
-
-import it.unimi.dsi.fastutil.floats.*;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.FieldDefaults;
-import org.joml.Matrix4f;
-import org.lwjgl.opengl.GL46;
-import ru.fokinatorr.sparkle.effect.graphics.GraphicEffect;
-import ru.fokinatorr.sparkle.effect.graphics.GraphicEffectMap;
-import ru.fokinatorr.sparkle.graphics.ARGB;
-import ru.fokinatorr.sparkle.graphics.BlendMode;
-import ru.fokinatorr.sparkle.graphics.PixelReader;
-import ru.fokinatorr.sparkle.graphics.image.Image;
-import ru.fokinatorr.sparkle.graphics.impl.GraphicsState;
-import ru.fokinatorr.sparkle.graphics.impl.RenderCanvasExt;
-import ru.fokinatorr.sparkle.graphics.impl.gl.shader.GLShaderProgram;
-import ru.fokinatorr.sparkle.graphics.impl.gl.shader.ShaderType;
-import ru.fokinatorr.sparkle.graphics.render.RenderCanvas;
-import ru.fokinatorr.sparkle.graphics.render.framebuffer.Framebuffer;
-
-import java.awt.*;
-import java.awt.geom.Area;
-import java.awt.geom.PathIterator;
-import java.nio.ByteBuffer;
-import java.nio.FloatBuffer;
-import java.util.*;
-
-import static lombok.AccessLevel.PROTECTED;
-import static org.lwjgl.opengl.GL46.*;
-import static org.lwjgl.system.MemoryUtil.*;
-import static ru.fokinatorr.sparkle.graphics.impl.gl.ShaderLoader.loadShader;
-
-import ru.fokinatorr.sparkle.phys2d.Point2D;
-
-/**
- * An OpenGL render canvas that accepts {@link GLFramebuffer}s.
- */
-@FieldDefaults(level = PROTECTED)
-public class GLRenderCanvas implements RenderCanvasExt {
-
- final OpenGLContext parent;
- final Set autoLoadImages;
-
- final Deque stateStack = new LinkedList<>(); // Funny how Stack was effectively replaced with Deque
- GraphicsState currentState = new GraphicsState();
-
- final GLShaderProgram strokeShader;
- final GLShaderProgram fillShader;
- final GLShaderProgram imageShader;
-
- final Map textures = new WeakHashMap<>();
- GLFramebuffer fb;
-
- boolean closed;
-
-
- public GLRenderCanvas(OpenGLContext parent, Set autoLoadImages) {
- this.parent = parent;
- this.autoLoadImages = autoLoadImages;
-
- parent.makeCurrent();
- strokeShader = GLShaderProgram.compile(Map.of(
- ShaderType.VERTEX, loadShader("stroke.vert.glsl"),
- ShaderType.FRAGMENT, loadShader("stroke.frag.glsl")
- ));
- fillShader = GLShaderProgram.compile(Map.of(
- ShaderType.VERTEX, loadShader("fill.vert.glsl"),
- ShaderType.FRAGMENT, loadShader("fill.frag.glsl")
- ));
- imageShader = GLShaderProgram.compile(Map.of(
- ShaderType.VERTEX, loadShader("image.vert.glsl"),
- ShaderType.FRAGMENT, loadShader("image.frag.glsl")
- ));
- }
-
- //
-
- @Override
- public void attachTarget(Framebuffer target) {
- ensureOpen();
- if (!(target instanceof GLFramebuffer(int fboId, int width, int height))) {
- throw new IllegalArgumentException("Unsupported frame buffer type: " + target.getClass());
- }
- parent.makeCurrent();
- if (this.fb != null) this.fb.close();
- this.fb = (GLFramebuffer) target;
-
- glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fboId);
- glViewport(0, 0, width, height);
- glClearColor(1f, 1f, 1f, 0f); // transparent/white by default
-
- for (Image img : autoLoadImages) uploadImage(img);
- }
-
- @Override
- public void clear() {
- ensureOpen();
- parent.makeCurrent();
- ensureCurrentBufferBound();
- glClear(GL_COLOR_BUFFER_BIT);
- }
-
- @Override
- public void flush() {
- ensureOpen();
- parent.makeCurrent();
- ensureCurrentBufferBound();
- glFlush();
- }
-
- @Override
- public void uploadImage(Image image) {
- ensureOpen();
- parent.makeCurrent();
- ensureCurrentBufferBound();
- if (!textures.containsKey(image)) {
- image.prepare();
-
- PixelReader reader = image.createPixelReader();
- int width = reader.getWidth();
- int height = reader.getHeight();
-
- int textureId = glGenTextures();
- textures.put(image, textureId);
- glBindTexture(GL_TEXTURE_2D, textureId);
-
- ByteBuffer pixels = memAlloc(width * height * Integer.BYTES);
- int[][] data = reader.getAll();
- for (int y = 0; y < height; y++) {
- for (int x = 0; x < width; x++) {
- int argb = data[y][x];
- pixels
- .put(ARGB.red(argb))
- .put(ARGB.green(argb))
- .put(ARGB.blue(argb))
- .put(ARGB.alpha(argb));
- }
- }
- pixels.flip();
-
- glTexImage2D(
- GL_TEXTURE_2D,
- 0,
- GL_RGBA8,
- width, height,
- 0,
- GL_RGBA, GL_UNSIGNED_BYTE,
- pixels
- );
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- }
-
- }
-
- //
-
- //
-
- // Drawing methods
-
- @Override
- public void drawShape(Shape shape) {
- // Ensure openness and current context
- ensureOpen();
- parent.makeCurrent();
- ensureCurrentBufferBound();
-
- // Convert Shape to VBO
- FloatList vertices = shapeToVertices(shape);
-
- if (vertices.isEmpty()) return;
- int vbo = uploadAndBindVertices(vertices);
-
- // Set up vertex attributes & shader uniforms
- strokeShader.use();
- glEnableVertexAttribArray(0);
- glVertexAttribPointer(0, 2, GL_FLOAT, false, 0, NULL);
-
- Matrix4f modelViewProj = buildOrthoMatrix().mul(buildTransformMatrix());
- int strokeARGB = currentState.getStrokeARGB();
- float
- a = byteToFloat(ARGB.alpha(strokeARGB)) * byteToFloat(currentState.getAlpha()),
- r = byteToFloat(ARGB.red(strokeARGB)),
- g = byteToFloat(ARGB.green(strokeARGB)),
- b = byteToFloat(ARGB.blue(strokeARGB));
-
- GraphicEffectMap effects = currentState.getEffects();
-
- strokeShader
- .setUniform("u_ModelViewProj", modelViewProj)
- .setUniform("u_Color", r, g, b, a)
- .setUniform("u_HueShift", (float) effects.getDouble(GraphicEffect.HUE_SHIFT))
- .setUniform("u_Brightness", (float) effects.getDouble(GraphicEffect.BRIGHTNESS) / 100f)
- .setUniform("u_Opacity", (float) effects.getDouble(GraphicEffect.OPACITY) / 100f);
-
- // Apply blend function & draw
- glEnable(GL_BLEND);
- applyBlendFunc();
-
- glLineWidth((float) currentState.getLineWidth());
- glDrawArrays(GL_LINE_STRIP, 0, vertices.size() / 2);
-
- // Cleanup
- glDisable(GL_BLEND);
- glDisableVertexAttribArray(0);
- glDeleteBuffers(vbo);
- strokeShader.unuse(true);
- }
-
- @Override
- public void fillShape(Shape shape) {
- ensureOpen();
- parent.makeCurrent();
- ensureCurrentBufferBound();
-
- // Init common objects
- glEnable(GL_BLEND);
- applyBlendFunc();
- Matrix4f modelViewProj = buildOrthoMatrix().mul(buildTransformMatrix());
-
- // First fill...
- FloatList fillVertices = shapeToFillVertices(shape);
- if (!fillVertices.isEmpty()) {
- int vbo = uploadAndBindVertices(fillVertices);
-
- // Set up vertex attributes & shader uniforms
- fillShader.use();
- glEnableVertexAttribArray(0);
- glVertexAttribPointer(0, 2, GL_FLOAT, false, 0, NULL);
-
- int fillARGB = currentState.getFillARGB();
- float
- a = byteToFloat(ARGB.alpha(fillARGB)) * byteToFloat(currentState.getAlpha()),
- r = byteToFloat(ARGB.red(fillARGB)),
- g = byteToFloat(ARGB.green(fillARGB)),
- b = byteToFloat(ARGB.blue(fillARGB));
-
- GraphicEffectMap effects = currentState.getEffects();
-
- fillShader
- .setUniform("u_ModelViewProj", modelViewProj)
- .setUniform("u_Color", r, g, b, a)
- .setUniform("u_HueShift", (float) effects.getDouble(GraphicEffect.HUE_SHIFT))
- .setUniform("u_Brightness", (float) effects.getDouble(GraphicEffect.BRIGHTNESS) / 100f)
- .setUniform("u_Opacity", (float) effects.getDouble(GraphicEffect.OPACITY) / 100f);
-
- // Draws as triangle fan (assumes convex or simple shape). TODO replace with tessellation
- glDrawArrays(GL_TRIANGLE_FAN, 0, fillVertices.size() / 2);
-
- // Cleanup
- glDisableVertexAttribArray(0);
- glDeleteBuffers(vbo);
- fillShader.unuse(true);
- }
-
- // ...then outline
- FloatList outlineVertices = shapeToVertices(shape);
- if (!outlineVertices.isEmpty()) {
- int vbo = uploadAndBindVertices(outlineVertices);
-
- strokeShader.use();
- glEnableVertexAttribArray(0);
- glVertexAttribPointer(0, 2, GL_FLOAT, false, 0, NULL);
-
- int strokeARGB = currentState.getStrokeARGB();
- float
- a = byteToFloat(ARGB.alpha(strokeARGB)) * byteToFloat(currentState.getAlpha()),
- r = byteToFloat(ARGB.red(strokeARGB)),
- g = byteToFloat(ARGB.green(strokeARGB)),
- b = byteToFloat(ARGB.blue(strokeARGB));
-
- GraphicEffectMap effects = currentState.getEffects();
-
- strokeShader
- .setUniform("u_ModelViewProj", modelViewProj)
- .setUniform("u_Color", r, g, b, a)
- .setUniform("u_HueShift", (float) effects.getDouble(GraphicEffect.HUE_SHIFT))
- .setUniform("u_Brightness", (float) effects.getDouble(GraphicEffect.BRIGHTNESS) / 100f)
- .setUniform("u_Opacity", (float) effects.getDouble(GraphicEffect.OPACITY) / 100f);
-
- // Draw
- glLineWidth((float) currentState.getLineWidth());
- glDrawArrays(GL_LINE_STRIP, 0, outlineVertices.size() / 2);
-
- // Cleanup
- glDisableVertexAttribArray(0);
- glDeleteBuffers(vbo);
- strokeShader.unuse(true);
- }
-
- // Common cleanup
- glDisable(GL_BLEND);
- }
-
- @Override
- public void drawImage(Image image, double x, double y, double w, double h) {
- ensureOpen();
-
- // sanity checks
- if (!Double.isFinite(x) || x < 0) {
- throw new IllegalArgumentException("X coordinate must be finite and non-negative, found: " + x);
- }
- if (!Double.isFinite(y) || y < 0) {
- throw new IllegalArgumentException("Y coordinate must be finite and non-negative, found: " + y);
- }
- if (w == ORIGINAL_SIZE || h == ORIGINAL_SIZE) {
- PixelReader reader = image.createPixelReader();
- if (w == ORIGINAL_SIZE) w = reader.getWidth();
- if (h == ORIGINAL_SIZE) h = reader.getHeight();
- }
- if (!Double.isFinite(w) || w <= 0) {
- throw new IllegalArgumentException("Width must be finite and positive, found: " + w);
- }
- if (!Double.isFinite(h) || h <= 0) {
- throw new IllegalArgumentException("Height must be finite and positive, found: " + h);
- }
-
- parent.makeCurrent();
- ensureCurrentBufferBound();
- glEnable(GL_BLEND);
-
- if (!textures.containsKey(image)) {
- uploadImage(image);
- }
- int textureId = textures.get(image);
-
- // === 1. Upload Quad Geometry to GPU ===
- FloatBuffer quadVertices = memAllocFloat(16); // 4 vertices × 4 values (x,y,u,v)
- // Vertex format: x, y, u, v
-
- quadVertices
- .put((float) x).put((float) y).put(0f).put(0f) // TL
- .put((float) x).put((float) (y + h)).put(0f).put(1f) // BL
- .put((float) (x + w)).put((float) (y + h)).put(1f).put(1f) // BR
- .put((float) (x + w)).put((float) y).put(1f).put(0f) // TR
- .flip();
-
- int vbo = glGenBuffers();
- glBindBuffer(GL_ARRAY_BUFFER, vbo);
- glBufferData(GL_ARRAY_BUFFER, quadVertices, GL_DYNAMIC_DRAW);
-
- // === 2. Bind Texture ===
- glActiveTexture(GL_TEXTURE0);
- glBindTexture(GL_TEXTURE_2D, textureId);
-
- // === 3. Use Image Shader Program ===
- imageShader.use();
-
- // === 4. Set Up Vertex Attributes ===
- glEnableVertexAttribArray(0); // Position (x,y)
- glEnableVertexAttribArray(1); // TexCoord (u,v)
- glVertexAttribPointer(0, 2, GL_FLOAT, false, 4 * Float.BYTES, 0);
- glVertexAttribPointer(1, 2, GL_FLOAT, false, 4 * Float.BYTES, 2 * Float.BYTES);
-
- // === 5. Set Uniforms ===
- Matrix4f modelViewProj = buildOrthoMatrix().mul(buildTransformMatrix());
- imageShader
- .setUniform("u_ModelViewProj", modelViewProj)
- .setUniform("u_Texture", 0); // sampler2D bound to unit 0
-
- // Apply alpha and blend mode
- float alphaMult = byteToFloat(currentState.getAlpha());
- imageShader.setUniform("u_Alpha", alphaMult);
- applyBlendFunc();
-
- // Pass graphic effects
- GraphicEffectMap effects = currentState.getEffects();
- imageShader
- .setUniform("u_HueShift", (float) effects.getDouble(GraphicEffect.HUE_SHIFT))
- .setUniform("u_Bulge", (float) effects.getDouble(GraphicEffect.BULGE)) // bulge coefficient
- .setUniform("u_Whirl", (float) effects.getDouble(GraphicEffect.WHIRL)) // whirl coefficient: 0 - none, negative - whirl clockwise, positive - counter-clockwise
- .setUniform("u_SkewX", (float) effects.getDouble(GraphicEffect.SKEW_X)) // skew angle: 0 - none, negative - left, positive - right
- .setUniform("u_SkewY", (float) effects.getDouble(GraphicEffect.SKEW_Y)) // skew angle: 0 - none, negative - left, positive - right
- .setUniform("u_Mosaic", (float) effects.getDouble(GraphicEffect.MOSAIC))
- .setUniform("u_Brightness", (float) effects.getDouble(GraphicEffect.BRIGHTNESS) / 100f)
- .setUniform("u_Opacity", (float) effects.getDouble(GraphicEffect.OPACITY) / 100f)
- .setUniform("u_Pixelate", (float) effects.getDouble(GraphicEffect.PIXELATION));
-
- // === 6. Draw Quad ===
- glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-
- // === 7. Cleanup ===
- glDisable(GL_BLEND);
- glDisableVertexAttribArray(0);
- glDisableVertexAttribArray(1);
- glBindBuffer(GL_ARRAY_BUFFER, 0);
- glDeleteBuffers(vbo);
- imageShader.unuse(true);
- }
-
- @Override
- public RenderCanvas createSubCanvas(double width, double height) {
- Point2D dim = getDimensions();
- if (width > dim.x() || height > dim.y()) {
- throw new IllegalArgumentException("Width and height of a sub-canvas can't be greater than the original");
- }
- GLSubCanvas renderCanvas = new GLSubCanvas(parent, autoLoadImages);
- renderCanvas.attachTarget(new GLFramebuffer((int) width, (int) height));
- renderCanvas.clear();
- return renderCanvas;
- }
-
- // Current state management
-
- @Override
- public void translate(double dx, double dy) {
- currentState.translate(dx, dy);
- }
-
- @Override
- public void rotate(double degrees) {
- currentState.rotate(degrees);
- }
-
- @Override
- public void scale(double sx, double sy) {
- currentState.scale(sx, sy);
- }
-
- @Override
- public void setFillARGB(int argb) {
- currentState.setFillARGB(argb);
- }
-
- @Override
- public void setStrokeARGB(int argb) {
- currentState.setStrokeARGB(argb);
- }
-
- @Override
- public void setLineWidth(double width) {
- currentState.setLineWidth(width);
- }
-
- @Override
- public void setAlpha(byte alpha) {
- currentState.setAlpha(alpha);
- }
-
- @Override
- public void setBlendMode(BlendMode mode) {
- currentState.setBlendMode(mode);
- }
-
- @Override
- public void setEffects(GraphicEffectMap effects) {
- currentState.setEffects(effects);
- }
-
- @Override
- public void clip(Shape shape) {
- currentState.setClip(shape);
- }
-
- @Override
- public void resetClip() {
- currentState.setClip(null);
- }
-
- @Override
- public void save() {
- stateStack.push(currentState.copy());
- }
-
- @Override
- public void restore() {
- if (!stateStack.isEmpty()) {
- currentState = stateStack.pop();
- }
- }
-
- private static final GraphicEffectMap EMPTY = new GraphicEffectMap();
-
- @Override
- public void setIdentity() {
- currentState.setTranslateX(0);
- currentState.setTranslateY(0);
- currentState.setRotationDegrees(0);
- currentState.setScaleX(1);
- currentState.setScaleY(1);
- currentState.setFillARGB(0xFF_00_00_00);
- currentState.setStrokeARGB(0xFF_00_00_00);
- currentState.setLineWidth(1);
- currentState.setAlpha((byte) 255);
- currentState.setBlendMode(BlendMode.ADD);
- currentState.setEffects(EMPTY);
- currentState.setClip(null);
- }
-
- // Other
-
- @Override
- public Point2D getDimensions() {
- ensureOpen();
- if (fb == null) {
- throw new IllegalStateException("No buffer attached");
- }
- return fb.getDimensions();
- }
-
- @Override
- public OpenGLContext getContext() {
- return parent;
- }
-
- @Override
- public void close() {
- if (!closed) {
- textures.values().forEach(GL46::glDeleteTextures);
- textures.clear();
- strokeShader.close();
- fillShader.close();
- if (fb != null) {
- fb.close();
- fb = null;
- }
- closed = true;
- }
- }
-
- //
-
- // Private implementation
-
- private void applyBlendFunc() {
- switch (currentState.getBlendMode()) {
- case ADD -> {
- // sum all components
- glBlendFunc(GL_ONE, GL_ONE);
- glBlendEquation(GL_FUNC_ADD);
- }
- case BLEND_SUBTRACT -> {
- // Subtract all components
- glBlendFunc(GL_ONE, GL_ONE);
- glBlendEquation(GL_FUNC_REVERSE_SUBTRACT); // reversed addition - subtraction
- }
- case RGB_SUBTRACT -> {
- // Subtract RGB components, sum alpha components
- glBlendFunc(GL_ONE, GL_ONE);
- glBlendEquationSeparate(GL_FUNC_REVERSE_SUBTRACT, GL_FUNC_ADD); // reverse only RGB components
- }
- case BLEND_MULTIPLY -> {
- // multiply all components
- glBlendFunc(GL_DST_COLOR, GL_ZERO);
- glBlendEquation(GL_FUNC_ADD);
- }
- case RGB_MULTIPLY -> {
- // multiply RGB components, sum alpha components
- glBlendFuncSeparate(GL_DST_COLOR, GL_ZERO, GL_ONE, GL_ONE);
- glBlendEquation(GL_FUNC_ADD);
- }
- }
- }
-
- private FloatList shapeToVertices(Shape shape) {
- Area area = shape instanceof Area a ? a : new Area(shape);
- PathIterator itr = area.getPathIterator(null);
- double[] coords = new double[6];
- FloatList vertices = new FloatArrayList();
-
- double startX = 0, startY = 0;
- boolean isMoveTo = true;
-
- while (!itr.isDone()) {
- int type = itr.currentSegment(coords);
- switch (type) {
- case PathIterator.SEG_MOVETO:
- if (!isMoveTo) {
- // Close previous subpath by connecting to start point
- vertices.add((float) startX);
- vertices.add((float) startY);
- }
- startX = coords[0];
- startY = coords[1];
- isMoveTo = false;
- break;
-
- case PathIterator.SEG_LINETO:
- if (isMoveTo) break; // Skip degenerate segments
- vertices.add((float) coords[0]);
- vertices.add((float) coords[1]);
- break;
-
- case PathIterator.SEG_CLOSE:
- if (!isMoveTo) {
- vertices.add((float) startX);
- vertices.add((float) startY);
- }
- isMoveTo = true; // Triggers new MOVETO on next SEG_MOVETO
- break;
- }
- itr.next();
- }
-
- return vertices;
- }
-
- /**
- * Like {@link #shapeToVertices(Shape)}, but, at the end, closes the path if unclosed. This ensures
- * a closed fill area.
- */
- private FloatList shapeToFillVertices(Shape shape) {
- Area area = shape instanceof Area a ? a : new Area(shape);
- PathIterator itr = area.getPathIterator(null, 0.2); // Flatness controls curve accuracy
- double[] coords = new double[6];
- FloatList vertices = new FloatArrayList();
-
- double startX = 0, startY = 0;
- boolean isMoveTo = true;
-
- while (!itr.isDone()) {
- int type = itr.currentSegment(coords);
- switch (type) {
- case PathIterator.SEG_MOVETO:
- if (!isMoveTo) {
- // Close previous contour
- vertices.add((float) startX);
- vertices.add((float) startY);
- }
- startX = coords[0];
- startY = coords[1];
- isMoveTo = false;
- break;
-
- case PathIterator.SEG_LINETO:
- if (isMoveTo) break;
- vertices.add((float) coords[0]);
- vertices.add((float) coords[1]);
- break;
-
- case PathIterator.SEG_CLOSE:
- if (!isMoveTo) {
- vertices.add((float) startX);
- vertices.add((float) startY);
- }
- isMoveTo = true;
- break;
- }
- itr.next();
- }
-
- // Close final contour if open
- if (!isMoveTo) {
- vertices.add((float) startX);
- vertices.add((float) startY);
- }
-
- return vertices;
- }
-
- private int uploadAndBindVertices(FloatCollection vertices) {
- FloatBuffer vertexData = memAllocFloat(vertices.size());
- vertices.forEach(vertexData::put);
- vertexData.flip();
-
- int vbo = glGenBuffers();
- glBindBuffer(GL_ARRAY_BUFFER, vbo);
- glBufferData(GL_ARRAY_BUFFER, vertexData, GL_DYNAMIC_DRAW);
-
- return vbo;
- }
-
- private Matrix4f buildOrthoMatrix() {
- int w = fb.width(), h = fb.height();
- return new Matrix4f().setOrtho(0, w, h, 0, -1, 1); // Y-down to match Java2D
- }
-
- protected void ensureCurrentBufferBound() {
- glBindFramebuffer(GL_FRAMEBUFFER, fb.fboId());
- }
-
- // Helper: Build transform from GraphicsState
- private Matrix4f buildTransformMatrix() {
- Matrix4f translate = new Matrix4f().translation((float) currentState.getTranslateX(), (float) currentState.getTranslateY(), 0);
- Matrix4f rotate = new Matrix4f().rotationZ((float) Math.toRadians(-currentState.getRotationDegrees())); // Clockwise → negative angle
- Matrix4f scale = new Matrix4f().scaling((float) currentState.getScaleX(), (float) currentState.getScaleY(), 1);
- return new Matrix4f().mul(translate).mul(rotate).mul(scale);
- }
-
- /**
- * Converts a color component from unsigned byte (0 - 255) to float (0.0 - 1.0).
- *
- * @param b the color component
- */
- private static float byteToFloat(byte b) {
- return Byte.toUnsignedInt(b) / 255f;
- }
-
- protected void ensureOpen() {
- if (closed) {
- throw new IllegalStateException("This canvas is closed");
- }
- }
-}
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/GLSubCanvas.java b/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/GLSubCanvas.java
deleted file mode 100644
index 8c3a80c..0000000
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/GLSubCanvas.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package ru.fokinatorr.sparkle.graphics.impl.gl;
-
-import lombok.experimental.FieldDefaults;
-import lombok.extern.slf4j.Slf4j;
-import ru.fokinatorr.sparkle.graphics.PixelReader;
-import ru.fokinatorr.sparkle.graphics.image.Image;
-
-import java.nio.ByteBuffer;
-import java.nio.IntBuffer;
-import java.util.Set;
-
-import org.lwjgl.system.MemoryUtil;
-import ru.fokinatorr.sparkle.graphics.impl.IntBufferPixelAccessor;
-import ru.fokinatorr.sparkle.util.BufferUtils;
-
-import static lombok.AccessLevel.PRIVATE;
-import static org.lwjgl.opengl.GL46.*;
-
-/**
- * An OpenGL sub-canvas.
- */
-@Slf4j
-public class GLSubCanvas extends GLRenderCanvas {
- public GLSubCanvas(OpenGLContext parent, Set autoLoadImages) {
- super(parent, autoLoadImages);
- }
-
- private LoadedImage finalImage;
-
- @Override
- public Image getFinalImage() {
- ensureOpen();
- if (finalImage == null) {
- flush();
-
- int width = fb.width();
- int height = fb.height();
-
- ByteBuffer pixels = MemoryUtil.memAlloc(width * height * Integer.BYTES);
- parent.makeCurrent();
-
- glBindFramebuffer(GL_READ_FRAMEBUFFER, fb.fboId());
- glReadBuffer(GL_COLOR_ATTACHMENT0);
-
- glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
- pixels.rewind();
-
- flipVertically(pixels, width, height);
- while (pixels.hasRemaining()) {
- int pos = pixels.position();
- byte
- r = pixels.get(),
- g = pixels.get(),
- b = pixels.get(),
- a = pixels.get();
- pixels.position(pos)
- .put(a)
- .put(r)
- .put(g)
- .put(b);
- }
- finalImage = new LoadedImage(pixels, width, height);
- }
- return finalImage;
- }
-
- /**
- * Flips the image vertically, so that the origin is in the top-left corner for images
- * retrieved from GL.
- *
- * @param buffer the pixel data
- * @param width row width
- * @param height row count
- */
- private static void flipVertically(ByteBuffer buffer, int width, int height) {
- int rowSize = width * Integer.BYTES;
- ByteBuffer tempRow = MemoryUtil.memAlloc(rowSize);
-
- try (var _ = BufferUtils.freeing(tempRow)) {
- for (int y = 0; y < height / 2; y++) {
- int topRowStart = y * rowSize;
- int bottomRowStart = (height - y - 1) * rowSize;
-
- buffer.position(topRowStart);
- tempRow.clear();
- tempRow.put(buffer.slice().limit(rowSize));
-
- buffer.position(topRowStart);
- buffer.limit(bottomRowStart + rowSize);
- buffer.put(buffer.slice());
-
- buffer.position(bottomRowStart);
- tempRow.flip();
- buffer.put(tempRow);
- }
- }
- }
-
- @Override
- public void close() {
- if (!closed) {
- finalImage.close();
- finalImage = null;
- super.close();
- }
- }
-
- /**
- * A loaded and always prepared image.
- */
- @FieldDefaults(level = PRIVATE)
- static class LoadedImage implements Image {
- final ByteBuffer pixels;
- final IntBuffer img;
- final int width;
- final int height;
- boolean closed;
-
- public LoadedImage(ByteBuffer pixels, int width, int height) {
- this.width = width;
- this.height = height;
- this.pixels = pixels;
- img = MemoryUtil.memIntBuffer(MemoryUtil.memAddress(pixels.rewind()), pixels.capacity() / 4);
- }
-
- @Override
- public void prepare() {
- }
-
- @Override
- public boolean isReady() {
- return true;
- }
-
- @Override
- public PixelReader createPixelReader() {
- ensureOpen();
- return new IntBufferPixelAccessor(width, height, img, this::ensureOpen);
- }
-
- private void ensureOpen() {
- if (closed) {
- throw new IllegalStateException("This image is closed");
- }
- }
-
- @Override
- public void close() {
- if (!closed) {
- MemoryUtil.memFree(pixels);
- closed = true;
- }
- }
- }
-}
diff --git a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/OpenGLContext.java b/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/OpenGLContext.java
deleted file mode 100644
index 5cb124e..0000000
--- a/src/main/java/ru/fokinatorr/sparkle/graphics/impl/gl/OpenGLContext.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package ru.fokinatorr.sparkle.graphics.impl.gl;
-
-import lombok.Getter;
-import lombok.experimental.FieldDefaults;
-import lombok.extern.slf4j.Slf4j;
-import org.lwjgl.opengl.GL;
-import ru.fokinatorr.sparkle.context.AppContext;
-import ru.fokinatorr.sparkle.graphics.GraphicsManager;
-import ru.fokinatorr.sparkle.graphics.image.Image;
-import ru.fokinatorr.sparkle.graphics.impl.AbstractRenderingContext;
-import ru.fokinatorr.sparkle.graphics.impl.gl.surface.GL_GLFWWindowSurface;
-import ru.fokinatorr.sparkle.stage.Stage;
-
-import java.util.Set;
-
-import static lombok.AccessLevel.PRIVATE;
-import static org.lwjgl.glfw.GLFW.*;
-import static org.lwjgl.opengl.GL11.*;
-
-/**
- * An OpenGL rendering context bound to a GLFW window.
- *
- * This context uses the GLFW window's OpenGL context for rendering.
- */
-@Slf4j
-@FieldDefaults(makeFinal = true, level = PRIVATE)
-public class OpenGLContext extends AbstractRenderingContext {
- @Getter
- final long glfwWindow; // pointer
- @Getter
- final GLRenderCanvas canvas; // TODO implement & create!
-
- public OpenGLContext(AppContext context, GL_GLFWWindowSurface surface, Stage stage, Set