Skip to content

Commit

Permalink
Getting ready for water simulation
Browse files Browse the repository at this point in the history
  • Loading branch information
@softwareantics
softwareantics committed Jan 14, 2024
1 parent 233b687 commit fdc7704
Show file tree
Hide file tree
Showing 58 changed files with 548 additions and 12 deletions.
172 changes: 168 additions & 4 deletions FinalEngine.Examples.Sponza/FinalEngine.Examples.Sponza.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,174 @@
</ItemGroup>

<ItemGroup>
<None Update="Resources\Models\Sponza\sponza.mtl">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\sponza.obj">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\background.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\background_bump.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\chain_texture.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\chain_texture_bump.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\chain_texture_mask.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\floor_gloss.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\lion.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\lion2_bump.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\lion_bump.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\spnza_bricks_a_bump.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\spnza_bricks_a_diff.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\spnza_bricks_a_spec.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_arch_bump.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_arch_diff.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_arch_spec.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_ceiling_a_diff.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_ceiling_a_spec.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_column_a_bump.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_column_a_diff.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_column_a_spec.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_column_b_bump.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_column_b_diff.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_column_b_spec.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_column_c_bump.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_column_c_diff.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_column_c_spec.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_curtain_blue_diff.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_curtain_diff.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_curtain_green_diff.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_details_diff.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_details_spec.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_fabric_blue_diff.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_fabric_diff.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_fabric_green_diff.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_fabric_purple.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_fabric_spec.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_flagpole_diff.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_flagpole_spec.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_floor_a_diff.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_floor_a_spec.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_roof_diff.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_thorn_bump.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_thorn_diff.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_thorn_mask.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\sponza_thorn_spec.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\vase_bump.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\vase_dif.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\vase_hanging.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\vase_plant.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\vase_plant_mask.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\vase_plant_spec.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\vase_round.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\vase_round_bump.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Models\Sponza\textures\vase_round_spec.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Resources\Textures\Bricks\bricks_diffuse.tga">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand All @@ -38,8 +206,4 @@
</None>
</ItemGroup>

<ItemGroup>
<Folder Include="Resources\Models\Sponza\" />
</ItemGroup>

</Project>
12 changes: 6 additions & 6 deletions FinalEngine.Examples.Sponza/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ private static void Main()

var watch = new Stopwatch();
var watchInvoker = new StopwatchInvoker(watch);
var gameTime = new GameTime(watchInvoker, 60.0f);
var gameTime = new GameTime(watchInvoker, 120.0f);

float fieldDepth = 10.0f;
float fieldWidth = 10.0f;
Expand Down Expand Up @@ -131,19 +131,19 @@ private static void Main()
Shininess = 16.0f,
};

var model = ResourceManager.Instance.LoadResource<Model>("C:\\Users\\mathe\\Downloads\\main_sponza(1)\\Main.1_Sponza\\NewSponza_Main_Zup_002.fbx");
var model = ResourceManager.Instance.LoadResource<Model>("Resources\\Models\\Sponza\\sponza.obj");

// Currently there is no parent-child relationship with transform, so we have to do this to scale and translate.
if (model.RenderModel != null)
{
model.RenderModel.Transform.Scale = new Vector3(0.0001f);
model.RenderModel.Transform.Scale = new Vector3(0.2f);
}

foreach (var child in model.Children)
{
if (child.RenderModel != null)
{
child.RenderModel.Transform.Scale = new Vector3(0.0001f);
child.RenderModel.Transform.Scale = new Vector3(0.2f);
}
}

Expand Down Expand Up @@ -223,9 +223,9 @@ private static void Main()

geometryRenderer.Enqueue(model);

for (var i = 0; i < 5; i++)
for (var i = 0; i < 2; i++)
{
for (var j = 0; j < 5; j++)
for (var j = 0; j < 2; j++)
{
lightRenderer.Enqueue(new Light()
{
Expand Down
Loading

0 comments on commit fdc7704

Please sign in to comment.