Skip to content

Commit 06c2173

Browse files
author
KEVIN-ALIEN\kevin
committed
Overhaul phase 1: HwndHost
- Switched from ImageInterop to HwndHost for viewport, now the viewport runs on a separate thread instead of UI. And I have control over swapchain (creation and destruction) - Switched from marshalling to a C++/CLI project for communication between shaderbox and the engine - Added refcounting to several datatypes, with a custom shared_ptr (which doesn't use atomics and doesn't support weak_ptr so it doesn't need to keep track of a second counter) and in some other ways - Rewrote several parts of engine, but will still be refactored in the future, and has several known todo's like properly support parenting of gameobjects - Currently Shaderbox is still in prototype phase with several known quirks/bugs and limitations Next Phase 2: UI Start a design doc for UI, now we known using HwndHost is a viable solution.
1 parent 7548c82 commit 06c2173

File tree

146 files changed

+5953
-2529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+5953
-2529
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,5 @@ Source/DemoProject/obj/
4848
Source/bin/
4949
Source/.vs/
5050
Source/Engine/ShaderRuntimeCompiler/bin/
51+
Source/NativeBridge/x64/
52+
Source/ShaderBoxBridge/x64/

Source/DemoProject/App.config

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
55
</startup>
6-
</configuration>
6+
<runtime>
7+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8+
<dependentAssembly>
9+
<assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
10+
<bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
11+
</dependentAssembly>
12+
</assemblyBinding>
13+
</runtime>
14+
</configuration>

Source/DemoProject/DemoProject.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
<OutputType>Exe</OutputType>
99
<RootNamespace>DemoProject</RootNamespace>
1010
<AssemblyName>DemoProject</AssemblyName>
11-
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14+
<TargetFrameworkProfile />
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<PlatformTarget>x64</PlatformTarget>
-624 Bytes
Binary file not shown.

Source/DemoProject/Resources/PP_Blur_2017_1_22-23_03/PP_Blur.sbproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@
1010
<HasHullDomainShader>false</HasHullDomainShader>
1111
<HasGeometryShader>false</HasGeometryShader>
1212
<SelectedModel>0</SelectedModel>
13-
<Shaders>
14-
<IsBuiltIn>false</IsBuiltIn>
15-
<ShaderType>Vertex</ShaderType>
16-
<Name>vs.hlsl</Name>
17-
<FileLocation>./Resources/PP_Blur_2017_1_22-23_03/vs.hlsl</FileLocation>
18-
</Shaders>
1913
<Shaders>
2014
<IsBuiltIn>false</IsBuiltIn>
2115
<ShaderType>Pixel</ShaderType>

Source/DemoProject/Resources/PP_Blur_2017_1_22-23_03/vs.hlsl

Lines changed: 0 additions & 1 deletion
This file was deleted.
Binary file not shown.

Source/DemoProject/Resources/PP_CubicLensDistortion_2017_1_23-06_55/PP_CubicLensDistortion.sbproj

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
<BufferSize>0</BufferSize>
1414
<Variables>
1515
<Variable Name="myTexture" DataType="Texture" IsSNorm="false" IsUNorm="false" Rows="0" Columns="0" IsScalar="false" IsVector="false" IsMatrix="false" IsArray="false" IsTexture="true" Dimension="-1" Offset="0" Size="0">
16-
<Value />
16+
<Value>
17+
<Path>./Resources/.Data/Images/plus.png</Path>
18+
</Value>
1719
<AnnotationKeywords />
1820
</Variable>
1921
</Variables>
@@ -24,7 +26,7 @@
2426
<Variables>
2527
<Variable Name="gLensDistortion" DataType="Float" IsSNorm="false" IsUNorm="false" Rows="0" Columns="0" IsScalar="true" IsVector="false" IsMatrix="false" IsArray="false" IsTexture="false" Dimension="-1" Offset="0" Size="4">
2628
<Value>
27-
<Value_d>0</Value_d>
29+
<Value_d>25.700000000000003</Value_d>
2830
</Value>
2931
<AnnotationKeywords>
3032
<KVPairSerializable>
@@ -43,7 +45,7 @@
4345
</Variable>
4446
<Variable Name="gCubicDistortion" DataType="Float" IsSNorm="false" IsUNorm="false" Rows="0" Columns="0" IsScalar="true" IsVector="false" IsMatrix="false" IsArray="false" IsTexture="false" Dimension="-1" Offset="4" Size="4">
4547
<Value>
46-
<Value_d>0</Value_d>
48+
<Value_d>-50</Value_d>
4749
</Value>
4850
<AnnotationKeywords>
4951
<KVPairSerializable>
@@ -72,12 +74,6 @@
7274
<HasHullDomainShader>false</HasHullDomainShader>
7375
<HasGeometryShader>false</HasGeometryShader>
7476
<SelectedModel>0</SelectedModel>
75-
<Shaders>
76-
<IsBuiltIn>false</IsBuiltIn>
77-
<ShaderType>Vertex</ShaderType>
78-
<Name>vs.hlsl</Name>
79-
<FileLocation>./Resources/PP_CubicLensDistortion_2017_1_23-06_55/vs.hlsl</FileLocation>
80-
</Shaders>
8177
<Shaders>
8278
<IsBuiltIn>false</IsBuiltIn>
8379
<ShaderType>Pixel</ShaderType>
2.03 KB
Loading

Source/DemoProject/Resources/PP_CubicLensDistortion_2017_1_23-06_55/vs.hlsl

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)