fixes and ui improvements

KairosResearchLab · Sep 2, 2024 · c508d70 · c508d70
1 parent e00fc2c
commit c508d70
Show file tree

Hide file tree

Showing 13 changed files with 1,473 additions and 1,393 deletions.
diff --git a/VL.Kairos.HDE/VL.Kairos.HDE.vl b/VL.Kairos.HDE/VL.Kairos.HDE.vl
diff --git a/VL.Kairos.Runtime/vl/VL.Kairos.Runtime.PresetEditor.KSM b/VL.Kairos.Runtime/vl/VL.Kairos.Runtime.PresetEditor.KSM
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!DOCTYPE ROOT PUBLIC "" ""[]>
+<KairosSessionModel xmlns:r="reflection" r:Version="2">
+  <Clock_model Loop_Out="10" Period="1" Speed="1" />
+  <Composition_Sampler_Model />
+  <Default_KeyframeEditor_Model ID="86cf56e5-2a10-4008-9e3a-ff8c01e758f7" />
+  <KeyframeEditor_UI_Model Composition_Track_Folding="True" ID="a50cef9c-ecf9-4e19-9d4d-127ae4365f84" Output_Monitor_Folding="True" Time_Grid_Snapping_Enabled="True" Track_Selective_View_Enabled="True" r:Type="KeyframeEditorUIModel [Kairos.KeyframeEditorUI.CompositionUI]">
+    <Camera_Model Maximum_Position_Bound="9999, 9999" Maximum_Zoom="50" Minimum_Position_Bound="-9999, -9999" Minimum_Zoom="0.01" Scroll_Speed="1, 1" Zoom_Speed="1" />
+  </KeyframeEditor_UI_Model>
+  <Settings Auto_Backup_Enabled="True" Auto_Backup_Interval="10" Auto_Save_Enabled="True" />
+</KairosSessionModel>
diff --git a/VL.Kairos.Runtime/vl/VL.Kairos.Runtime.PresetEditor.vl b/VL.Kairos.Runtime/vl/VL.Kairos.Runtime.PresetEditor.vl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Document xmlns:p="property" xmlns:r="reflection" Id="OhniEKN89bdQDm5IiiYvhI" LanguageVersion="2024.6.7-0136-ga34ff89f71" Version="0.128">
+<Document xmlns:p="property" xmlns:r="reflection" Id="HFCS3eDAenrMyDj3nOn005" LanguageVersion="2024.6.7-0136-ga34ff89f71" Version="0.128">
   <Patch Id="OdwjHxvmpTwQVNFJ9pLKQP">
     <Canvas Id="TFkrzzMqabMLaJgnlwzp1b" DefaultCategory="Kairos.PresetEditor" CanvasType="FullCategory">
       <!--

diff --git a/VL.Kairos.Runtime/vl/VL.Kairos.Runtime.Timeline.KSM b/VL.Kairos.Runtime/vl/VL.Kairos.Runtime.Timeline.KSM
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!DOCTYPE ROOT PUBLIC "" ""[]>
+<KairosSessionModel xmlns:r="reflection" r:Version="2">
+  <Clock_model Loop_Out="10" Period="1" Speed="1" />
+  <Composition_Sampler_Model />
+  <Default_KeyframeEditor_Model ID="bf4d0cb3-c88d-4854-addf-40d934358563" />
+  <KeyframeEditor_UI_Model Composition_Track_Folding="True" ID="ca7af725-6e2a-44be-8a62-e3a1ffc8157b" Output_Monitor_Folding="True" Time_Grid_Snapping_Enabled="True" Track_Selective_View_Enabled="True" r:Type="KeyframeEditorUIModel [Kairos.KeyframeEditorUI.CompositionUI]">
+    <Camera_Model Maximum_Position_Bound="9999, 9999" Maximum_Zoom="50" Minimum_Position_Bound="-9999, -9999" Minimum_Zoom="0.01" Scroll_Speed="1, 1" Zoom_Speed="1" />
+  </KeyframeEditor_UI_Model>
+  <Settings Auto_Backup_Enabled="True" Auto_Backup_Interval="10" Auto_Save_Enabled="True" />
+</KairosSessionModel>
diff --git a/VL.Kairos/CHANGELOG.md b/VL.Kairos/CHANGELOG.md
@@ -4,18 +4,23 @@
 #### General
 - Kairos integrated in vvvv as an extension 
 - Timeline is now called KeyframeEditor
+- GetDefaultKeyframeEditor node to access the default KeyframeEditor associated with the Application and to be able to control its clock
 - Launcher1D is now called PresetEditor
-- Launcher1D not supported in this first version of the extension
+- Compositor1D is now called Timeline
+- PresetEditor not supported in this first version of the extension
+- Timeline (former Compositor1D) not supported in this first version of the extension (Still misses a UI)
 - Temporarily no support for patched Kairos compositions UI (no KairosEditor node)
 - Temporarily no support for nested compositions
 - Temporarily no support for recording features
 
 #### Keyframe Editor
 - Keyframe multi-selection (marquee selection)
 - Multi-selection translation and snapping
+- Horizontal(Ctrl key) / Vertical(Alt key) translation constraints
 - Session management: Save, Save As..., Open... , Auto-Save, Auto-Backup
 - Track has two modes: curve view when unfolded, Dopesheet view when folded
-
+- Track visibility controlled by Global Channel Extension views (optional)
+- Keyframe duration handler visible and interactive when Shift key is pressed
 
 ### 1.1.0
 #### New

