Headlight bound to Camera LookDirection

src/DynamoCoreWpf/DynamoCoreWpf.csproj

@@ -162,6 +162,11 @@
     <Compile Include="Extensions\ViewStartupParams.cs" />
     <Compile Include="Interfaces\ILibraryViewCustomization.cs" />
     <Compile Include="Interfaces\LayoutSpecification.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="Utilities\CompactBubbleHandler.cs" />
     <Compile Include="Interfaces\IShellCom.cs" />
     <Compile Include="Rendering\HelixRenderPackage.cs" />
@@ -175,11 +180,6 @@
     <Compile Include="UI\ClassObjectTemplateSelector.cs" />
     <Compile Include="UI\DraggedAdorner.cs" />
     <Compile Include="UI\HeaderTemplateSelector.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <Compile Include="Properties\Resources.en-US.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -462,8 +462,8 @@
   <ItemGroup>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.en-US.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
@@ -505,6 +505,8 @@
     <None Include="UI\Fonts\OpenSans-SemiboldItalic.ttf">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="ViewModels\Watch3D\compiledShaders\psDynamoMesh" />
+    <None Include="ViewModels\Watch3D\compiledShaders\vsDynamoMesh" />
     <Resource Include="UI\Images\cursors.psd" />
     <Resource Include="UI\Images\cursors1.psd" />
   </ItemGroup>
@@ -1284,7 +1286,9 @@
     <Resource Include="UI\Images\icon-whats-new-small.png" />
     <Resource Include="UI\Images\icon-dictionary-small.png" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="ViewModels\Watch3D\shaderSource\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="AfterBuild">
     <MakeDir Directories="$(OutputPath)\viewExtensions\" />

src/DynamoCoreWpf/Properties/Resources.en-US.resx

@@ -117,7 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="AboutWindowCannotGetVersion" xml:space="preserve">
     <value>Could not get version.</value>
     <comment>To indicate not abe to get Dynamo version</comment>
@@ -2221,4 +2220,11 @@ Uninstall the following packages: {0}?</value>
   <data name="CrashPromptGithubNewIssueTitle" xml:space="preserve">
     <value>Crash report from Dynamo {0}</value>
   </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="psDynamoMesh" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\ViewModels\Watch3D\compiledShaders\psDynamoMesh;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="vsDynamoMesh" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\ViewModels\Watch3D\compiledShaders\vsDynamoMesh;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>

src/DynamoCoreWpf/Properties/Resources.resx

@@ -1975,7 +1975,6 @@ Do you want to install the latest Dynamo update?</value>
   <data name="FolderNotWritableError" xml:space="preserve">
     <value>You do not have write permission to {0}.</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="ActionMember" xml:space="preserve">
     <value>Action</value>
   </data>
@@ -2221,4 +2220,11 @@ Uninstall the following packages: {0}?</value>
   <data name="DynamoViewSettingMenuShowDataReportingDialogTooltip" xml:space="preserve">
     <value>Display the dialog for user to pick agreement on data collecting.</value>
   </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="psDynamoMesh" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\ViewModels\Watch3D\compiledShaders\psDynamoMesh;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="vsDynamoMesh" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\ViewModels\Watch3D\compiledShaders\vsDynamoMesh;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>

src/DynamoCoreWpf/ViewModels/Watch3D/AttachedProperties.cs

@@ -16,41 +16,16 @@ public static class AttachedProperties
 
         // handles determining color of elementGeometry3Ds when any property is set false
         // as the state of other properties must be checked to determine the correct color / material.
