Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add point and line shaders #10709

Merged
merged 19 commits into from
Jun 4, 2020
Merged

Add point and line shaders #10709

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f592f3d
add point and line shaders
aparajit-pratap May 28, 2020
324e7fa
fix shaders
aparajit-pratap May 28, 2020
b42d7b2
add shader byte code to effects manager
aparajit-pratap May 28, 2020
e186475
pass material when creating dynamoPointNode
mjkkirschner May 29, 2020
87c2d11
work in progress for review
mjkkirschner May 29, 2020
2c34bf2
update shaders
mjkkirschner Jun 1, 2020
483e765
Merge pull request #2 from mjkkirschner/shader_use_unusedmaterialprops
aparajit-pratap Jun 1, 2020
11754dd
resolve merge conflicts with mike's commit
aparajit-pratap Jun 2, 2020
dcb4f56
hook up line shader
aparajit-pratap Jun 2, 2020
6a6a6a6
add separate pixel shader for line
aparajit-pratap Jun 2, 2020
dd39928
more fixes
aparajit-pratap Jun 2, 2020
8fb9c10
replace hlsl files with compiled shader files
aparajit-pratap Jun 2, 2020
83cbee6
code cleanup
aparajit-pratap Jun 3, 2020
44b3519
refactor
aparajit-pratap Jun 3, 2020
16c7e2f
resolve merge conflicts, update compiled shaders
aparajit-pratap Jun 3, 2020
d8f7e94
update point and line image comparison images
aparajit-pratap Jun 3, 2020
b1424de
remove point line color tests
aparajit-pratap Jun 3, 2020
7b06dc4
mark property obsolete
aparajit-pratap Jun 3, 2020
85120e3
mark build action as none for hlsl files in project
aparajit-pratap Jun 4, 2020
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
14 changes: 9 additions & 5 deletions src/DynamoCoreWpf/DynamoCoreWpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,11 +511,7 @@
<None Include="UI\Fonts\OpenSans-SemiboldItalic.ttf">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ViewModels\Watch3D\compiledShaders\psDynamoMesh" />
<None Include="ViewModels\Watch3D\compiledShaders\psDynamoPoint" />
<None Include="ViewModels\Watch3D\compiledShaders\psDynamoLine" />
<None Include="ViewModels\Watch3D\compiledShaders\vsDynamoMesh" />
<None Include="ViewModels\Watch3D\compiledShaders\vsDynamoPointLine" />
<None Include="ViewModels\Watch3D\shaderSource\CompileShaders.bat" />
<Resource Include="UI\Images\cursors.psd" />
<Resource Include="UI\Images\cursors1.psd" />
</ItemGroup>
Expand Down Expand Up @@ -1295,6 +1291,14 @@
<Content Include="sharpdx_direct3d11_effects_x86.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="ViewModels\Watch3D\shaderSource\helix_shader_defs\COMMON\Common.hlsl" />
aparajit-pratap marked this conversation as resolved.
Show resolved Hide resolved
<Content Include="ViewModels\Watch3D\shaderSource\helix_shader_defs\COMMON\CommonBuffers.hlsl" />
<Content Include="ViewModels\Watch3D\shaderSource\helix_shader_defs\COMMON\DataStructs.hlsl" />
<Content Include="ViewModels\Watch3D\shaderSource\psDynamoLine.hlsl" />
<Content Include="ViewModels\Watch3D\shaderSource\psDynamoMesh.hlsl" />
<Content Include="ViewModels\Watch3D\shaderSource\psDynamoPoint.hlsl" />
<Content Include="ViewModels\Watch3D\shaderSource\vsDynamoMesh.hlsl" />
<Content Include="ViewModels\Watch3D\shaderSource\vsDynamoPointLine.hlsl" />
<Resource Include="UI\Images\bubble-arrow.png" />
<Resource Include="UI\Images\icon-whats-new-small.png" />
<Resource Include="UI\Images\icon-dictionary-small.png" />
Expand Down
1 change: 0 additions & 1 deletion src/DynamoCoreWpf/ViewModels/Watch3D/DynamoEffectsManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ protected void AddDynamoTechniques()
};
AddTechnique(dynamoCustomPointTech);

//TODO add line shader with correct GS shader
var dynamoCustomLineTech = new TechniqueDescription(DynamoLineShaderName)
{
InputLayoutDescription = new InputLayoutDescription(
Expand Down
Loading