diff --git a/VL.Kairos/VL.Kairos.vl b/VL.Kairos/VL.Kairos.vl
@@ -1250,7 +1250,7 @@
                 <Pin Id="FC6BLlTBnHrPrJKGi8zBCg" Name="Output" Kind="StateOutputPin" />
                 <Pin Id="LNJeUuY0PguN5WvrfC6e8X" Name="Value" Kind="OutputPin" />
               </Node>
-              <Node Bounds="183,278,306,246" Id="ACkeVprngp9NM5TEOoQoTW">
+              <Node Bounds="183,278,330,246" Id="ACkeVprngp9NM5TEOoQoTW">
                 <p:NodeReference LastCategoryFullName="Primitive" LastDependency="Builtin">
                   <Choice Kind="StatefulRegion" Name="Region (Stateful)" Fixed="true" />
                   <CategoryReference Kind="Category" Name="Primitive" />
@@ -1274,7 +1274,7 @@
                     <Pin Id="A0YsK6Rv9WuPqFjJo95eur" Name="Output" Kind="StateOutputPin" />
                     <Pin Id="Oe5fh5IInspPRlDaLNg6w0" Name="Settings" Kind="InputPin" />
                   </Node>
-                  <Node Bounds="289,420,76,26" Id="OPaBUquS2xHMllzsjUbDXC">
+                  <Node Bounds="289,420,100,26" Id="OPaBUquS2xHMllzsjUbDXC">
                     <p:NodeReference LastCategoryFullName="Kairos.KeyframeEditorUI.CompositionUI.KeyframeEditorUIModel" LastDependency="VL.Kairos.KeyframeEditorUI.vl">
                       <Choice Kind="NodeFlag" Name="Node" Fixed="true" />
                       <CategoryReference Kind="RecordType" Name="KeyframeEditorUIModel" />
@@ -1283,7 +1283,7 @@
                     <Pin Id="LmovjAk5BCULnElsvQqaFf" Name="Output" Kind="StateOutputPin" />
                     <Pin Id="LBCKKANSktXQW5RLEc4m3H" Name="Node Context" Kind="InputPin" IsHidden="true" />
                   </Node>
-                  <Node Bounds="195,304,69,26" Id="LWQRn1jgEWOO9CuxzmK6sm">
+                  <Node Bounds="195,304,92,26" Id="LWQRn1jgEWOO9CuxzmK6sm">
                     <p:NodeReference LastCategoryFullName="Kairos.KeyframeEditor.KeyframeEditorModel" LastDependency="VL.Kairos.Runtime.vl">
                       <Choice Kind="NodeFlag" Name="Node" Fixed="true" />
                       <FullNameCategoryReference ID="Kairos.KeyframeEditor.KeyframeEditorModel" />
@@ -1310,7 +1310,7 @@
                     <Pin Id="E2HLn8XNm5fLyVMhTKjsWG" Name="Output" Kind="StateOutputPin" />
                     <Pin Id="MuqCa39zQmDQVFXqQgCi6t" Name="Node Context" Kind="InputPin" IsHidden="true" />
                   </Node>
-                  <Node Bounds="383,420,94,26" Id="AWzLb4a2Vb8LKQBWSSFchu">
+                  <Node Bounds="407,421,94,26" Id="AWzLb4a2Vb8LKQBWSSFchu">
                     <p:NodeReference LastCategoryFullName="Kairos.KairosSessionSettings" LastDependency="VL.Kairos.vl">
                       <Choice Kind="NodeFlag" Name="Node" Fixed="true" />
                       <CategoryReference Kind="RecordType" Name="KairosSessionSettings" />
@@ -2962,6 +2962,5 @@
   <DocumentDependency Id="DiCGphHY3nlOaQDHGZ9dg4" Location="./vl/VL.Kairos.CompositionSamplerUI.vl" IsForward="true" IsFriend="true" />
   <NugetDependency Id="TJl8wZHN8i0QC59vyR9UH1" Location="VL.HDE" Version="2024.6.7-0136-ga34ff89f71" />
   <NugetDependency Id="JdMGwJLU3i9MSjf5PAMf7b" Location="VL.Core" Version="2024.6.7-0136-ga34ff89f71" />
-  <DocumentDependency Id="SsEg9hXHvuJL4qfbZTam86" Location="./vl/VL.Kairos.Launcher1DUI.vl" IsForward="true" IsFriend="true" />
-  <NugetDependency Id="UaUEf3SUwExNpJcyO2pi44" Location="VL.Kairos" Version="0.0.0" />
+  <DocumentDependency Id="PvABVQK1uP6P41jx2hAlTg" Location="./vl/VL.Kairos.PresetEditorUI.vl" IsForward="true" />
 </Document>
diff --git a/VL.Kairos/deployment/VL.Kairos.nuspec b/VL.Kairos/deployment/VL.Kairos.nuspec
@@ -22,7 +22,7 @@
     <file src="..\CHANGELOG.md" target="" />
     <file src="..\*.vl" target="" exclude="..\RnD\" />
     <file src="..\help\**\*.vl" target="\help" exclude="" />
-    <file src="..\help\help.xml" target="\help" exclude="" />
+    <!--<file src="..\help\help.xml" target="\help" exclude="" /> -->
     <file src="..\vl\**" target="\vl" exclude="" />
   </files>
 </package>