Skip to content

Commit

Permalink
Implemented bump mapping demo
Browse files Browse the repository at this point in the history
  • Loading branch information
@vcoda
vcoda committed Jul 25, 2020
1 parent ae6353c commit d753eaa
Show file tree
Hide file tree
Showing 11 changed files with 552 additions and 6 deletions.
15 changes: 15 additions & 0 deletions aggregated-graphics-samples.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "normalmapping", "normalmapp
{67B01ECD-2613-4FA0-84F7-87F5BCF40EB1} = {67B01ECD-2613-4FA0-84F7-87F5BCF40EB1}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bumpmapping", "bumpmapping\bumpmapping.vcxproj", "{7399BABD-C433-4275-A9DD-7663241B31BE}"
ProjectSection(ProjectDependencies) = postProject
{8D9D4A3E-439A-4210-8879-259B20D992CA} = {8D9D4A3E-439A-4210-8879-259B20D992CA}
{51CC36B3-921E-4853-ACD5-CB6CBC27FBA1} = {51CC36B3-921E-4853-ACD5-CB6CBC27FBA1}
{67B01ECD-2613-4FA0-84F7-87F5BCF40EB1} = {67B01ECD-2613-4FA0-84F7-87F5BCF40EB1}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Expand Down Expand Up @@ -153,6 +160,14 @@ Global
{0CC7CBF2-BFCD-477F-A639-5CAB35FCBA6C}.Release|x64.Build.0 = Release|x64
{0CC7CBF2-BFCD-477F-A639-5CAB35FCBA6C}.Release|x86.ActiveCfg = Release|Win32
{0CC7CBF2-BFCD-477F-A639-5CAB35FCBA6C}.Release|x86.Build.0 = Release|Win32
{7399BABD-C433-4275-A9DD-7663241B31BE}.Debug|x64.ActiveCfg = Debug|x64
{7399BABD-C433-4275-A9DD-7663241B31BE}.Debug|x64.Build.0 = Debug|x64
{7399BABD-C433-4275-A9DD-7663241B31BE}.Debug|x86.ActiveCfg = Debug|Win32
{7399BABD-C433-4275-A9DD-7663241B31BE}.Debug|x86.Build.0 = Debug|Win32
{7399BABD-C433-4275-A9DD-7663241B31BE}.Release|x64.ActiveCfg = Release|x64
{7399BABD-C433-4275-A9DD-7663241B31BE}.Release|x64.Build.0 = Release|x64
{7399BABD-C433-4275-A9DD-7663241B31BE}.Release|x86.ActiveCfg = Release|Win32
{7399BABD-C433-4275-A9DD-7663241B31BE}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Binary file added assets/textures/wrinkled-paper-height.dds
View file
Binary file not shown.
198 changes: 198 additions & 0 deletions bumpmapping/bumpmapping.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,198 @@
#include "graphicsApp.h"
#include "textureLoader.h"

#include "quadric/include/sphere.h"

