From 9faef188744cefc4debb1fa82ea80bdae6b80a14 Mon Sep 17 00:00:00 2001
From: bruno-f-cruz <7049351+bruno-f-cruz@users.noreply.github.com>
Date: Tue, 21 May 2024 13:32:11 -0700
Subject: [PATCH] Favor core package implementation of DrawScaledTexturedModel

---
 src/Extensions/DrawSegment.bonsai       |  44 +--
 src/Extensions/DrawTexturedModel.bonsai | 391 ------------------------
 2 files changed, 22 insertions(+), 413 deletions(-)
 delete mode 100644 src/Extensions/DrawTexturedModel.bonsai

diff --git a/src/Extensions/DrawSegment.bonsai b/src/Extensions/DrawSegment.bonsai
index a07af19f..a35a23cb 100644
--- a/src/Extensions/DrawSegment.bonsai
+++ b/src/Extensions/DrawSegment.bonsai
@@ -143,15 +143,15 @@ PostCorridorSpecs.CenterZ as CenterZ)</scr:Expression>
               </PropertyMappings>
               <Selector>Item1</Selector>
             </Expression>
-            <Expression xsi:type="IncludeWorkflow" Path="Extensions\DrawTexturedModel.bonsai">
+            <Expression xsi:type="IncludeWorkflow" Path="AllenNeuralDynamics.Core:DrawScaledTexturedModel.bonsai">
               <TranslationX>0</TranslationX>
               <TranslationY>0</TranslationY>
-              <TranslationZ>1950</TranslationZ>
+              <TranslationZ>25</TranslationZ>
               <RotationZ>0</RotationZ>
               <RotationY>0</RotationY>
               <RotationX>90</RotationX>
               <ScaleX>10</ScaleX>
-              <ScaleY>100</ScaleY>
+              <ScaleY>50</ScaleY>
               <ScaleZ>1.58139539</ScaleZ>
               <Ambient>
                 <X>1</X>
@@ -216,15 +216,15 @@ CorridorSpecs.Size.Height as TranslationY)</scr:Expression>
               </PropertyMappings>
               <Selector>Item1</Selector>
             </Expression>
-            <Expression xsi:type="IncludeWorkflow" Path="Extensions\DrawTexturedModel.bonsai">
+            <Expression xsi:type="IncludeWorkflow" Path="AllenNeuralDynamics.Core:DrawScaledTexturedModel.bonsai">
               <TranslationX>0</TranslationX>
-              <TranslationY>10</TranslationY>
-              <TranslationZ>1950</TranslationZ>
+              <TranslationY>0</TranslationY>
+              <TranslationZ>25</TranslationZ>
               <RotationZ>0</RotationZ>
               <RotationY>0</RotationY>
-              <RotationX>-90</RotationX>
+              <RotationX>90</RotationX>
               <ScaleX>10</ScaleX>
-              <ScaleY>100</ScaleY>
+              <ScaleY>50</ScaleY>
               <ScaleZ>1.58139539</ScaleZ>
               <Ambient>
                 <X>1</X>
@@ -291,15 +291,15 @@ PostCorridorSpecs.NegOffsetX as NegOffsetX)</scr:Expression>
               </PropertyMappings>
               <Selector>Item1</Selector>
             </Expression>
-            <Expression xsi:type="IncludeWorkflow" Path="Extensions\DrawTexturedModel.bonsai">
-              <TranslationX>-5</TranslationX>
-              <TranslationY>5</TranslationY>
-              <TranslationZ>1950</TranslationZ>
-              <RotationZ>-90</RotationZ>
+            <Expression xsi:type="IncludeWorkflow" Path="AllenNeuralDynamics.Core:DrawScaledTexturedModel.bonsai">
+              <TranslationX>0</TranslationX>
+              <TranslationY>0</TranslationY>
+              <TranslationZ>25</TranslationZ>
+              <RotationZ>0</RotationZ>
               <RotationY>0</RotationY>