-        private static void OnPropertySetFalse(DependencyObject obj)
+        private static void OnPoint_Line_PropertySetFalse(DependencyObject obj)
         {
             if (!(obj is GeometryModel3D && obj.GetType() != typeof(BillboardTextModel3D)))
             {
                 return;
             }
-            //mesh case
-            var geom = (GeometryModel3D)obj;
-            var meshGeom = geom as DynamoGeometryModel3D;
-            if (meshGeom != null)
-            {
-
-                // if selection is not enabled after this property was set false
-                // then determine transparencey. IE selection state should always override
-                // the other properties.
-                if (!GetShowSelected(meshGeom))
-                {
-                    if (GetIsolationMode(meshGeom))
-                    {
-                        meshGeom.Material = HelixWatch3DViewModel.IsolatedMaterial;
-                    }
-                    else if (GetIsFrozen(meshGeom))
-                    {
-                        meshGeom.Material = HelixWatch3DViewModel.FrozenMaterial;
-                    }
-                    else
-                    {
-                        //TODO handle vertex coloring in all these cases
-                        meshGeom.Material = HelixWatch3DViewModel.WhiteMaterial;
-                    }
-                }
-
-            }
+
             //point or line case
-            else if (geom is DynamoPointGeometryModel3D || geom is DynamoLineGeometryModel3D)
+            GeometryModel3D geom = obj as GeometryModel3D;
+            if (geom is DynamoPointGeometryModel3D || geom is DynamoLineGeometryModel3D)
             {
                 //if selection is not enabled determine if we should reset colors or set transparent colors
                 if (!GetShowSelected(geom))
@@ -111,34 +86,10 @@ private static void ShowSelectedPropertyChanged(DependencyObject obj, Dependency
             var meshGeom = geom as DynamoGeometryModel3D;
             if (meshGeom != null)
             {
-                if ((bool)args.NewValue)
-                {
-                    //if the item is both selected and isolation mode is on, then we should color the item as normal OR as frozen.
-                    if (GetIsolationMode(meshGeom))
-                    {
-                        //selected, isolated, and frozen.
-                        if (GetIsFrozen(meshGeom))
-                        {
-                            meshGeom.Material = HelixWatch3DViewModel.FrozenMaterial;
-                        }
-                        //selected and isolated so color normal material
-                        //TODO handle vertex colors later.
-                        else
-                        {
-                            meshGeom.Material = HelixWatch3DViewModel.WhiteMaterial;
-                        }
-                    }
-                    //only selected.
-                    else
-                    {
-                        meshGeom.Material = HelixWatch3DViewModel.SelectedMaterial;
-                    }
-                }
-                else
-                {
-                    OnPropertySetFalse(meshGeom);
-                }
+                HandleMeshPropertyChange(meshGeom, args);
             }
+
+            //implementation for lines and points
             else if (geom is DynamoPointGeometryModel3D || geom is DynamoLineGeometryModel3D)
             {
 
@@ -168,7 +119,7 @@ private static void ShowSelectedPropertyChanged(DependencyObject obj, Dependency
                 }
                 else
                 {
-                    OnPropertySetFalse(geom);
+                    OnPoint_Line_PropertySetFalse(geom);
                 }
             }
         }
@@ -245,17 +196,11 @@ private static void IsFrozenPropertyChanged(DependencyObject obj, DependencyProp
             {
                 return;
             }
-            var meshGeom3d = geom as DynamoGeometryModel3D;
-            if (meshGeom3d != null)
+            var meshGeom = geom as DynamoGeometryModel3D;
+            if (meshGeom != null)
             {
-                if ((bool)e.NewValue)
-                {
-                    meshGeom3d.Material = HelixWatch3DViewModel.FrozenMaterial;
-                }
-                else
-                {
-                    OnPropertySetFalse(meshGeom3d);
-                }
+
+             HandleMeshPropertyChange(meshGeom, e);
             }
             else if (geom is DynamoPointGeometryModel3D || geom is DynamoLineGeometryModel3D)
             {
@@ -265,7 +210,7 @@ private static void IsFrozenPropertyChanged(DependencyObject obj, DependencyProp
                 }
                 else
                 {
-                    OnPropertySetFalse(geom);
+                    OnPoint_Line_PropertySetFalse(geom);
                 }
             }
         }
@@ -302,19 +247,13 @@ private static void IsolationModePropertyChanged(DependencyObject obj, Dependenc
                 return;
             }
             var geom = (GeometryModel3D)obj;
-            var meshGeom3d = geom as DynamoGeometryModel3D;
-            if (meshGeom3d != null)
+            var meshGeom = geom as DynamoGeometryModel3D;
+            if (meshGeom != null)
             {
-                if ((bool)e.NewValue)
-                {
-                    meshGeom3d.Material = HelixWatch3DViewModel.IsolatedMaterial;
-                }
-                else
-                {
-                    OnPropertySetFalse(meshGeom3d);
-                }
 
-                meshGeom3d.RequiresPerVertexColoration = true;
+                HandleMeshPropertyChange(meshGeom, e);
+                meshGeom.RequiresPerVertexColoration = true;
+
             }
             else if (geom is DynamoPointGeometryModel3D || geom is DynamoLineGeometryModel3D)
             {
@@ -324,7 +263,7 @@ private static void IsolationModePropertyChanged(DependencyObject obj, Dependenc
                 }
                 else
                 {
-                    OnPropertySetFalse(geom);
+                    OnPoint_Line_PropertySetFalse(geom);
                 }
             }
         }
@@ -381,6 +320,19 @@ public static bool IsSpecialRenderPackage(DependencyObject element)
         //#endregion
 
         #region utils
+
+        /// <summary>
+        /// Sets the property value on the DynamoMeshCore - this makes its way down to our shader and invalidates the render.
+        /// </summary>
+        /// <param name="meshGeom"></param>
+        /// <param name="args"></param>
+        private static void HandleMeshPropertyChange(DynamoGeometryModel3D meshGeom, DependencyPropertyChangedEventArgs args)
+        {
+            if ((meshGeom.SceneNode.RenderCore as DynamoGeometryMeshCore) != null)
+            {
+                (meshGeom.SceneNode.RenderCore as DynamoGeometryMeshCore).SetPropertyData(args);
+            }
+        }
 
         /// <summary>
         /// Sets all colors on Geometry to a single color.