From: Helge Norberg <helge.norberg@svt.se>
Date: Tue, 14 Feb 2017 16:54:07 +0000 (+0100)
Subject: [scene] Made rope.scene reference the XML Schema
X-Git-Tag: 2.1.0_Beta2~87
X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=676dce6c0d5c53e981a494690781eac3ce77dd77

[scene] Made rope.scene reference the XML Schema
---

diff --git a/deploy/general/server/media/scene/rope_end.png b/deploy/general/server/media/scene/rope/rope_end.png
similarity index 100%
rename from deploy/general/server/media/scene/rope_end.png
rename to deploy/general/server/media/scene/rope/rope_end.png
diff --git a/deploy/general/server/media/scene/rope_node.png b/deploy/general/server/media/scene/rope/rope_node.png
similarity index 100%
rename from deploy/general/server/media/scene/rope_node.png
rename to deploy/general/server/media/scene/rope/rope_node.png
diff --git a/deploy/general/server/template/scene/rope.scene b/deploy/general/server/template/scene/rope/rope.scene
similarity index 63%
rename from deploy/general/server/template/scene/rope.scene
rename to deploy/general/server/template/scene/rope/rope.scene
index 1dce37842..2447f65af 100644
--- a/deploy/general/server/template/scene/rope.scene
+++ b/deploy/general/server/template/scene/rope/rope.scene
@@ -1,4 +1,5 @@
-<scene width="1280" height="720">
+<?xml version="1.0" encoding="UTF-8"?>
+<scene width="1280" height="720" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/CasparCG/Server/2.1.0/core/producer/scene/scene.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <variables>
     <variable type="number" id="function_amplification" public="true">200</variable>
     <variable type="number" id="anchor2_x"              public="true">1000</variable>
@@ -58,34 +59,34 @@
   </variables>
 
   <layers>
-    <layer id="start"><producer>scene/rope_end</producer>
+    <layer id="start"><producer>scene/rope/rope_end</producer>
       <anchor_x>16</anchor_x>
       <anchor_y>16</anchor_y>
       <x>${variable.anchor1_x}</x>
       <y>${variable.anchor1_y}</y>
     </layer>
 
