-
Notifications
You must be signed in to change notification settings - Fork 14
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
Reduce garbage produced every update #38
Open
klianc09
wants to merge
3
commits into
libgdx:master
Choose a base branch
from
klianc09:master
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.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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 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 |
---|---|---|
|
@@ -4,6 +4,7 @@ | |
import com.badlogic.gdx.controllers.ControllerListener; | ||
import com.badlogic.gdx.controllers.ControllerMapping; | ||
import com.badlogic.gdx.controllers.ControllerPowerLevel; | ||
import com.badlogic.gdx.utils.IntFloatMap; | ||
import com.badlogic.gdx.utils.IntMap; | ||
import com.badlogic.gdx.utils.Logger; | ||
import com.badlogic.gdx.utils.TimeUtils; | ||
|
@@ -18,20 +19,23 @@ public class JamepadController implements Controller { | |
private static final IntMap<ControllerButton> CODE_TO_BUTTON = new IntMap<>(ControllerButton.values().length); | ||
private static final IntMap<ControllerAxis> CODE_TO_AXIS = new IntMap<>(ControllerAxis.values().length); | ||
private static final Logger logger = new Logger(JamepadController.class.getSimpleName()); | ||
// ControllerButton.values() and ControllerAxis.values() is cached once, to avoid producing garbage every frame | ||
private static final ControllerButton[] CONTROLLER_BUTTON_VALUES = ControllerButton.values(); | ||
private static final ControllerAxis[] CONTROLLER_AXIS_VALUES = ControllerAxis.values(); | ||
|
||
static { | ||
for (ControllerButton button : ControllerButton.values()) { | ||
for (ControllerButton button : CONTROLLER_BUTTON_VALUES) { | ||
CODE_TO_BUTTON.put(button.ordinal(), button); | ||
} | ||
|
||
for (ControllerAxis axis : ControllerAxis.values()) { | ||
for (ControllerAxis axis : CONTROLLER_AXIS_VALUES) { | ||
CODE_TO_AXIS.put(axis.ordinal(), axis); | ||
} | ||
} | ||
|
||
private final CompositeControllerListener compositeControllerListener = new CompositeControllerListener(); | ||
private final IntMap<Boolean> buttonState = new IntMap<>(); | ||
private final IntMap<Float> axisState = new IntMap<>(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Libgdx has IntFloatMap which you can use to achieve this There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nice, that's what I was looking for. Thx! |
||
private final IntFloatMap axisState = new IntFloatMap(); | ||
private final String uuid; | ||
private final String name; | ||
private ControllerIndex controllerIndex; | ||
|
@@ -128,11 +132,11 @@ private ControllerAxis toAxis(int axisCode) { | |
} | ||
|
||
private void updateAxisState() { | ||
for (ControllerAxis axis : ControllerAxis.values()) { | ||
for (ControllerAxis axis : CONTROLLER_AXIS_VALUES) { | ||
int id = axis.ordinal(); | ||
|
||
float value = getAxis(id); | ||
if (value != axisState.get(id)) { | ||
if (value != axisState.get(id, 0)) { | ||
if (logger.getLevel() == Logger.DEBUG) { | ||
logger.debug("Axis [" + id + " - " + toAxis(id) + "] moved [" + value + "]"); | ||
} | ||
|
@@ -143,7 +147,7 @@ private void updateAxisState() { | |
} | ||
|
||
private void updateButtonsState() { | ||
for (ControllerButton button : ControllerButton.values()) { | ||
for (ControllerButton button : CONTROLLER_BUTTON_VALUES) { | ||
int id = button.ordinal(); | ||
|
||
boolean pressed = getButton(id); | ||
|
@@ -163,11 +167,11 @@ private void updateButtonsState() { | |
} | ||
|
||
private void initializeState() { | ||
for (ControllerAxis axis : ControllerAxis.values()) { | ||
axisState.put(axis.ordinal(), 0.0f); | ||
for (ControllerAxis axis : CONTROLLER_AXIS_VALUES) { | ||
axisState.put(axis.ordinal(), 0); | ||
} | ||
|
||
for (ControllerButton button : ControllerButton.values()) { | ||
for (ControllerButton button : CONTROLLER_BUTTON_VALUES) { | ||
buttonState.put(button.ordinal(), false); | ||
} | ||
} | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add a comment why this is done so people only reading the code know there were performance issues
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, good idea, can do!