set up git lfs

pull/1/head
cosmonaut 2020-09-21 00:44:21 -07:00
parent cf2e6d7ce6
commit 18f5da9371
9 changed files with 41 additions and 19 deletions

2
.gitattributes vendored Normal file
View File

@ -0,0 +1,2 @@
*.glb filter=lfs diff=lfs merge=lfs -text
*.fxb filter=lfs diff=lfs merge=lfs -text

2
.vscode/tasks.json vendored
View File

@ -95,7 +95,7 @@
"env": { "env": {
"LD_LIBRARY_PATH": "./lib64", "LD_LIBRARY_PATH": "./lib64",
"DYLD_LIBRARY_PATH": "./osx", "DYLD_LIBRARY_PATH": "./osx",
"FNA3D_FORCE_DRIVER": "Vulkan" "FNA3D_FORCE_DRIVER": "OpenGL"
}, },
"cwd": "${workspaceFolder}/KavTest/bin/Debug/net461" "cwd": "${workspaceFolder}/KavTest/bin/Debug/net461"
}, },

2
Kav

@ -1 +1 @@
Subproject commit 8cb760171745a7bc75ff56d88f0773dc55e2f2e3 Subproject commit 016cb6e6a4e9ad32aec022717f5c2dac14cc101d

BIN
KavTest/Content/avocado.glb (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -25,7 +25,7 @@ namespace KavTest
graphics = new GraphicsDeviceManager(this); graphics = new GraphicsDeviceManager(this);
graphics.PreferredBackBufferWidth = 1280; graphics.PreferredBackBufferWidth = 1280;
graphics.PreferredBackBufferHeight = 720; graphics.PreferredBackBufferHeight = 720;
graphics.PreferMultiSampling = true; graphics.PreferMultiSampling = false;
Content.RootDirectory = "Content"; Content.RootDirectory = "Content";
Window.AllowUserResizing = true; Window.AllowUserResizing = true;
@ -63,6 +63,11 @@ namespace KavTest
Smuggler.Importer.ImportGLB(GraphicsDevice, File.OpenRead("Content/floor.glb")) Smuggler.Importer.ImportGLB(GraphicsDevice, File.OpenRead("Content/floor.glb"))
); );
var avocadoModel = Kav.ModelLoader.Load(
GraphicsDevice,
Smuggler.Importer.ImportGLB(GraphicsDevice, File.OpenRead("Content/avocado.glb"))
);
WorldBuilder.AddEngine(new InputEngine(this)); WorldBuilder.AddEngine(new InputEngine(this));
WorldBuilder.AddEngine(new AngularVelocityEngine()); WorldBuilder.AddEngine(new AngularVelocityEngine());
WorldBuilder.AddEngine(new MoveAlongCurve3DEngine()); WorldBuilder.AddEngine(new MoveAlongCurve3DEngine());
@ -74,26 +79,37 @@ namespace KavTest
WorldBuilder.AddEngine(new DirectionalLightSpawner()); WorldBuilder.AddEngine(new DirectionalLightSpawner());
WorldBuilder.AddGeneralRenderer(new SceneRenderer(GraphicsDevice), 0); WorldBuilder.AddGeneralRenderer(new SceneRenderer(GraphicsDevice), 0);
WorldBuilder.SendMessage(new RustyBallSpawnMessage( // WorldBuilder.SendMessage(new RustyBallSpawnMessage(
new Transform3D(new Vector3(0, 0, 0)), // new Transform3D(new Vector3(0, 0, 0)),
new Vector3(1, 1, -1) // new Vector3(1, 1, -1)
)); // ));
WorldBuilder.SendMessage(new RustyBallSpawnMessage( // WorldBuilder.SendMessage(new RustyBallSpawnMessage(
new Transform3D(new Vector3(-3, 0, 0)), // new Transform3D(new Vector3(-3, 0, 0)),
new Vector3(-1, 1, -1) // new Vector3(-1, 1, -1)
)); // ));
WorldBuilder.SendMessage(new RustyBallSpawnMessage( // WorldBuilder.SendMessage(new RustyBallSpawnMessage(
new Transform3D(new Vector3(3, 0, 0)), // new Transform3D(new Vector3(3, 0, 0)),
new Vector3(-1, 1, 1) // new Vector3(-1, 1, 1)
)); // ));
WorldBuilder.SendMessage(new StaticModelSpawnMessage( WorldBuilder.SendMessage(new StaticModelSpawnMessage(
new Transform3D(new Vector3(0, -3, 0), Quaternion.Identity, new Vector3(10f, 1f, 10f)), new Transform3D(new Vector3(0, -3, 0), Quaternion.Identity, new Vector3(10f, 1f, 10f)),
floorModel floorModel
)); ));
var entity = WorldBuilder.CreateEntity();
WorldBuilder.SetComponent(entity, new Transform3DComponent(
new Transform3D(
new Vector3(0, 1, 0),
Quaternion.CreateFromAxisAngle(Vector3.Right, -Microsoft.Xna.Framework.MathHelper.PiOver2),
new Vector3(30, 30, 30))
)
);
WorldBuilder.SetComponent(entity, new ModelComponent(avocadoModel));
for (var i = 0; i < 1; i++) for (var i = 0; i < 1; i++)
{ {
var start = RandomHelper.RandomVector3(-5, 5); var start = RandomHelper.RandomVector3(-5, 5);
@ -101,15 +117,15 @@ namespace KavTest
WorldBuilder.SendMessage(new LightBulbSpawnMessage( WorldBuilder.SendMessage(new LightBulbSpawnMessage(
new Transform3D(start.ToXNAVector(), Quaternion.Identity, new Vector3(0.1f, 0.1f, 0.1f)), new Transform3D(start.ToXNAVector(), Quaternion.Identity, new Vector3(0.1f, 0.1f, 0.1f)),
RandomHelper.RandomColor(), RandomHelper.RandomColor(),
10f, 1f,
RandomHelper.RandomLoop(start, -15, 15, 3, 10) RandomHelper.RandomLoop(start, -15, 15, 3, 10)
)); ));
} }
WorldBuilder.SendMessage(new DirectionalLightSpawnMessage( WorldBuilder.SendMessage(new DirectionalLightSpawnMessage(
Quaternion.CreateFromAxisAngle(Vector3.Right, Microsoft.Xna.Framework.MathHelper.PiOver4), Quaternion.CreateFromAxisAngle(Vector3.Right, Microsoft.Xna.Framework.MathHelper.PiOver4),
Color.GhostWhite, Color.LightGoldenrodYellow,
0.1f 0.7f
)); ));
// WorldBuilder.SendMessage(new DirectionalLightSpawnMessage( // WorldBuilder.SendMessage(new DirectionalLightSpawnMessage(

View File

@ -79,7 +79,8 @@ namespace KavTest.Renderers
graphicsDevice, graphicsDevice,
graphicsDevice.PresentationParameters.BackBufferWidth, graphicsDevice.PresentationParameters.BackBufferWidth,
graphicsDevice.PresentationParameters.BackBufferHeight, graphicsDevice.PresentationParameters.BackBufferHeight,
3 4,
4096
); );
} }