class BumpMapping : public GraphicsApp
{
struct Constants
{
VkBool32 showHeightMap;
};

std::unique_ptr<quadric::Sphere> sphere;
std::unique_ptr<quadric::Sphere> dot;
std::shared_ptr<magma::ImageView> heightMap;
std::shared_ptr<magma::GraphicsPipeline> bumpPipeline;
std::shared_ptr<magma::GraphicsPipeline> fillPipeline;
DescriptorSet bumpDescriptor;
DescriptorSet fillDescriptor;

Constants constants = {false};

public:
explicit BumpMapping(const AppEntry& entry):
GraphicsApp(entry, TEXT("Bump mapping"), 1280, 720, true)
{
setupViewProjection();
createTransformBuffer(2);
createMeshObjects();
loadHeightMap();
setupDescriptorSets();
setupGraphicsPipelines();

renderScene(drawCmdBuffer);
blit(msaaFramebuffer->getColorView(), FrontBuffer);
blit(msaaFramebuffer->getColorView(), BackBuffer);
}

virtual void render(uint32_t bufferIndex) override
{
updateTransforms();
submitCommandBuffers(bufferIndex);
std::this_thread::sleep_for(std::chrono::milliseconds(2)); // Cap fps
}

virtual void onKeyDown(char key, int repeat, uint32_t flags) override
{
constexpr float step = 0.1f;
switch (key)
{
case AppKey::Left:
lightViewProj->translate(-step, 0.f, 0.f);
break;
case AppKey::Right:
lightViewProj->translate(step, 0.f, 0.f);
break;
case AppKey::Up:
lightViewProj->translate(0.f, step, 0.f);
break;
case AppKey::Down:
lightViewProj->translate(0.f, -step, 0.f);
break;
case AppKey::PgUp:
lightViewProj->translate(0.f, 0.f, step);
break;
case AppKey::PgDn:
lightViewProj->translate(0.f, 0.f, -step);
break;
case AppKey::Space:
constants.showHeightMap = !constants.showHeightMap;
setupGraphicsPipelines();
renderScene(drawCmdBuffer);
break;
}
updateTransforms();
updateLightSource();
VulkanApp::onKeyDown(key, repeat, flags);
}

virtual void onMouseWheel(float distance) override
{
float step = distance * 0.2f;
float z = viewProj->getPosition().z;
if ((z + step < -2.5f) && (z + step > -10.f))
viewProj->translate(0.f, 0.f, step);
updateViewProjTransforms();
}

void setupViewProjection()
{
viewProj = std::make_unique<LeftHandedViewProjection>();
viewProj->setPosition(0.f, 0.f, -4.f);
viewProj->setFocus(0.f, 0.f, 0.f);
viewProj->setFieldOfView(60.f);
viewProj->setNearZ(1.f);
viewProj->setFarZ(100.f);
viewProj->setAspectRatio(width / (float)height);
viewProj->updateView();
viewProj->updateProjection();

lightViewProj = std::make_unique<LeftHandedViewProjection>();
lightViewProj->setPosition(-1., 1.f, -2.f);

updateViewProjTransforms();
}

void updateTransforms()
{
rapid::matrix lightTransform = rapid::translation(rapid::vector3(lightViewProj->getPosition()));
const std::vector<rapid::matrix, core::aligned_allocator<rapid::matrix>> transforms = {
arcball->transform(),
lightTransform
};
updateObjectTransforms(transforms);
}

void createMeshObjects()
{
sphere = std::make_unique<quadric::Sphere>(1.2f, 128, 128, false, cmdCopyBuf);
dot = std::make_unique<quadric::Sphere>(0.02f, 8, 8, true, cmdCopyBuf);
}

void loadHeightMap()
{ // https://freepbr.com/materials/wrinkled-paper1/
heightMap = loadDxtTexture(cmdCopyImg, "wrinkled-paper-height.dds");
}

void setupDescriptorSets()
{
bumpDescriptor.layout = std::shared_ptr<magma::DescriptorSetLayout>(new magma::DescriptorSetLayout(device,
{
magma::bindings::VertexFragmentStageBinding(0, magma::descriptors::DynamicUniformBuffer(1)),
magma::bindings::FragmentStageBinding(1, magma::descriptors::UniformBuffer(1)),
magma::bindings::FragmentStageBinding(2, magma::descriptors::UniformBuffer(1)),
magma::bindings::FragmentStageBinding(3, magma::descriptors::CombinedImageSampler(1))
}));
bumpDescriptor.set = descriptorPool->allocateDescriptorSet(bumpDescriptor.layout);
bumpDescriptor.set->update(0, transforms);
bumpDescriptor.set->update(1, viewProjTransforms);
bumpDescriptor.set->update(2, lightSource);
bumpDescriptor.set->update(3, heightMap, anisotropicClampToEdge);

fillDescriptor.layout = std::shared_ptr<magma::DescriptorSetLayout>(new magma::DescriptorSetLayout(device,
{
magma::bindings::VertexStageBinding(0, magma::descriptors::DynamicUniformBuffer(1))
}));
fillDescriptor.set = descriptorPool->allocateDescriptorSet(fillDescriptor.layout);
fillDescriptor.set->update(0, transforms);
}

void setupGraphicsPipelines()
{
std::shared_ptr<magma::Specialization> specialization(new magma::Specialization(constants,
{
magma::SpecializationEntry(0, &Constants::showHeightMap)
}
));
bumpPipeline = createCommonSpecializedPipeline(
"transform.o", "bump.o",
std::move(specialization),
sphere->getVertexInput(),
bumpDescriptor.layout);
if (!fillPipeline)
{
fillPipeline = createCommonPipeline(
"transform.o", "fill.o",
dot->getVertexInput(),
fillDescriptor.layout);
}
}

void renderScene(std::shared_ptr<magma::CommandBuffer> cmdBuffer)
{
cmdBuffer->begin();
{
cmdBuffer->beginRenderPass(msaaFramebuffer->getRenderPass(), msaaFramebuffer->getFramebuffer(),
{
magma::ClearColor(0.1f, 0.243f, 0.448f, 1.f),
magma::clears::depthOne
});
{
cmdBuffer->bindPipeline(bumpPipeline);
cmdBuffer->bindDescriptorSet(bumpPipeline, bumpDescriptor.set, transforms->getDynamicOffset(0));
sphere->draw(cmdBuffer);
cmdBuffer->bindPipeline(fillPipeline);
cmdBuffer->bindDescriptorSet(fillPipeline, fillDescriptor.set, transforms->getDynamicOffset(1));
dot->draw(cmdBuffer);
}
cmdBuffer->endRenderPass();
}
cmdBuffer->end();
}
};