-              <RotationX>-90</RotationX>
+              <RotationX>90</RotationX>
               <ScaleX>10</ScaleX>
-              <ScaleY>100</ScaleY>
+              <ScaleY>50</ScaleY>
               <ScaleZ>1.58139539</ScaleZ>
               <Ambient>
                 <X>1</X>
@@ -367,15 +367,15 @@ CorridorSpecs.Size.Height as TranslationY)</scr:Expression>
               </PropertyMappings>
               <Selector>Item1</Selector>
             </Expression>
-            <Expression xsi:type="IncludeWorkflow" Path="Extensions\DrawTexturedModel.bonsai">
-              <TranslationX>5</TranslationX>
-              <TranslationY>5</TranslationY>
-              <TranslationZ>1950</TranslationZ>
-              <RotationZ>90</RotationZ>
+            <Expression xsi:type="IncludeWorkflow" Path="AllenNeuralDynamics.Core:DrawScaledTexturedModel.bonsai">
+              <TranslationX>0</TranslationX>
+              <TranslationY>0</TranslationY>
+              <TranslationZ>25</TranslationZ>
+              <RotationZ>0</RotationZ>
               <RotationY>0</RotationY>
-              <RotationX>-90</RotationX>
+              <RotationX>90</RotationX>
               <ScaleX>10</ScaleX>
-              <ScaleY>100</ScaleY>
+              <ScaleY>50</ScaleY>
               <ScaleZ>1.58139539</ScaleZ>
               <Ambient>
                 <X>1</X>
