-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Deprecate CursorLoader and delete it from Desktop.cfg file #2742
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
mondogo24
wants to merge
15
commits into
jMonkeyEngine:master
Choose a base branch
from
mondogo24:refactor/deprecate-CursorLoader
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
9dfb1a3
Deprecate CursorLoader
mondogo24 e78b01e
Drop Desktop.cfg file and change references for General.cfg
mondogo24 7b0ff9d
Javadoc improvements in CursorLoader
mondogo24 dd3335c
Revert "Drop Desktop.cfg file and change references for General.cfg"
mondogo24 ba7e586
Adapted TestCursor for the deprecation of CursorLoader
mondogo24 85de977
feature: CursorConverter now support cursor animations
mondogo24 23ab1e7
Merge branch 'master' into refactor/deprecate-CursorLoader
mondogo24 b9e60e1
doc: update CursorLoader deprecation javadoc
mondogo24 ba390ac
Fix cached assets related problems
mondogo24 40ffe74
Deleted manual null checks in CursorConverter
mondogo24 ee832ce
Fix misspell mistake: from 'applyed' to 'applied'
mondogo24 db22e58
Add Flip() to IntBuffer data and swap reduce() with a for loop
mondogo24 14c41e7
Fix some spelling/grammar issues in javadoc and error messages
mondogo24 596ea87
Update lincense disclaimer and javadoc in TestCursor
mondogo24 e002d5d
Added missing extra information in license disclaimer
mondogo24 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| INCLUDE com/jme3/asset/General.cfg | ||
|
|
||
| # Desktop-specific loaders | ||
| LOADER com.jme3.cursors.plugins.CursorLoader : ani, cur, ico | ||
185 changes: 185 additions & 0 deletions
185
jme3-core/src/plugins/java/com/jme3/cursors/plugins/CursorConverter.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,185 @@ | ||
| /* | ||
| * Copyright (c) 2009-2026 jMonkeyEngine | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are | ||
| * met: | ||
| * | ||
| * * Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * | ||
| * * Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * * Neither the name of 'jMonkeyEngine' nor the names of its contributors | ||
| * may be used to endorse or promote products derived from this software | ||
| * without specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | ||
| * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | ||
| * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | ||
| * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | ||
| * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | ||
| * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | ||
| * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||
| * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
| package com.jme3.cursors.plugins; | ||
|
|
||
| import java.nio.IntBuffer; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import com.jme3.math.ColorRGBA; | ||
| import com.jme3.texture.Image; | ||
| import com.jme3.texture.Texture2D; | ||
| import com.jme3.texture.image.ImageRaster; | ||
| import com.jme3.util.BufferUtils; | ||
|
|
||
| /** | ||
| * Convert any image like object to a {@link JmeCursor}. | ||
| */ | ||
| public class CursorConverter { | ||
| /** | ||
| * Convert a {@link Texture2D} to a {@link JmeCursor}. The coordinate system used is the same specified | ||
| * in {@link JmeCursor}. The start point is 0, 0 being lower left. | ||
| * | ||
| * @param cursorImage The texture to convert. No modifications will be applied. | ||
| * | ||
| * @return The {@link JmeCursor} using a deep copy of {@link Texture2D.getImage}. | ||
| */ | ||
| public static JmeCursor fromTexture(Texture2D cursorImage) { | ||
| Image image = cursorImage.getImage().clone(); | ||
|
Comment on lines
+52
to
+58
|
||
|
|
||
| int imageHeight = image.getHeight(); | ||
| int imageWidth = image.getWidth(); | ||
|
|
||
| IntBuffer adaptedImageData = getDataAsIntBuffer(image); | ||
|
|
||
| JmeCursor jmeCursor = new JmeCursor(); | ||
| jmeCursor.setWidth(imageWidth); | ||
| jmeCursor.setHeight(imageHeight); | ||
| jmeCursor.setxHotSpot(0); | ||
| jmeCursor.setyHotSpot(imageHeight); | ||
|
Comment on lines
+68
to
+69
|
||
| jmeCursor.setNumImages(1); | ||
| jmeCursor.setImagesDelay(null); | ||
| jmeCursor.setImagesData(adaptedImageData); | ||
| return jmeCursor; | ||
| } | ||
|
|
||
| private static IntBuffer getDataAsIntBuffer(Image image) { | ||
| int width = image.getWidth(); | ||
| int height = image.getHeight(); | ||
|
|
||
| ImageRaster raster = ImageRaster.create(image); | ||
|
|
||
| IntBuffer data = BufferUtils.createIntBuffer(width * height); | ||
|
|
||
| //ARGB color system is needed to show cursors correctly. | ||
| for (int y = 0; y < height; y++) { | ||
| for (int x = 0; x < width; x++) { | ||
| ColorRGBA color = raster.getPixel(x, y); | ||
|
|
||
| int a = (int) (color.a * 255) & 0xFF; | ||
| int r = (int) (color.r * 255) & 0xFF; | ||
| int g = (int) (color.g * 255) & 0xFF; | ||
| int b = (int) (color.b * 255) & 0xFF; | ||
|
|
||
| int argb = (a << 24) | (r << 16) | (g << 8) | b; | ||
|
|
||
| data.put(argb); | ||
| } | ||
| } | ||
|
|
||
| data.flip(); | ||
| return data; | ||
| } | ||
|
|
||
| /** | ||
| * Convert a {@link Texture2D} array to a {@link JmeCursor} object that will represent an animated cursor, | ||
| * interpreting each {@link Texture2D} object as a frame of the animated cursor. | ||
| * The coordinate system used for each frame is the same specified in {@link JmeCursor}. The start point | ||
| * is 0, 0 being lower left. | ||
| * | ||
| * @param frameDelay The time delay that will take for a cursor to change from one frame to another. | ||
| * @param cursorFrames The frames that will make up the cursor animation. No modifications will be applied. | ||
| * | ||
| * @return A {@link JmeCursor} object that contains the data for an animated cursor. | ||
| */ | ||
| public static JmeCursor fromTextureFrames(int frameDelay, Texture2D[] cursorFrames) { | ||
| int[] frameRates = new int[cursorFrames.length]; | ||
| Arrays.fill(frameRates, frameDelay); | ||
| return fromTextureFrames(frameRates, cursorFrames); | ||
| } | ||
|
|
||
| /** | ||
| * Convert a {@link Texture2D} array to a {@link JmeCursor} object that will represent an animated cursor, | ||
| * interpreting each {@link Texture2D} object as a frame of the animated cursor. | ||
| * The coordinate system used for each frame is the same specified in {@link JmeCursor}. The start point | ||
| * is 0, 0 being lower left. | ||
| * | ||
| * @param frameDelays The time delay that will take each frame to change to the next frame. Because of it, | ||
| * it must contains as many delays as frames (lengths of cursorFrames and frameDelays | ||
| * arrays must be equal). | ||
| * @param cursorFrames The frames that will make up the cursor animation. No modifications will be applied. | ||
| * | ||
| * @return A {@link JmeCursor} object that contains the data for an animated cursor. | ||
| */ | ||
| public static JmeCursor fromTextureFrames(int[] frameDelays, Texture2D[] cursorFrames) { | ||
| if (frameDelays.length != cursorFrames.length) { | ||
| throw new IllegalArgumentException("The lengths of cursorFrames and frameDelays arrays must be equal"); | ||
| } | ||
|
|
||
| List<Image> imageFrames = Arrays.stream(cursorFrames) | ||
| //Avoid working and accidentally modifying original values | ||
| .map((frame) -> frame.getImage().clone()) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| List<Integer> imageFrameHeights = imageFrames | ||
| .stream() | ||
| .map((image) -> image.getHeight()) | ||
| .distinct() | ||
| .collect(Collectors.toList()); | ||
|
|
||
| List<Integer> imageFrameWidths = imageFrames | ||
| .stream() | ||
| .map((image) -> image.getWidth()) | ||
| .distinct() | ||
| .collect(Collectors.toList()); | ||
|
|
||
| if (imageFrameHeights.size() > 1 || imageFrameWidths.size() > 1) { | ||
| throw new IllegalArgumentException("Some images from the Texture2D objects have different sizes"); | ||
| } | ||
|
|
||
| int imageHeight = imageFrameHeights.get(0); | ||
| int imageWidth = imageFrameWidths.get(0); | ||
|
|
||
| IntBuffer imagesData = BufferUtils.createIntBuffer(imageHeight * imageWidth * cursorFrames.length); | ||
|
|
||
| List<IntBuffer> framesData = imageFrames | ||
| .stream() | ||
| .map((image) -> getDataAsIntBuffer(image)) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| for (IntBuffer frameData : framesData) { | ||
| imagesData.put(frameData); | ||
| } | ||
| imagesData.flip(); | ||
|
|
||
| JmeCursor jmeCursor = new JmeCursor(); | ||
| jmeCursor.setWidth(imageWidth); | ||
| jmeCursor.setHeight(imageHeight); | ||
| jmeCursor.setxHotSpot(0); | ||
| jmeCursor.setyHotSpot(imageHeight); | ||
| jmeCursor.setNumImages(cursorFrames.length); | ||
| jmeCursor.setImagesDelay(BufferUtils.createIntBuffer(frameDelays)); | ||
| jmeCursor.setImagesData(imagesData); | ||
| return jmeCursor; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file added
BIN
+697 Bytes
jme3-testdata/src/main/resources/Textures/Cursors/monkey/frame_0001.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+707 Bytes
jme3-testdata/src/main/resources/Textures/Cursors/monkey/frame_0002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+699 Bytes
jme3-testdata/src/main/resources/Textures/Cursors/monkey/frame_0003.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+695 Bytes
jme3-testdata/src/main/resources/Textures/Cursors/monkey/frame_0004.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+685 Bytes
jme3-testdata/src/main/resources/Textures/Cursors/monkey/frame_0005.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+656 Bytes
jme3-testdata/src/main/resources/Textures/Cursors/monkey/frame_0006.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.