-    <layer id="node1"><producer>scene/rope_node</producer><x>${variable.node1_x}</x><y>${variable.node1_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 1)}</y></layer>
-    <layer id="node2"><producer>scene/rope_node</producer><x>${variable.node2_x}</x><y>${variable.node2_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 2)}</y></layer>
-    <layer id="node3"><producer>scene/rope_node</producer><x>${variable.node3_x}</x><y>${variable.node3_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 3)}</y></layer>
-    <layer id="node4"><producer>scene/rope_node</producer><x>${variable.node4_x}</x><y>${variable.node4_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 4)}</y></layer>
-    <layer id="node5"><producer>scene/rope_node</producer><x>${variable.node5_x}</x><y>${variable.node5_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 5)}</y></layer>
-    <layer id="node6"><producer>scene/rope_node</producer><x>${variable.node6_x}</x><y>${variable.node6_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 6)}</y></layer>
-    <layer id="node7"><producer>scene/rope_node</producer><x>${variable.node7_x}</x><y>${variable.node7_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 7)}</y></layer>
-    <layer id="node8"><producer>scene/rope_node</producer><x>${variable.node8_x}</x><y>${variable.node8_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 8)}</y></layer>
-    <layer id="node9"><producer>scene/rope_node</producer><x>${variable.node9_x}</x><y>${variable.node9_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 9)}</y></layer>
-    <layer id="node10"><producer>scene/rope_node</producer><x>${variable.node10_x}</x><y>${variable.node10_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 10)}</y></layer>
-    <layer id="node11"><producer>scene/rope_node</producer><x>${variable.node11_x}</x><y>${variable.node11_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 11)}</y></layer>
-    <layer id="node12"><producer>scene/rope_node</producer><x>${variable.node12_x}</x><y>${variable.node12_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 12)}</y></layer>
-    <layer id="node13"><producer>scene/rope_node</producer><x>${variable.node13_x}</x><y>${variable.node13_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 13)}</y></layer>
-    <layer id="node14"><producer>scene/rope_node</producer><x>${variable.node14_x}</x><y>${variable.node14_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 14)}</y></layer>
-    <layer id="node15"><producer>scene/rope_node</producer><x>${variable.node15_x}</x><y>${variable.node15_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 15)}</y></layer>
-    <layer id="node16"><producer>scene/rope_node</producer><x>${variable.node16_x}</x><y>${variable.node16_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 16)}</y></layer>
-    <layer id="node17"><producer>scene/rope_node</producer><x>${variable.node17_x}</x><y>${variable.node17_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 17)}</y></layer>
-    <layer id="node18"><producer>scene/rope_node</producer><x>${variable.node18_x}</x><y>${variable.node18_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 18)}</y></layer>
-    <layer id="node19"><producer>scene/rope_node</producer><x>${variable.node19_x}</x><y>${variable.node19_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 19)}</y></layer>
+    <layer id="node1"><producer>scene/rope/rope_node</producer><x>${variable.node1_x}</x><y>${variable.node1_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 1)}</y></layer>
+    <layer id="node2"><producer>scene/rope/rope_node</producer><x>${variable.node2_x}</x><y>${variable.node2_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 2)}</y></layer>
+    <layer id="node3"><producer>scene/rope/rope_node</producer><x>${variable.node3_x}</x><y>${variable.node3_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 3)}</y></layer>
+    <layer id="node4"><producer>scene/rope/rope_node</producer><x>${variable.node4_x}</x><y>${variable.node4_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 4)}</y></layer>
+    <layer id="node5"><producer>scene/rope/rope_node</producer><x>${variable.node5_x}</x><y>${variable.node5_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 5)}</y></layer>
+    <layer id="node6"><producer>scene/rope/rope_node</producer><x>${variable.node6_x}</x><y>${variable.node6_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 6)}</y></layer>
+    <layer id="node7"><producer>scene/rope/rope_node</producer><x>${variable.node7_x}</x><y>${variable.node7_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 7)}</y></layer>
+    <layer id="node8"><producer>scene/rope/rope_node</producer><x>${variable.node8_x}</x><y>${variable.node8_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 8)}</y></layer>
+    <layer id="node9"><producer>scene/rope/rope_node</producer><x>${variable.node9_x}</x><y>${variable.node9_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 9)}</y></layer>
+    <layer id="node10"><producer>scene/rope/rope_node</producer><x>${variable.node10_x}</x><y>${variable.node10_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 10)}</y></layer>
+    <layer id="node11"><producer>scene/rope/rope_node</producer><x>${variable.node11_x}</x><y>${variable.node11_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 11)}</y></layer>
+    <layer id="node12"><producer>scene/rope/rope_node</producer><x>${variable.node12_x}</x><y>${variable.node12_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 12)}</y></layer>
+    <layer id="node13"><producer>scene/rope/rope_node</producer><x>${variable.node13_x}</x><y>${variable.node13_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 13)}</y></layer>
+    <layer id="node14"><producer>scene/rope/rope_node</producer><x>${variable.node14_x}</x><y>${variable.node14_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 14)}</y></layer>
+    <layer id="node15"><producer>scene/rope/rope_node</producer><x>${variable.node15_x}</x><y>${variable.node15_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 15)}</y></layer>
+    <layer id="node16"><producer>scene/rope/rope_node</producer><x>${variable.node16_x}</x><y>${variable.node16_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 16)}</y></layer>
+    <layer id="node17"><producer>scene/rope/rope_node</producer><x>${variable.node17_x}</x><y>${variable.node17_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 17)}</y></layer>
+    <layer id="node18"><producer>scene/rope/rope_node</producer><x>${variable.node18_x}</x><y>${variable.node18_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 18)}</y></layer>
+    <layer id="node19"><producer>scene/rope/rope_node</producer><x>${variable.node19_x}</x><y>${variable.node19_y + function_amplification * sin(variable.PI / (variable.num_nodes + 1) * 19)}</y></layer>
     <layer id="end">
-      <producer>scene/rope_end</producer>
+      <producer>scene/rope/rope_end</producer>
       <anchor_x>16</anchor_x>
       <anchor_y>16</anchor_y>
       <x>${variable.node20_x}</x>