Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Engine_Master_UPC/ComponentFactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "ComponentSoundListener.h"
#include "ComponentSoundSource.h"
#include "PlayerRenderBufferComponent.h"
#include "LineRendererComponent.h"
#include "DamageHighlightComponent.h"
#include "DissolveComponent.h"
#include "SpectralComponent.h"
Expand Down Expand Up @@ -108,6 +109,9 @@ std::unique_ptr<Component> ComponentFactory::createWithUID(ComponentType type, U
case ComponentType::PLAYER_RENDER_BUFFER:
return std::make_unique<PlayerRenderBufferComponent>(id, owner);

case ComponentType::LINE_RENDERER:
return std::make_unique<LineRendererComponent>(id, owner);

case ComponentType::DAMAGE_HIGHLIGHT:
return std::make_unique<DamageHighlightComponent>(id, owner);

Expand Down
1 change: 1 addition & 0 deletions Engine_Master_UPC/ComponentType.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
X(SOUND_SOURCE) \
X(PREFAB_INSTANCE) \
X(PLAYER_RENDER_BUFFER) \
X(LINE_RENDERER) \
X(DAMAGE_HIGHLIGHT) \
X(FLOW_MAP) \
X(DISSOLVE) \
Expand Down
20 changes: 20 additions & 0 deletions Engine_Master_UPC/Engine.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,8 @@ $(SolutionDir)3rdParty\RecastNavigation\DebugUtils\Include;
<ClInclude Include="EmitterAnimation.h" />
<ClInclude Include="EmitterRender.h" />
<ClInclude Include="ImportSettings.h" />
<ClInclude Include="LineRendererComponent.h" />
<ClInclude Include="LineRendererPass.h" />
<ClInclude Include="NavMeshBuildSettings.h" />
<ClInclude Include="NavRuntimeBlockerComponent.h" />
<ClInclude Include="PdbPatcher.h" />
Expand Down Expand Up @@ -815,6 +817,8 @@ $(SolutionDir)3rdParty\RecastNavigation\DebugUtils\Include;
<ClCompile Include="CommandInstantiatePrefab.cpp" />
<ClCompile Include="ImporterSoundBank.cpp" />
<ClCompile Include="LightingPass.cpp" />
<ClCompile Include="LineRendererComponent.cpp" />
<ClCompile Include="LineRendererPass.cpp" />
<ClCompile Include="MD5.cpp" />
<ClCompile Include="MeshAsset.cpp" />
<ClCompile Include="ModuleGameView.cpp" />
Expand Down Expand Up @@ -1142,6 +1146,22 @@ $(SolutionDir)3rdParty\RecastNavigation\DebugUtils\Include;
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">6.0</ShaderModel>
</FxCompile>
<FxCompile Include="LineRendererPixelShader.hlsl">
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">6.0</ShaderModel>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='GameRelease|x64'">Pixel</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='GameRelease|x64'">6.0</ShaderModel>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">6.0</ShaderModel>
</FxCompile>
<FxCompile Include="LineRendererVertexShader.hlsl">
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Vertex</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">6.0</ShaderModel>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='GameRelease|x64'">Vertex</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='GameRelease|x64'">6.0</ShaderModel>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Vertex</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">6.0</ShaderModel>
</FxCompile>
<FxCompile Include="BloomThresholdPixelShader.hlsl">
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">6.0</ShaderModel>
Expand Down
29 changes: 29 additions & 0 deletions Engine_Master_UPC/Engine.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -852,6 +852,21 @@
<ClCompile Include="PostProcessCommon.cpp">
<Filter>Source\Rendering\Post Processing</Filter>
</ClCompile>
<ClCompile Include="ImporterNavMesh.cpp" />
<ClCompile Include="ImporterSoundBank.cpp" />
<ClCompile Include="NavMeshAsset.cpp" />
<ClCompile Include="NavMeshBuildSettings.cpp" />
<ClCompile Include="SoundBankAsset.cpp" />
<ClCompile Include="ScriptFieldHandler_AssetRef.cpp" />
<ClCompile Include="LineRendererPass.cpp">
<Filter>D3D12\Rendering\Pass</Filter>
</ClCompile>
<ClCompile Include="LineRendererComponent.cpp">
<Filter>GameEntity\Components</Filter>
</ClCompile>
<ClCompile Include="PlayerPass.cpp">
<Filter>D3D12\Rendering\Pass</Filter>
</ClCompile>
<ClCompile Include="TransparentPass.cpp">
<Filter>Source\Rendering</Filter>
</ClCompile>
Expand Down Expand Up @@ -1782,6 +1797,20 @@
<ClInclude Include="PostProcessCommon.h">
<Filter>Source\Rendering\Post Processing</Filter>
</ClInclude>
<ClInclude Include="AssetRef.h" />
<ClInclude Include="ImporterSoundBank.h" />
<ClInclude Include="SoundBankAsset.h" />
<ClInclude Include="ImporterNavMesh.h" />
<ClInclude Include="NavMeshAsset.h" />
<ClInclude Include="LineRendererPass.h">
<Filter>D3D12\Rendering\Pass</Filter>
</ClInclude>
<ClInclude Include="LineRendererComponent.h">
<Filter>GameEntity\Components</Filter>
</ClInclude>
<ClInclude Include="PlayerPass.h">
<Filter>D3D12\Rendering\Pass</Filter>
</ClInclude>
<ClInclude Include="TransparentPass.h">
<Filter>Source\Rendering</Filter>
</ClInclude>
Expand Down
Loading