diff --git a/src/Extensions/DrawTexturedModel.bonsai b/src/Extensions/DrawTexturedModel.bonsai
deleted file mode 100644
index d9bef630..00000000
--- a/src/Extensions/DrawTexturedModel.bonsai
+++ /dev/null
@@ -1,391 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WorkflowBuilder Version="2.8.1"
-                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xmlns:gl="clr-namespace:Bonsai.Shaders;assembly=Bonsai.Shaders"
-                 xmlns:bv="clr-namespace:BonVision;assembly=BonVision"
-                 xmlns:rx="clr-namespace:Bonsai.Reactive;assembly=Bonsai.Core"
-                 xmlns:p1="clr-namespace:OpenTK;assembly=OpenTK"
-                 xmlns="https://bonsai-rx.org/2018/workflow">
-  <Description>Draws a textured and transformed 3D model stimulus.</Description>
-  <Workflow>
-    <Nodes>
-      <Expression xsi:type="WorkflowInput">
-        <Name>Source1</Name>
-      </Expression>
-      <Expression xsi:type="MemberSelector">
-        <Selector>ViewMatrix</Selector>
-      </Expression>
-      <Expression xsi:type="ExternalizedMapping">
-        <Property Name="X" DisplayName="TranslationX" />
-        <Property Name="Y" DisplayName="TranslationY" />
-        <Property Name="Z" DisplayName="TranslationZ" />
-      </Expression>
-      <Expression xsi:type="Combinator">
-        <Combinator xsi:type="gl:Translate">
-          <gl:Order>Prepend</gl:Order>
-          <gl:X>0</gl:X>
-          <gl:Y>0</gl:Y>
-          <gl:Z>25</gl:Z>
-        </Combinator>
-      </Expression>
-      <Expression xsi:type="ExternalizedMapping">
-        <Property Name="Value" DisplayName="RotationZ" Description="The rotation about the z-axis." />
-      </Expression>
-      <Expression xsi:type="Combinator">
-        <Combinator xsi:type="bv:AngleProperty">
-          <bv:Value>0</bv:Value>
-        </Combinator>
-      </Expression>
-      <Expression xsi:type="PropertyMapping">
-        <PropertyMappings>
-          <Property Name="Angle" />
-        </PropertyMappings>
-      </Expression>
-      <Expression xsi:type="Combinator">
-        <Combinator xsi:type="gl:RotateZ">
-          <gl:Order>Prepend</gl:Order>
-          <gl:Angle>0</gl:Angle>
-        </Combinator>
-      </Expression>
-      <Expression xsi:type="ExternalizedMapping">
-        <Property Name="Value" DisplayName="RotationY" Description="The rotation about the y-axis." />
-      </Expression>
-      <Expression xsi:type="Combinator">
-        <Combinator xsi:type="bv:AngleProperty">
-          <bv:Value>0</bv:Value>
-        </Combinator>
-      </Expression>
-      <Expression xsi:type="PropertyMapping">
-        <PropertyMappings>
-          <Property Name="Angle" />
-        </PropertyMappings>
-      </Expression>
-      <Expression xsi:type="Combinator">
-        <Combinator xsi:type="gl:RotateY">
-          <gl:Order>Prepend</gl:Order>
-          <gl:Angle>0</gl:Angle>
-        </Combinator>
-      </Expression>
-      <Expression xsi:type="ExternalizedMapping">
-        <Property Name="Value" DisplayName="RotationX" Description="The rotation about the x-axis." />
-      </Expression>
-      <Expression xsi:type="Combinator">
-        <Combinator xsi:type="bv:AngleProperty">
-          <bv:Value>90</bv:Value>
-        </Combinator>
-      </Expression>
-      <Expression xsi:type="PropertyMapping">
-        <PropertyMappings>
-          <Property Name="Angle" />
-        </PropertyMappings>
-      </Expression>
-      <Expression xsi:type="Combinator">
-        <Combinator xsi:type="gl:RotateX">
-          <gl:Order>Prepend</gl:Order>
-          <gl:Angle>1.57079637</gl:Angle>
-        </Combinator>
-      </Expression>
-      <Expression xsi:type="ExternalizedMapping">
-        <Property Name="X" DisplayName="ScaleX" />
-        <Property Name="Y" DisplayName="ScaleY" />
-        <Property Name="Z" DisplayName="ScaleZ" />
-      </Expression>
-      <Expression xsi:type="Combinator">
-        <Combinator xsi:type="gl:Scale">
-          <gl:Order>Prepend</gl:Order>
-          <gl:X>10</gl:X>
-          <gl:Y>50</gl:Y>
-          <gl:Z>1.58139539</gl:Z>
-        </Combinator>
-      </Expression>
-      <Expression xsi:type="Combinator">
-        <Combinator xsi:type="gl:UpdateUniform">
-          <gl:UniformName>modelview</gl:UniformName>
-          <gl:ShaderName>ScaledTexturedModel</gl:ShaderName>
-        </Combinator>
-      </Expression>
-      <Expression xsi:type="Combinator">
-        <Combinator xsi:type="gl:NormalMatrix" />
-      </Expression>
-      <Expression xsi:type="Combinator">
-        <Combinator xsi:type="gl:UpdateUniform">
-          <gl:UniformName>normalMatrix</gl:UniformName>
-          <gl:ShaderName>TexturedModel</gl:ShaderName>
-        </Combinator>
-      </Expression>
-      <Expression xsi:type="MemberSelector">
-        <Selector>ProjectionMatrix</Selector>
-      </Expression>
-      <Expression xsi:type="Combinator">
-        <Combinator xsi:type="gl:UpdateUniform">
-          <gl:UniformName>projection</gl:UniformName>
-          <gl:ShaderName>ScaledTexturedModel</gl:ShaderName>
-        </Combinator>
-      </Expression>
-      <Expression xsi:type="MemberSelector">
-        <Selector>Light</Selector>
-      </Expression>
-      <Expression xsi:type="Combinator">
-        <Combinator xsi:type="gl:UpdateUniform">
-          <gl:UniformName>light</gl:UniformName>
-          <gl:ShaderName>ScaledTexturedModel</gl:ShaderName>
-        </Combinator>
-      </Expression>
-      <Expression xsi:type="Combinator">
-        <Combinator xsi:type="rx:Zip" />
-      </Expression>
-      <Expression xsi:type="ExternalizedMapping">
-        <Property Name="Ambient" Description="The amount and color of the ambient light reflected by the material." Category="Model Material" />
-        <Property Name="Diffuse" Description="The amount and color of the diffuse light reflected by the material.&#xD;&#xA;" Category="Model Material" />
-        <Property Name="Specular" Description="The amount and color of the specular light reflected by the material.&#xD;&#xA;" Category="Model Material" />
-        <Property Name="SpecularExponent" Description="The exponent used to compute the specular response of the material." Category="Model Material" />
-      </Expression>
-      <Expression xsi:type="GroupWorkflow">
-        <Name>UpdateMaterial</Name>
-        <Workflow>
-          <Nodes>
-            <Expression xsi:type="WorkflowInput">
-              <Name>Source1</Name>
-            </Expression>
-            <Expression xsi:type="ExternalizedMapping">
-              <Property Name="Value" DisplayName="Ambient" />
-            </Expression>
-            <Expression xsi:type="PropertySource" TypeArguments="gl:CreateLookAt,p1:Vector3">
-              <MemberName>Eye</MemberName>
-              <Value>
-                <X>1</X>
-                <Y>1</Y>
-                <Z>1</Z>
-              </Value>
-            </Expression>
-            <Expression xsi:type="InputMapping">
-              <PropertyMappings>
-                <Property Name="X" Selector="X" />
-                <Property Name="Y" Selector="Y" />
-                <Property Name="Z" Selector="Z" />
-              </PropertyMappings>
-            </Expression>
-            <Expression xsi:type="Combinator">
-              <Combinator xsi:type="gl:CreateVector4">
-                <gl:X>1</gl:X>
-                <gl:Y>1</gl:Y>
-                <gl:Z>1</gl:Z>
-                <gl:W>1</gl:W>
-              </Combinator>
-            </Expression>
-            <Expression xsi:type="Combinator">
-              <Combinator xsi:type="gl:UpdateUniform">
-                <gl:UniformName>colorAmbient</gl:UniformName>
-                <gl:ShaderName>ScaledTexturedModel</gl:ShaderName>
-              </Combinator>
-            </Expression>
-            <Expression xsi:type="ExternalizedMapping">
-              <Property Name="Value" DisplayName="Diffuse" />
-            </Expression>
-            <Expression xsi:type="PropertySource" TypeArguments="gl:CreateLookAt,p1:Vector3">
-              <MemberName>Eye</MemberName>
-              <Value>
-                <X>0</X>
-                <Y>0</Y>
-                <Z>0</Z>
-              </Value>
-            </Expression>
-            <Expression xsi:type="InputMapping">
-              <PropertyMappings>
-                <Property Name="X" Selector="X" />
-                <Property Name="Y" Selector="Y" />
-                <Property Name="Z" Selector="Z" />
-              </PropertyMappings>
-            </Expression>
-            <Expression xsi:type="Combinator">
-              <Combinator xsi:type="gl:CreateVector4">
-                <gl:X>0</gl:X>
-                <gl:Y>0</gl:Y>
-                <gl:Z>0</gl:Z>
-                <gl:W>1</gl:W>
-              </Combinator>
-            </Expression>
-            <Expression xsi:type="Combinator">
-              <Combinator xsi:type="gl:UpdateUniform">
-                <gl:UniformName>colorDiffuse</gl:UniformName>
-                <gl:ShaderName>ScaledTexturedModel</gl:ShaderName>
-              </Combinator>
-            </Expression>
-            <Expression xsi:type="ExternalizedMapping">
-              <Property Name="Value" DisplayName="Specular" />
-            </Expression>
-            <Expression xsi:type="PropertySource" TypeArguments="gl:CreateLookAt,p1:Vector3">
-              <MemberName>Eye</MemberName>
-              <Value>
-                <X>0</X>
-                <Y>0</Y>
-                <Z>0</Z>
-              </Value>
-            </Expression>
-            <Expression xsi:type="InputMapping">
-              <PropertyMappings>
-                <Property Name="X" Selector="X" />
-                <Property Name="Y" Selector="Y" />
-                <Property Name="Z" Selector="Z" />
-              </PropertyMappings>
-            </Expression>
-            <Expression xsi:type="Combinator">
-              <Combinator xsi:type="gl:CreateVector4">
-                <gl:X>0</gl:X>
-                <gl:Y>0</gl:Y>
-                <gl:Z>0</gl:Z>
-                <gl:W>1</gl:W>
-              </Combinator>
-            </Expression>
-            <Expression xsi:type="Combinator">
-              <Combinator xsi:type="gl:UpdateUniform">
-                <gl:UniformName>colorSpecular</gl:UniformName>
-                <gl:ShaderName>ScaledTexturedModel</gl:ShaderName>
-              </Combinator>
-            </Expression>
-            <Expression xsi:type="ExternalizedMapping">
-              <Property Name="Value" DisplayName="SpecularExponent" />
-            </Expression>
-            <Expression xsi:type="Combinator">
-              <Combinator xsi:type="FloatProperty">
-                <Value>1</Value>
-              </Combinator>
-            </Expression>
-            <Expression xsi:type="Combinator">
-              <Combinator xsi:type="gl:UpdateUniform">
-                <gl:UniformName>shininess</gl:UniformName>
-                <gl:ShaderName>ScaledTexturedModel</gl:ShaderName>
-              </Combinator>
-            </Expression>
-            <Expression xsi:type="WorkflowOutput" />
-          </Nodes>
-          <Edges>
-            <Edge From="0" To="2" Label="Source1" />
-            <Edge From="1" To="2" Label="Source2" />
-            <Edge From="2" To="3" Label="Source1" />
-            <Edge From="3" To="4" Label="Source1" />
-            <Edge From="4" To="5" Label="Source1" />
-            <Edge From="5" To="7" Label="Source1" />
-            <Edge From="6" To="7" Label="Source2" />
-            <Edge From="7" To="8" Label="Source1" />
-            <Edge From="8" To="9" Label="Source1" />
-            <Edge From="9" To="10" Label="Source1" />
-            <Edge From="10" To="12" Label="Source1" />
-            <Edge From="11" To="12" Label="Source2" />
-            <Edge From="12" To="13" Label="Source1" />
-            <Edge From="13" To="14" Label="Source1" />
-            <Edge From="14" To="15" Label="Source1" />
-            <Edge From="15" To="17" Label="Source1" />
-            <Edge From="16" To="17" Label="Source2" />
-            <Edge From="17" To="18" Label="Source1" />
-            <Edge From="18" To="19" Label="Source1" />
-          </Edges>
-        </Workflow>
-      </Expression>
-      <Expression xsi:type="ExternalizedMapping">
-        <Property Name="TextureScaleX" />
-        <Property Name="TextureScaleY" />
-        <Property Name="TextureShiftX" />
-        <Property Name="TextureShiftY" />
-      </Expression>
-      <Expression xsi:type="GroupWorkflow">
-        <Name>TextureScaleShift</Name>
-        <Workflow>
-          <Nodes>
-            <Expression xsi:type="WorkflowInput">
-              <Name>Source1</Name>
-            </Expression>
-            <Expression xsi:type="ExternalizedMapping">
-              <Property Name="X" DisplayName="TextureScaleX" Category="Texture Mapping" />
-              <Property Name="Y" DisplayName="TextureScaleY" Category="Texture Mapping" />
-            </Expression>
-            <Expression xsi:type="Combinator">
-              <Combinator xsi:type="bv:CreateTextureScale">
-                <bv:X>1</bv:X>
-                <bv:Y>1</bv:Y>
-              </Combinator>
-            </Expression>
-            <Expression xsi:type="Combinator">
-              <Combinator xsi:type="gl:UpdateUniform">
-                <gl:UniformName>scale</gl:UniformName>
-                <gl:ShaderName>ScaledTexturedModel</gl:ShaderName>
-              </Combinator>
-            </Expression>
-            <Expression xsi:type="ExternalizedMapping">
-              <Property Name="X" DisplayName="TextureShiftX" Category="Texture Mapping" />
-              <Property Name="Y" DisplayName="TextureShiftY" Category="Texture Mapping" />
-            </Expression>
-            <Expression xsi:type="Combinator">
-              <Combinator xsi:type="bv:CreateTextureShift">
-                <bv:X>0</bv:X>
-                <bv:Y>0</bv:Y>
-              </Combinator>
-            </Expression>
-            <Expression xsi:type="Combinator">
-              <Combinator xsi:type="gl:UpdateUniform">
-                <gl:UniformName>shift</gl:UniformName>
-                <gl:ShaderName>ScaledTexturedModel</gl:ShaderName>
-              </Combinator>
-            </Expression>
-            <Expression xsi:type="WorkflowOutput" />
-          </Nodes>
-          <Edges>
-            <Edge From="0" To="2" Label="Source1" />
-            <Edge From="1" To="2" Label="Source2" />
-            <Edge From="2" To="3" Label="Source1" />
-            <Edge From="3" To="5" Label="Source1" />
-            <Edge From="4" To="5" Label="Source2" />
-            <Edge From="5" To="6" Label="Source1" />
-            <Edge From="6" To="7" Label="Source1" />
-          </Edges>
-        </Workflow>
-      </Expression>
-      <Expression xsi:type="ExternalizedMapping">
-        <Property Name="MeshName" />
-      </Expression>
-      <Expression xsi:type="Combinator">
-        <Combinator xsi:type="gl:DrawMesh">
-          <gl:ShaderName>ScaledTexturedModel</gl:ShaderName>
-          <gl:MeshName>Plane</gl:MeshName>
-        </Combinator>
-      </Expression>
-      <Expression xsi:type="WorkflowOutput" />
-    </Nodes>
-    <Edges>
-      <Edge From="0" To="1" Label="Source1" />
-      <Edge From="0" To="21" Label="Source1" />
-      <Edge From="0" To="23" Label="Source1" />
-      <Edge From="1" To="3" Label="Source1" />
-      <Edge From="2" To="3" Label="Source2" />
-      <Edge From="3" To="7" Label="Source1" />
-      <Edge From="4" To="5" Label="Source1" />
-      <Edge From="5" To="6" Label="Source1" />
-      <Edge From="6" To="7" Label="Source2" />
-      <Edge From="7" To="11" Label="Source1" />
-      <Edge From="8" To="9" Label="Source1" />
-      <Edge From="9" To="10" Label="Source1" />
-      <Edge From="10" To="11" Label="Source2" />
-      <Edge From="11" To="15" Label="Source1" />
-      <Edge From="12" To="13" Label="Source1" />
-      <Edge From="13" To="14" Label="Source1" />
-      <Edge From="14" To="15" Label="Source2" />
-      <Edge From="15" To="17" Label="Source1" />
-      <Edge From="16" To="17" Label="Source2" />
-      <Edge From="17" To="18" Label="Source1" />
-      <Edge From="18" To="19" Label="Source1" />
-      <Edge From="19" To="20" Label="Source1" />
-      <Edge From="20" To="25" Label="Source1" />
-      <Edge From="21" To="22" Label="Source1" />
-      <Edge From="22" To="25" Label="Source2" />
-      <Edge From="23" To="24" Label="Source1" />
-      <Edge From="24" To="25" Label="Source3" />
-      <Edge From="25" To="27" Label="Source1" />
-      <Edge From="26" To="27" Label="Source2" />
-      <Edge From="27" To="29" Label="Source1" />
-      <Edge From="28" To="29" Label="Source2" />
-      <Edge From="29" To="31" Label="Source1" />
-      <Edge From="30" To="31" Label="Source2" />
-      <Edge From="31" To="32" Label="Source1" />
-    </Edges>
-  </Workflow>
-</WorkflowBuilder>
\ No newline at end of file