From c4721581fdc0b21178c907ec28955c43751158e0 Mon Sep 17 00:00:00 2001 From: Robert Vokac Date: Fri, 20 Dec 2024 20:22:45 +0100 Subject: [PATCH] Changes --- .../jxna/Microsoft/Xna/Framework/Color.java | 9 +++++++-- .../Xna/Framework/Content/ContentManager.java | 2 +- .../jxna/Microsoft/Xna/Framework/Game.java | 3 +++ .../Xna/Framework/Graphics/BlendState.java | 4 ++-- .../Xna/Framework/Graphics/SpriteBatch.java | 12 ++++++++---- .../Xna/Framework/Graphics/Texture2D.java | 18 +++++++++++++++++- .../Xna/Framework/Graphics/Viewport.java | 4 ++-- .../Xna/Framework/Input/GamePadButtons.java | 4 ++-- .../Xna/Framework/Input/GamePadState.java | 4 ++-- .../Xna/Framework/Input/KeyboardState.java | 4 ++-- .../Xna/Framework/Input/MouseState.java | 4 ++-- .../Framework/Input/Touch/TouchCollection.java | 4 ++-- .../Framework/Input/Touch/TouchLocation.java | 4 ++-- .../Input/Touch/TouchPanelCapabilities.java | 4 ++-- .../Microsoft/Xna/Framework/Rectangle.java | 2 +- .../jxna/Microsoft/Xna/Framework/Vector2.java | 4 ++-- 16 files changed, 57 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Color.java b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Color.java index 4aa0b92..0e50fb7 100644 --- a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Color.java +++ b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Color.java @@ -4,19 +4,24 @@ */ package com.openeggbert.jxna.Microsoft.Xna.Framework; -import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.Struct; +import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.struct; import com.openeggbert.jdotnet.System.uint; /** * * @author robertvokac */ -public class Color extends Struct { +public class Color extends struct { public static final Color CornflowerBlue; public static final Color White; private long _packedValue; + public static Color FromNonPremultiplied(int r, int g, int b, int a) { + return null; + //todo + } + static { CornflowerBlue = new Color(4293760356l); White = new Color(uint.MaxValue); diff --git a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Content/ContentManager.java b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Content/ContentManager.java index 8f1eb6f..e93fcf5 100644 --- a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Content/ContentManager.java +++ b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Content/ContentManager.java @@ -11,7 +11,7 @@ import com.openeggbert.jdotnet.System.IDisposable; * @author robertvokac */ public abstract class ContentManager implements IDisposable { - public abstract T Load(String assetName); + public abstract T Load(String assetName, Class type); public String getRootDirectory() { return ""; //todo diff --git a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Game.java b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Game.java index 7ae2adc..8041123 100644 --- a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Game.java +++ b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Game.java @@ -72,5 +72,8 @@ public class Game { return null; //todo } + public void Run() { + //todo + } } diff --git a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Graphics/BlendState.java b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Graphics/BlendState.java index d575c83..e7da5c8 100644 --- a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Graphics/BlendState.java +++ b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Graphics/BlendState.java @@ -4,14 +4,14 @@ */ package com.openeggbert.jxna.Microsoft.Xna.Framework.Graphics; -import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.Readonly; +import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.readonly; /** * * @author robertvokac */ public class BlendState extends GraphicsResource{ - public static @Readonly final BlendState AlphaBlend = new BlendState("BlendState.AlphaBlend", Blend.One, Blend.InverseSourceAlpha); + public static @readonly final BlendState AlphaBlend = new BlendState("BlendState.AlphaBlend", Blend.One, Blend.InverseSourceAlpha); private BlendState(String blendStateAlphaBlend, Blend blend, Blend blend0) { throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody diff --git a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Graphics/SpriteBatch.java b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Graphics/SpriteBatch.java index 10cb67f..71ab3dd 100644 --- a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Graphics/SpriteBatch.java +++ b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Graphics/SpriteBatch.java @@ -4,9 +4,10 @@ */ package com.openeggbert.jxna.Microsoft.Xna.Framework.Graphics; -import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.Nullable; import com.openeggbert.jxna.Microsoft.Xna.Framework.Color; import com.openeggbert.jxna.Microsoft.Xna.Framework.Rectangle; +import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.nullable; +import com.openeggbert.jxna.Microsoft.Xna.Framework.Vector2; /** * @@ -27,10 +28,13 @@ public class SpriteBatch extends GraphicsResource { throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody } - public void Draw(Texture2D texture, Rectangle destinationRectangle, @Nullable Rectangle sourceRectangle, Color color) { - - } + public void Draw(Texture2D texture, Rectangle destinationRectangle, @nullable Rectangle sourceRectangle, Color color) { + } + + public void Draw(Texture2D texture, Rectangle destinationRectangle, @nullable Rectangle sourceRectangle, Color color, float rotation, Vector2 origin, SpriteEffects effects, float layerDepth) { + + } public void End() { throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody diff --git a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Graphics/Texture2D.java b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Graphics/Texture2D.java index 2fca7cd..cdcfcd5 100644 --- a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Graphics/Texture2D.java +++ b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Graphics/Texture2D.java @@ -4,10 +4,26 @@ */ package com.openeggbert.jxna.Microsoft.Xna.Framework.Graphics; +import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.internal; +import com.openeggbert.jxna.Microsoft.Xna.Framework.Rectangle; + /** * * @author robertvokac */ -public class Texture2D { +public class Texture2D extends Texture{ + + private @internal int width; + + private @internal int height; + + public Rectangle Bounds() { + return new Rectangle(0, 0, width, height); + } + + @Override + public void Dispose() { + throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody + } } diff --git a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Graphics/Viewport.java b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Graphics/Viewport.java index 8e31315..b9010b9 100644 --- a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Graphics/Viewport.java +++ b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Graphics/Viewport.java @@ -4,7 +4,7 @@ */ package com.openeggbert.jxna.Microsoft.Xna.Framework.Graphics; -import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.Struct; +import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.struct; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -16,7 +16,7 @@ import lombok.Setter; */ @AllArgsConstructor @NoArgsConstructor -public class Viewport extends Struct { +public class Viewport extends struct { @Getter @Setter diff --git a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/GamePadButtons.java b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/GamePadButtons.java index 558a9bb..9842f48 100644 --- a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/GamePadButtons.java +++ b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/GamePadButtons.java @@ -4,7 +4,7 @@ */ package com.openeggbert.jxna.Microsoft.Xna.Framework.Input; -import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.Struct; +import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.struct; import lombok.Getter; /** @@ -12,7 +12,7 @@ import lombok.Getter; * @author robertvokac */ @Getter -public class GamePadButtons extends Struct { +public class GamePadButtons extends struct { @Override public GamePadButtons copy() { diff --git a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/GamePadState.java b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/GamePadState.java index 5487d59..16ef8fa 100644 --- a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/GamePadState.java +++ b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/GamePadState.java @@ -4,14 +4,14 @@ */ package com.openeggbert.jxna.Microsoft.Xna.Framework.Input; -import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.Struct; +import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.struct; import lombok.Getter; /** * * @author robertvokac */ -public class GamePadState extends Struct{ +public class GamePadState extends struct{ @Override public GamePadState copy() { diff --git a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/KeyboardState.java b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/KeyboardState.java index 87d7e04..2739d9b 100644 --- a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/KeyboardState.java +++ b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/KeyboardState.java @@ -4,13 +4,13 @@ */ package com.openeggbert.jxna.Microsoft.Xna.Framework.Input; -import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.Struct; +import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.struct; /** * * @author robertvokac */ -public class KeyboardState extends Struct{ +public class KeyboardState extends struct{ public boolean IsKeyDown(Keys key) { return true; diff --git a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/MouseState.java b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/MouseState.java index 60fcb1a..8fdc80f 100644 --- a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/MouseState.java +++ b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/MouseState.java @@ -1,6 +1,6 @@ package com.openeggbert.jxna.Microsoft.Xna.Framework.Input; -import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.Struct; +import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.struct; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; @@ -14,7 +14,7 @@ import lombok.NoArgsConstructor; */ @AllArgsConstructor @NoArgsConstructor -public class MouseState extends Struct { +public class MouseState extends struct { private int _x; diff --git a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/Touch/TouchCollection.java b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/Touch/TouchCollection.java index f720dae..17b5002 100644 --- a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/Touch/TouchCollection.java +++ b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/Touch/TouchCollection.java @@ -4,7 +4,7 @@ */ package com.openeggbert.jxna.Microsoft.Xna.Framework.Input.Touch; -import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.Struct; +import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.struct; import com.openeggbert.jdotnet.System.Collections.Generic.List_; import java.util.Iterator; import lombok.Getter; @@ -13,7 +13,7 @@ import lombok.Getter; * * @author robertvokac */ -public class TouchCollection extends Struct implements Iterable { +public class TouchCollection extends struct implements Iterable { private List_ touches = new List_<>(); diff --git a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/Touch/TouchLocation.java b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/Touch/TouchLocation.java index 867753e..26c997b 100644 --- a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/Touch/TouchLocation.java +++ b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/Touch/TouchLocation.java @@ -4,7 +4,7 @@ */ package com.openeggbert.jxna.Microsoft.Xna.Framework.Input.Touch; -import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.Struct; +import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.struct; import com.openeggbert.jxna.Microsoft.Xna.Framework.Vector2; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; @@ -14,7 +14,7 @@ import lombok.NoArgsConstructor; * @author robertvokac */ @AllArgsConstructor @NoArgsConstructor -public class TouchLocation extends Struct { +public class TouchLocation extends struct { public int Id; public Vector2 Position; diff --git a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/Touch/TouchPanelCapabilities.java b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/Touch/TouchPanelCapabilities.java index 22bf0a0..3899756 100644 --- a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/Touch/TouchPanelCapabilities.java +++ b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Input/Touch/TouchPanelCapabilities.java @@ -4,7 +4,7 @@ */ package com.openeggbert.jxna.Microsoft.Xna.Framework.Input.Touch; -import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.Struct; +import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.struct; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; @@ -14,7 +14,7 @@ import lombok.NoArgsConstructor; */ @AllArgsConstructor @NoArgsConstructor -public class TouchPanelCapabilities extends Struct{ +public class TouchPanelCapabilities extends struct{ private boolean hasPressure; private boolean isConnected; diff --git a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Rectangle.java b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Rectangle.java index ed52375..94d2600 100644 --- a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Rectangle.java +++ b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Rectangle.java @@ -13,7 +13,7 @@ import lombok.NoArgsConstructor; */ @AllArgsConstructor @NoArgsConstructor -public class Rectangle extends com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.Struct { +public class Rectangle extends com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.struct { private static final Rectangle emptyRectangle = new Rectangle().reset(); diff --git a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Vector2.java b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Vector2.java index 4490f8e..bc706a9 100644 --- a/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Vector2.java +++ b/src/main/java/com/openeggbert/jxna/Microsoft/Xna/Framework/Vector2.java @@ -4,7 +4,7 @@ */ package com.openeggbert.jxna.Microsoft.Xna.Framework; -import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.Struct; +import com.openeggbert.jdotnet.JDotNet.CSharpKeyWords.struct; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; @@ -13,7 +13,7 @@ import lombok.NoArgsConstructor; * @author robertvokac */ @AllArgsConstructor @NoArgsConstructor -public class Vector2 extends Struct { +public class Vector2 extends struct { public float X; public float Y;