diff --git a/GREngine.Core/GREngine.Core.Sound/Game1.cs b/GREngine.Core/GREngine.Core.Sound/Game1.cs deleted file mode 100644 index 0d97c6e..0000000 --- a/GREngine.Core/GREngine.Core.Sound/Game1.cs +++ /dev/null @@ -1,51 +0,0 @@ -using Microsoft.Xna.Framework; -using Microsoft.Xna.Framework.Graphics; -using Microsoft.Xna.Framework.Input; - -namespace GREngine.Core.Sound; - -public class Game1 : Game -{ - private GraphicsDeviceManager _graphics; - private SpriteBatch _spriteBatch; - - public Game1() - { - _graphics = new GraphicsDeviceManager(this); - Content.RootDirectory = "Content"; - IsMouseVisible = true; - } - - protected override void Initialize() - { - // TODO: Add your initialization logic here - - base.Initialize(); - } - - protected override void LoadContent() - { - _spriteBatch = new SpriteBatch(GraphicsDevice); - - // TODO: use this.Content to load your game content here - } - - protected override void Update(GameTime gameTime) - { - if (GamePad.GetState(PlayerIndex.One).Buttons.Back == ButtonState.Pressed || Keyboard.GetState().IsKeyDown(Keys.Escape)) - Exit(); - - // TODO: Add your update logic here - - base.Update(gameTime); - } - - protected override void Draw(GameTime gameTime) - { - GraphicsDevice.Clear(Color.CornflowerBlue); - - // TODO: Add your drawing code here - - base.Draw(gameTime); - } -} diff --git a/GREngine.Core/GREngine.Core.System/Content/Content.mgcb b/GREngine.Core/GREngine.Core.System/Content/Content.mgcb index ddc4c36..4f03457 100644 --- a/GREngine.Core/GREngine.Core.System/Content/Content.mgcb +++ b/GREngine.Core/GREngine.Core.System/Content/Content.mgcb @@ -13,3 +13,21 @@ #---------------------------------- Content ---------------------------------# +#begin liberia.jpg +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:liberia.jpg + +#begin test.fx +/importer:EffectImporter +/processor:EffectProcessor +/processorParam:DebugMode=Auto +/build:test.fx + diff --git a/GREngine.Core/GREngine.Core.System/Content/liberia.jpg b/GREngine.Core/GREngine.Core.System/Content/liberia.jpg new file mode 100644 index 0000000..329ab67 Binary files /dev/null and b/GREngine.Core/GREngine.Core.System/Content/liberia.jpg differ diff --git a/GREngine.Core/GREngine.Core.System/Content/test.fx b/GREngine.Core/GREngine.Core.System/Content/test.fx new file mode 100644 index 0000000..e0bf981 --- /dev/null +++ b/GREngine.Core/GREngine.Core.System/Content/test.fx @@ -0,0 +1,4 @@ +testy code + + +hello diff --git a/GREngine.Core/GREngine.Core.System/GREngine.Core.System.csproj b/GREngine.Core/GREngine.Core.System/GREngine.Core.System.csproj index 041e68e..a4cc17c 100644 --- a/GREngine.Core/GREngine.Core.System/GREngine.Core.System.csproj +++ b/GREngine.Core/GREngine.Core.System/GREngine.Core.System.csproj @@ -13,4 +13,10 @@ + + + + + + diff --git a/GREngine.Core/GREngine.Core.System/SceneGraph/SceneManager.cs b/GREngine.Core/GREngine.Core.System/SceneGraph/SceneManager.cs index 7e0f320..6a95d9c 100644 --- a/GREngine.Core/GREngine.Core.System/SceneGraph/SceneManager.cs +++ b/GREngine.Core/GREngine.Core.System/SceneGraph/SceneManager.cs @@ -2,10 +2,12 @@ namespace GREngine.Core.System; using global::System; using global::System.Collections.Generic; +using global::System.IO; using global::System.Linq; using global::System.Reflection; using Microsoft.Xna.Framework; - +using Microsoft.Xna.Framework.Content; +using Microsoft.Xna.Framework.Graphics; using static GREngine.Debug.Out; public sealed partial class SceneManager : GameComponent, ISceneControllerService @@ -23,7 +25,17 @@ public sealed partial class SceneManager : GameComponent, ISceneControllerServic public SceneManager(Game game) : base(game) { + } + + public override void Initialize() + { + // Texture2D liberia = Texture2D.FromStream(this.Game.GraphicsDevice,); + // PrintLn(liberia.Bounds.ToString()); + + var assembly = typeof(GREngine.Core.System.SceneManager).GetTypeInfo().Assembly; + Stream resource = assembly.GetManifestResourceStream("GREngine.Core.System.test.fx"); + base.Initialize(); } #region MONOGAME diff --git a/Testing/Content/Content.mgcb b/Testing/Content/Content.mgcb index 948ab89..41c3d87 100644 --- a/Testing/Content/Content.mgcb +++ b/Testing/Content/Content.mgcb @@ -1,39 +1,38 @@ - -#----------------------------- Global Properties ----------------------------# - -/outputDir:bin/$(Platform) -/intermediateDir:obj/$(Platform) -/platform:DesktopGL -/config: -/profile:Reach -/compress:False - -#-------------------------------- References --------------------------------# - - -#---------------------------------- Content ---------------------------------# - -#begin collision/circle.png -/importer:TextureImporter -/processor:TextureProcessor -/processorParam:ColorKeyColor=255,0,255,255 -/processorParam:ColorKeyEnabled=True -/processorParam:GenerateMipmaps=False -/processorParam:PremultiplyAlpha=True -/processorParam:ResizeToPowerOfTwo=False -/processorParam:MakeSquare=False -/processorParam:TextureFormat=Color -/build:collision/circle.png - -#begin collision/pixel.png -/importer:TextureImporter -/processor:TextureProcessor -/processorParam:ColorKeyColor=255,0,255,255 -/processorParam:ColorKeyEnabled=True -/processorParam:GenerateMipmaps=False -/processorParam:PremultiplyAlpha=True -/processorParam:ResizeToPowerOfTwo=False -/processorParam:MakeSquare=False -/processorParam:TextureFormat=Color -/build:collision/pixel.png - + +#----------------------------- Global Properties ----------------------------# + +/outputDir:bin/$(Platform) +/intermediateDir:obj/$(Platform) +/platform:DesktopGL +/config: +/profile:Reach +/compress:False + +#-------------------------------- References --------------------------------# + +#---------------------------------- Content ---------------------------------# + +#begin collision/circle.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:collision/circle.png + +#begin collision/pixel.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:collision/pixel.png + diff --git a/Testing/SystemTesting/MyScene.cs b/Testing/SystemTesting/MyScene.cs index d884820..7d18661 100644 --- a/Testing/SystemTesting/MyScene.cs +++ b/Testing/SystemTesting/MyScene.cs @@ -1,6 +1,8 @@ namespace Testing.SystemTesting; using GREngine.Core.System; +using GREngine.Debug; +using Microsoft.Xna.Framework.Graphics; public class MyScene : Scene {