Skip to content

Commit

Permalink
Editor content browser (#819)
Browse files Browse the repository at this point in the history
  • Loading branch information
turanszkij authored Mar 17, 2024
1 parent 7419d97 commit 0fe267f
Show file tree
Hide file tree
Showing 17 changed files with 610 additions and 21 deletions.
4 changes: 4 additions & 0 deletions Content/Content.vcxitems
Original file line number Diff line number Diff line change
Expand Up @@ -597,11 +597,14 @@
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\vase_round_bump.png" />
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\vase_round_ddn.png" />
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\textures\vase_round_spec.png" />
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\thumbnail.png" />
<Image Include="$(MSBuildThisFileDirectory)models\waterNormalMap.jpg" />
<Image Include="$(MSBuildThisFileDirectory)scripts\character_controller\assets\footprint.dds" />
<Image Include="$(MSBuildThisFileDirectory)scripts\character_controller\assets\grassparticle.png" />
<Image Include="$(MSBuildThisFileDirectory)scripts\character_controller\assets\loadingscreen.png" />
<Image Include="$(MSBuildThisFileDirectory)scripts\character_controller\assets\waterNormalMap.jpg" />
<Image Include="$(MSBuildThisFileDirectory)scripts\character_controller\thumbnail.png" />
<Image Include="$(MSBuildThisFileDirectory)scripts\dungeon_generator\thumbnail.png" />
<Image Include="$(MSBuildThisFileDirectory)scripts\fighting_game\assets\baseColor.png" />
<Image Include="$(MSBuildThisFileDirectory)scripts\fighting_game\assets\fire.jpg" />
<Image Include="$(MSBuildThisFileDirectory)scripts\fighting_game\assets\grid.dds" />
Expand All @@ -610,6 +613,7 @@
<Image Include="$(MSBuildThisFileDirectory)scripts\fighting_game\assets\orb.dds" />
<Image Include="$(MSBuildThisFileDirectory)scripts\fighting_game\assets\ripple.png" />
<Image Include="$(MSBuildThisFileDirectory)scripts\fighting_game\assets\smoke0.png" />
<Image Include="$(MSBuildThisFileDirectory)scripts\fighting_game\thumbnail.png" />
</ItemGroup>
<ItemGroup>
<Media Include="$(MSBuildThisFileDirectory)models\water.wav" />
Expand Down
12 changes: 12 additions & 0 deletions Content/Content.vcxitems.filters
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,18 @@
<Image Include="$(MSBuildThisFileDirectory)scripts\character_controller\assets\loadingscreen.png">
<Filter>scripts\character_controller\assets</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)models\Sponza\thumbnail.png">
<Filter>models\Sponza</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)scripts\character_controller\thumbnail.png">
<Filter>scripts\character_controller</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)scripts\dungeon_generator\thumbnail.png">
<Filter>scripts\dungeon_generator</Filter>
</Image>
<Image Include="$(MSBuildThisFileDirectory)scripts\fighting_game\thumbnail.png">
<Filter>scripts\fighting_game</Filter>
</Image>
</ItemGroup>
<ItemGroup>
<Media Include="$(MSBuildThisFileDirectory)models\water.wav">
Expand Down
Binary file added Content/models/Sponza/thumbnail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Content/scripts/dungeon_generator/thumbnail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Content/scripts/fighting_game/thumbnail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions Editor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ set (SOURCE_FILES
SpriteWindow.cpp
FontWindow.cpp
VoxelGridWindow.cpp
ContentBrowserWindow.cpp
xatlas.cpp
EmbeddedResources.cpp
)
Expand Down
Loading

0 comments on commit 0fe267f

Please sign in to comment.