From 47ae1a0dbd1a49c5b2c219ca6c1ca2c465106697 Mon Sep 17 00:00:00 2001 From: cosmonaut Date: Mon, 11 Jan 2021 13:37:30 -0800 Subject: [PATCH] cutting everything but skybox --- KavTest.Framework.sln | 22 +++++++-- KavTest/KavTestGame.cs | 100 +---------------------------------------- 2 files changed, 20 insertions(+), 102 deletions(-) diff --git a/KavTest.Framework.sln b/KavTest.Framework.sln index 02646fd..f0b3aa3 100644 --- a/KavTest.Framework.sln +++ b/KavTest.Framework.sln @@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kav", "Kav\Kav.Framework.cs EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Smuggler", "Smuggler\Smuggler.Framework.csproj", "{06664804-2B01-46F5-B8EC-07E5E2C1EADC}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FNA", "FNA\FNA.csproj", "{35253CE1-C864-4CD3-8249-4D1319748E8F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -24,10 +26,10 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x64.ActiveCfg = Debug|Any CPU - {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x64.Build.0 = Debug|Any CPU - {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x86.ActiveCfg = Debug|Any CPU - {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x86.Build.0 = Debug|Any CPU + {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x64.ActiveCfg = Debug|x64 + {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x64.Build.0 = Debug|x64 + {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x86.ActiveCfg = Debug|x86 + {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Debug|x86.Build.0 = Debug|x86 {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|Any CPU.ActiveCfg = Release|Any CPU {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|Any CPU.Build.0 = Release|Any CPU {9ED076FA-32C3-4F1E-BB90-549B3A2FA46F}.Release|x64.ActiveCfg = Release|Any CPU @@ -58,5 +60,17 @@ Global {06664804-2B01-46F5-B8EC-07E5E2C1EADC}.Release|x64.Build.0 = Release|Any CPU {06664804-2B01-46F5-B8EC-07E5E2C1EADC}.Release|x86.ActiveCfg = Release|x86 {06664804-2B01-46F5-B8EC-07E5E2C1EADC}.Release|x86.Build.0 = Release|x86 + {35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|x64.ActiveCfg = Debug|x64 + {35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|x64.Build.0 = Debug|x64 + {35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|x86.ActiveCfg = Debug|x86 + {35253CE1-C864-4CD3-8249-4D1319748E8F}.Debug|x86.Build.0 = Debug|x86 + {35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|Any CPU.Build.0 = Debug|Any CPU + {35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|x64.ActiveCfg = Debug|Any CPU + {35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|x64.Build.0 = Debug|Any CPU + {35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|x86.ActiveCfg = Debug|Any CPU + {35253CE1-C864-4CD3-8249-4D1319748E8F}.Release|x86.Build.0 = Debug|Any CPU EndGlobalSection EndGlobal diff --git a/KavTest/KavTestGame.cs b/KavTest/KavTestGame.cs index 1bb0b94..2b2d843 100644 --- a/KavTest/KavTestGame.cs +++ b/KavTest/KavTestGame.cs @@ -30,7 +30,7 @@ namespace KavTest Window.AllowUserResizing = true; IsMouseVisible = true; - + Microsoft.Xna.Framework.Input.Mouse.IsRelativeMouseModeEXT = true; } @@ -51,7 +51,7 @@ namespace KavTest var rustyBallModel = Kav.ModelLoader.Load( GraphicsDevice, Smuggler.Importer.ImportGLB( - GraphicsDevice, + GraphicsDevice, File.OpenRead("Content/rustysphere.glb") ) ); @@ -180,90 +180,6 @@ namespace KavTest WorldBuilder.AddEngine(new DirectionalLightSpawner()); WorldBuilder.AddGeneralRenderer(new SceneRenderer(GraphicsDevice), 0); - // WorldBuilder.SendMessage(new RustyBallSpawnMessage( - // new Transform3D(new Vector3(0, 0, 0)), - // new Vector3(1, 1, -1) - // )); - - // WorldBuilder.SendMessage(new RustyBallSpawnMessage( - // new Transform3D(new Vector3(-3, 0, 0)), - // new Vector3(-1, 1, -1) - // )); - - // WorldBuilder.SendMessage(new RustyBallSpawnMessage( - // new Transform3D(new Vector3(3, 0, 0)), - // new Vector3(-1, 1, 1) - // )); - - // WorldBuilder.SendMessage(new StaticModelSpawnMessage( - // new Transform3D(new Vector3(0, 1, 0), Quaternion.Identity, new Vector3(1f, 1f, 1f)), - // rustyBallModel - // )); - - WorldBuilder.SendMessage(new StaticModelSpawnMessage( - new Transform3D(new Vector3(0, -3, 0), Quaternion.Identity, new Vector3(10f, 1f, 10f)), - floorModel - )); - - WorldBuilder.SendMessage(new StaticModelSpawnMessage( - new Transform3D( - new Vector3(0, 1, 0), - Quaternion.CreateFromAxisAngle( - Vector3.Right, - -Microsoft.Xna.Framework.MathHelper.PiOver2 - ), - new Vector3(1f, 1f, 1f) - ), - redCylinderModel - )); - - WorldBuilder.SendMessage(new StaticModelSpawnMessage( - new Transform3D( - new Vector3(-3, 1, 0), - Quaternion.CreateFromAxisAngle( - Vector3.Right, - -Microsoft.Xna.Framework.MathHelper.PiOver2 - ), - new Vector3(1f, 1f, 1f) - ), - blueTorusModel - )); - - WorldBuilder.SendMessage(new StaticModelSpawnMessage( - new Transform3D( - new Vector3(3, 1, 0), - Quaternion.CreateFromAxisAngle( - Vector3.Right, - -Microsoft.Xna.Framework.MathHelper.PiOver2 - ), - new Vector3(1f, 1f, 1f) - ), - cubeModel - )); - - // WorldBuilder.SendMessage(new StaticModelSpawnMessage( - // Transform3D.Identity, - // toonShadeRuinsModel - // )); - - for (var i = 0; i < 1; i++) - { - var start = RandomHelper.RandomVector3(-5, 5); - - WorldBuilder.SendMessage(new LightBulbSpawnMessage( - new Transform3D(start.ToXNAVector(), Quaternion.Identity, new Vector3(0.1f, 0.1f, 0.1f)), - RandomHelper.RandomColor(), - 1f, - RandomHelper.RandomLoop(start, -15, 15, 3, 10) - )); - } - - var ambientLightEntity = WorldBuilder.CreateEntity(); - - WorldBuilder.SetComponent(ambientLightEntity, new AmbientLightComponent( - new Color(0.4f, 0.4f, 0.4f) - )); - WorldBuilder.SendMessage(new DirectionalLightSpawnMessage( //Quaternion.CreateFromAxisAngle(Vector3.Right, Microsoft.Xna.Framework.MathHelper.Pi / 3f), Quaternion.CreateFromAxisAngle(Vector3.Right, Microsoft.Xna.Framework.MathHelper.PiOver4), @@ -271,18 +187,6 @@ namespace KavTest 0.7f )); - // WorldBuilder.SendMessage(new DirectionalLightSpawnMessage( - // Quaternion.CreateFromAxisAngle(Vector3.Right, Microsoft.Xna.Framework.MathHelper.PiOver4), - // Color.GhostWhite, - // 0.1f - // )); - - // WorldBuilder.SendMessage(new DirectionalLightSpawnMessage( - // Quaternion.CreateFromAxisAngle(Vector3.Right, Microsoft.Xna.Framework.MathHelper.PiOver2 + Microsoft.Xna.Framework.MathHelper.PiOver4), - // Color.GhostWhite, - // 0.1f - // )); - var cameraEntity = WorldBuilder.CreateEntity(); WorldBuilder.SetComponent(cameraEntity, new ArcballTransformComponent( new ArcballTransform(