chore: Engine Update
This commit is contained in:
		
							
								
								
									
										2
									
								
								Engine
									
									
									
									
									
								
							
							
								
								
								
								
								
							
						
						
									
										2
									
								
								Engine
									
									
									
									
									
								
							 Submodule Engine updated: d75bae802a...12bbfdceaf
									
								
							| @@ -25,6 +25,7 @@ | |||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <ProjectReference Include="..\Engine\Engine.Core\Engine.Core.csproj" /> |     <ProjectReference Include="..\Engine\Engine.Core\Engine.Core.csproj" /> | ||||||
|     <ProjectReference Include="..\Engine\Engine.Input\Engine.Input.csproj" /> |     <ProjectReference Include="..\Engine\Engine.Input\Engine.Input.csproj" /> | ||||||
|  |     <ProjectReference Include="..\Engine\Engine.Graphics\Engine.Graphics.csproj" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
|   <Target Name="RestoreDotnetTools" BeforeTargets="Restore"> |   <Target Name="RestoreDotnetTools" BeforeTargets="Restore"> | ||||||
|     <Message Text="Restoring dotnet tools" Importance="High" /> |     <Message Text="Restoring dotnet tools" Importance="High" /> | ||||||
|   | |||||||
| @@ -5,7 +5,7 @@ using Microsoft.Xna.Framework.Input; | |||||||
| using Pong.Behaviours; | using Pong.Behaviours; | ||||||
| using Syntriax.Engine.Core; | using Syntriax.Engine.Core; | ||||||
| using Syntriax.Engine.Core.Abstract; | using Syntriax.Engine.Core.Abstract; | ||||||
| using Syntriax.Engine.Core.Behaviours; | using Syntriax.Engine.Graphics.TwoDimensional; | ||||||
| using Syntriax.Engine.Input; | using Syntriax.Engine.Input; | ||||||
|  |  | ||||||
| namespace Pong; | namespace Pong; | ||||||
| @@ -40,8 +40,7 @@ public class Game1 : Game | |||||||
|         _spriteBatch = new SpriteBatch(GraphicsDevice); |         _spriteBatch = new SpriteBatch(GraphicsDevice); | ||||||
|  |  | ||||||
|         Texture2D texture2D = Content.Load<Texture2D>("Sprites/Pixel"); |         Texture2D texture2D = Content.Load<Texture2D>("Sprites/Pixel"); | ||||||
|         Sprite spriteRight = new Sprite() { Texture2D = texture2D, Color = Color.Gold }; |         Sprite sprite = new Sprite() { Texture2D = texture2D }; | ||||||
|         Sprite spriteLeft = new Sprite() { Texture2D = texture2D, Color = Color.AliceBlue }; |  | ||||||
|  |  | ||||||
|         gameObjectLeft = gameManager.InstantiateGameObject<GameObject>(); |         gameObjectLeft = gameManager.InstantiateGameObject<GameObject>(); | ||||||
|         gameObjectLeft.Name = "Left"; |         gameObjectLeft.Name = "Left"; | ||||||
| @@ -49,7 +48,7 @@ public class Game1 : Game | |||||||
|         gameObjectLeft.Transform.Scale = new Vector2(Window.ClientBounds.Width * .02f, Window.ClientBounds.Height * .15f); |         gameObjectLeft.Transform.Scale = new Vector2(Window.ClientBounds.Width * .02f, Window.ClientBounds.Height * .15f); | ||||||
|         gameObjectLeft.BehaviourController.AddBehaviour<KeyboardInputsBehaviour>(); |         gameObjectLeft.BehaviourController.AddBehaviour<KeyboardInputsBehaviour>(); | ||||||
|         gameObjectLeft.BehaviourController.AddBehaviour<MovementBehaviour>(Keys.S, Keys.W, 200f); |         gameObjectLeft.BehaviourController.AddBehaviour<MovementBehaviour>(Keys.S, Keys.W, 200f); | ||||||
|         gameObjectLeft.BehaviourController.AddBehaviour<DrawableSpriteBehaviour>().Assign(spriteLeft); |         gameObjectLeft.BehaviourController.AddBehaviour<DisplayableSpriteBehaviour>(Color.Gold, null, null, null).Assign(sprite); | ||||||
|  |  | ||||||
|         gameObjectRight = gameManager.InstantiateGameObject<GameObject>(); |         gameObjectRight = gameManager.InstantiateGameObject<GameObject>(); | ||||||
|         gameObjectRight.Name = "Right"; |         gameObjectRight.Name = "Right"; | ||||||
| @@ -57,7 +56,7 @@ public class Game1 : Game | |||||||
|         gameObjectRight.Transform.Scale = new Vector2(Window.ClientBounds.Width * .02f, Window.ClientBounds.Height * .15f); |         gameObjectRight.Transform.Scale = new Vector2(Window.ClientBounds.Width * .02f, Window.ClientBounds.Height * .15f); | ||||||
|         gameObjectRight.BehaviourController.AddBehaviour<KeyboardInputsBehaviour>(); |         gameObjectRight.BehaviourController.AddBehaviour<KeyboardInputsBehaviour>(); | ||||||
|         gameObjectRight.BehaviourController.AddBehaviour<MovementBehaviour>(Keys.Down, Keys.Up, 200f); |         gameObjectRight.BehaviourController.AddBehaviour<MovementBehaviour>(Keys.Down, Keys.Up, 200f); | ||||||
|         gameObjectRight.BehaviourController.AddBehaviour<DrawableSpriteBehaviour>().Assign(spriteRight); |         gameObjectRight.BehaviourController.AddBehaviour<DisplayableSpriteBehaviour>(Color.AliceBlue, null, null, null).Assign(sprite); | ||||||
|         // TODO: use this.Content to load your game content here |         // TODO: use this.Content to load your game content here | ||||||
|     } |     } | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										14
									
								
								Pong.sln
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								Pong.sln
									
									
									
									
									
								
							| @@ -9,6 +9,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Engine.Core", "Engine\Engin | |||||||
