Fix debugFrames check and Window#icons type
This commit is contained in:
parent
643bda6c28
commit
f6c99b66e8
3 changed files with 8 additions and 8 deletions
|
@ -109,7 +109,7 @@ public final class GlfwWindow extends Window {
|
|||
* @throws Exception stuff thrown by the {@link #initializeWindow()} and {@link #render()} methods of the implementing windowing API
|
||||
* @since v1-alpha2
|
||||
*/
|
||||
public GlfwWindow(@NotNull String name, @NotNull String title, @Nullable Path @NotNull [] icons, @NotNull Vec2i size, @NotNull Vec2i minimumSize, @NotNull Vec2i maximumSize, @NotNull Vec2i position, @NotNull WindowMode windowMode, @NotNull Monitor monitor, boolean resizable, boolean borderless, boolean focusable, boolean onTop, boolean transparent, boolean rendering) throws Exception {
|
||||
public GlfwWindow(@NotNull String name, @NotNull String title, @NotNull Path @Nullable [] icons, @NotNull Vec2i size, @NotNull Vec2i minimumSize, @NotNull Vec2i maximumSize, @NotNull Vec2i position, @NotNull WindowMode windowMode, @NotNull Monitor monitor, boolean resizable, boolean borderless, boolean focusable, boolean onTop, boolean transparent, boolean rendering) throws Exception {
|
||||
super(name, title, icons, size, minimumSize, maximumSize, position, windowMode, monitor, resizable, borderless, focusable, onTop, transparent, rendering);
|
||||
}
|
||||
|
||||
|
@ -356,7 +356,7 @@ public final class GlfwWindow extends Window {
|
|||
/** {@inheritDoc} */
|
||||
@ApiStatus.Experimental
|
||||
@Override
|
||||
public void setIcons(@Nullable Path @NotNull [] icons) {
|
||||
public void setIcons(@NotNull Path @Nullable [] icons) {
|
||||
getLogger().warn("GlfwWindow#setIcons is experimental and may cause engine or JVM crashes. Here be dragons!");
|
||||
|
||||
// Ensure the window is not terminated
|
||||
|
|
|
@ -222,7 +222,7 @@ public abstract class Window implements AutoCloseable {
|
|||
* @since v1-alpha6
|
||||
*/
|
||||
@Setter
|
||||
private @Nullable Path @NotNull [] icons;
|
||||
private @NotNull Path @Nullable [] icons;
|
||||
|
||||
/**
|
||||
* Contains the size of this window.
|
||||
|
@ -508,7 +508,7 @@ public abstract class Window implements AutoCloseable {
|
|||
* @throws Exception stuff thrown by the {@link #initializeWindow()} and {@link #render()} methods of the implementing windowing API
|
||||
* @since v1-alpha2
|
||||
*/
|
||||
protected Window(@NotNull String name, @NotNull String title, @Nullable Path @NotNull [] icons, @NotNull Vec2i size, @NotNull Vec2i minimumSize, @NotNull Vec2i maximumSize, @NotNull Vec2i position, @NotNull WindowMode windowMode, @NotNull Monitor monitor, boolean resizable, boolean borderless, boolean focusable, boolean onTop, boolean transparent, boolean rendering) throws Exception {
|
||||
protected Window(@NotNull String name, @NotNull String title, @NotNull Path @Nullable [] icons, @NotNull Vec2i size, @NotNull Vec2i minimumSize, @NotNull Vec2i maximumSize, @NotNull Vec2i position, @NotNull WindowMode windowMode, @NotNull Monitor monitor, boolean resizable, boolean borderless, boolean focusable, boolean onTop, boolean transparent, boolean rendering) throws Exception {
|
||||
// Initialize variables
|
||||
this.uniqueIdentifier = UUID.randomUUID();
|
||||
this.name = name;
|
||||
|
@ -657,7 +657,7 @@ public abstract class Window implements AutoCloseable {
|
|||
* @see Window#icons
|
||||
* @since v1-alpha6
|
||||
*/
|
||||
private @Nullable Path @NotNull [] icons = null;
|
||||
private @NotNull Path @Nullable [] icons = null;
|
||||
|
||||
/**
|
||||
* Contains the window size.
|
||||
|
@ -849,7 +849,7 @@ public abstract class Window implements AutoCloseable {
|
|||
* @see Window#icons
|
||||
* @since v1-alpha6
|
||||
*/
|
||||
public @Nullable Path @NotNull [] getIcons() {
|
||||
public @NotNull Path @Nullable [] getIcons() {
|
||||
return icons;
|
||||
}
|
||||
|
||||
|
@ -1020,7 +1020,7 @@ public abstract class Window implements AutoCloseable {
|
|||
* @see Window#icons
|
||||
* @since v1-alpha6
|
||||
*/
|
||||
public @NotNull Builder setIcons(@Nullable Path @NotNull [] icons) {
|
||||
public @NotNull Builder setIcons(@NotNull Path @Nullable [] icons) {
|
||||
this.icons = icons;
|
||||
return this;
|
||||
}
|
||||
|
|
|
@ -101,7 +101,7 @@ public abstract class ApiManagementClass {
|
|||
// Check if delta time and frame count shall be printed to console.
|
||||
// Unless this code is ran 292 billion years into the future,
|
||||
// this should sufficiently disable the reporting feature.
|
||||
if (WindowingSubsystemConfiguration.getInstance().isDebugFrames())
|
||||
if (!WindowingSubsystemConfiguration.getInstance().isDebugFrames())
|
||||
reportDuration = Long.MAX_VALUE;
|
||||
|
||||
// Run while the 'output' is empty
|
||||
|
|
Loading…
Reference in a new issue