std::unique_ptr<IApplication> appFactory(const AppEntry& entry)
{
return std::unique_ptr<BumpMapping>(new BumpMapping(entry));
}
169 changes: 169 additions & 0 deletions bumpmapping/bumpmapping.vcxproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{7399BABD-C433-4275-A9DD-7663241B31BE}</ProjectGuid>
<RootNamespace>bumpmapping</RootNamespace>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(VK_SDK_PATH)\Include;..\third-party;..\framework</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;VK_USE_PLATFORM_WIN32_KHR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<AdditionalLibraryDirectories>$(VK_SDK_PATH)\Lib32;..\Debug</AdditionalLibraryDirectories>
<AdditionalDependencies>vulkan-1.lib;magma.lib;quadric.lib;framework.lib;Shcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(VK_SDK_PATH)\Include;..\third-party;..\framework</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;VK_USE_PLATFORM_WIN32_KHR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<AdditionalDependencies>vulkan-1.lib;magma.lib;quadric.lib;framework.lib;Shcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(VK_SDK_PATH)\Lib;..\x64\Debug</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(VK_SDK_PATH)\Include;..\third-party;..\framework</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;VK_USE_PLATFORM_WIN32_KHR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<SubSystem>Windows</SubSystem>
<AdditionalLibraryDirectories>$(VK_SDK_PATH)\Lib32;..\Release</AdditionalLibraryDirectories>
<AdditionalDependencies>vulkan-1.lib;magma.lib;quadric.lib;framework.lib;Shcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>$(VK_SDK_PATH)\Include;..\third-party;..\framework</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;VK_USE_PLATFORM_WIN32_KHR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<SubSystem>Windows</SubSystem>
<AdditionalLibraryDirectories>$(VK_SDK_PATH)\Lib;..\x64\Release</AdditionalLibraryDirectories>
<AdditionalDependencies>vulkan-1.lib;magma.lib;quadric.lib;framework.lib;Shcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="bumpmapping.cpp" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="shaders\bump.frag">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(VK_SDK_PATH)\Bin32\glslangValidator.exe -V %(FullPath) -I..\framework\shaders -o %(Filename).o</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).o</Outputs>
</CustomBuild>
<CustomBuild Include="shaders\fill.frag">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(VK_SDK_PATH)\Bin32\glslangValidator.exe -V %(FullPath) -I..\framework\shaders -o %(Filename).o</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).o</Outputs>
</CustomBuild>
<CustomBuild Include="shaders\transform.vert">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(VK_SDK_PATH)\Bin32\glslangValidator.exe -V %(FullPath) -I..\framework\shaders -o %(Filename).o</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(Filename).o</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<ClInclude Include="shaders\sobel.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
Loading

0 comments on commit d753eaa

Please sign in to comment.