| EndProject | EndProject | ||||||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Game", "Game\Game.csproj", "{500E1B05-39D7-4232-8051-E7351D745306}" | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Game", "Game\Game.csproj", "{500E1B05-39D7-4232-8051-E7351D745306}" | ||||||
| EndProject | EndProject | ||||||
|  | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Engine.Input", "Engine\Engine.Input\Engine.Input.csproj", "{7EED4EC3-79D5-4C6C-A54D-1B396213C0E4}" | ||||||
|  | EndProject | ||||||
|  | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Engine.Graphics", "Engine\Engine.Graphics\Engine.Graphics.csproj", "{7371D9AF-6F4D-4F05-8458-197C4EE66B01}" | ||||||
|  | EndProject | ||||||
| Global | Global | ||||||
| 	GlobalSection(SolutionConfigurationPlatforms) = preSolution | 	GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||||||
| 		Debug|Any CPU = Debug|Any CPU | 		Debug|Any CPU = Debug|Any CPU | ||||||
| @@ -26,8 +30,18 @@ Global | |||||||
| 		{500E1B05-39D7-4232-8051-E7351D745306}.Debug|Any CPU.Build.0 = Debug|Any CPU | 		{500E1B05-39D7-4232-8051-E7351D745306}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||||||
| 		{500E1B05-39D7-4232-8051-E7351D745306}.Release|Any CPU.ActiveCfg = Release|Any CPU | 		{500E1B05-39D7-4232-8051-E7351D745306}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||||||
| 		{500E1B05-39D7-4232-8051-E7351D745306}.Release|Any CPU.Build.0 = Release|Any CPU | 		{500E1B05-39D7-4232-8051-E7351D745306}.Release|Any CPU.Build.0 = Release|Any CPU | ||||||
|  | 		{7EED4EC3-79D5-4C6C-A54D-1B396213C0E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||||||
|  | 		{7EED4EC3-79D5-4C6C-A54D-1B396213C0E4}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||||||
|  | 		{7EED4EC3-79D5-4C6C-A54D-1B396213C0E4}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||||||
|  | 		{7EED4EC3-79D5-4C6C-A54D-1B396213C0E4}.Release|Any CPU.Build.0 = Release|Any CPU | ||||||
|  | 		{7371D9AF-6F4D-4F05-8458-197C4EE66B01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||||||
|  | 		{7371D9AF-6F4D-4F05-8458-197C4EE66B01}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||||||
|  | 		{7371D9AF-6F4D-4F05-8458-197C4EE66B01}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||||||
|  | 		{7371D9AF-6F4D-4F05-8458-197C4EE66B01}.Release|Any CPU.Build.0 = Release|Any CPU | ||||||
| 	EndGlobalSection | 	EndGlobalSection | ||||||
| 	GlobalSection(NestedProjects) = preSolution | 	GlobalSection(NestedProjects) = preSolution | ||||||
| 		{990CA10C-1EBB-4395-A43A-456B7029D8C9} = {F7F62670-237A-4C93-A30E-CE661C6FC401} | 		{990CA10C-1EBB-4395-A43A-456B7029D8C9} = {F7F62670-237A-4C93-A30E-CE661C6FC401} | ||||||
|  | 		{7EED4EC3-79D5-4C6C-A54D-1B396213C0E4} = {F7F62670-237A-4C93-A30E-CE661C6FC401} | ||||||
|  | 		{7371D9AF-6F4D-4F05-8458-197C4EE66B01} = {F7F62670-237A-4C93-A30E-CE661C6FC401} | ||||||
| 	EndGlobalSection | 	EndGlobalSection | ||||||
| EndGlobal | EndGlobal | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user