RUIC 0.4.6 → 0.5.0

data/test/customclasses.ruic

@@ -1,21 +1,31 @@
-#!/usr/bin/env ruic
-metadata 'MetaData.xml'                         # optional; also may be set via -m flag
-uia 'projects/CustomClasses/CustomClasses.uia'  # required before other commands
-show app.errors if app.errors?
-
-main = app.main_presentation
-
-effect = main/"Scene.Layer.Brush Strokes"
-assert effect
-assert effect.name == "Brush Strokes"
-assert effect.properties.length == 11 # 6 shared asset, 1 effect, 4 from effect
-assert effect['brushAngle'].value == 45
-assert effect['starttime',1] == 0
-assert effect['NoiseSamp'].value == 'maps/effects/brushnoise.dds'
-
-material = main/"Scene.Layer.Rectangle.Material"
-assert material.properties.length == 12 # 6 shared asset, 2 MaterialBase, 4 from material
-assert material.name == "Material"
-assert material['uEnvironmentMappingEnabled']
-assert !material['ATTRIBUTE-DOES-NOT-EXIST']
-assert material['uEnvironmentTexture',1] == 'maps/materials/spherical_checker.png'
+#!/usr/bin/env ruic
+metadata 'MetaData.xml'                         # optional; also may be set via -m flag
+uia 'projects/CustomClasses/CustomClasses.uia'  # required before other commands
+show app.errors if app.errors?
+
+main = app.main_presentation
+
+effect = main/"Scene.Layer.Brush Strokes"
+assert effect
+assert effect.name == "Brush Strokes"
+assert effect.properties.length == 11 # 6 shared asset, 1 effect, 4 from effect
+assert effect['brushAngle'].value == 45
+assert effect['starttime',1] == 0
+assert effect['NoiseSamp'].value == 'maps/effects/brushnoise.dds'
+
+material = main/"Scene.Layer.Rectangle.Material"
+assert material.properties.length == 12 # 6 shared asset, 2 MaterialBase, 4 from material
+assert material.name == "Material"
+assert material['uEnvironmentMappingEnabled']
+assert !material['ATTRIBUTE-DOES-NOT-EXIST']
+assert material['uEnvironmentTexture',1] == 'maps/materials/spherical_checker.png'
+
+b1 = main/'Scene.TimeDrivenAttribute'
+assert b1.name == 'TimeDrivenAttribute'
+assert b1['sourcepath',0][/[^\/\\]+$/]=='TimeDrivenAttribute.lua'
+
+b2 = main/'Scene.Layer.DataDrivenTime'
+assert b2.name == 'DataDrivenTime'
+assert b2['sourcepath',0][/[^\/\\]+$/]=='DataDrivenTime.lua'
+
+show "(all assertions successful)"

data/test/filtering.ruic

@@ -1,44 +1,44 @@
-metadata 'MetaData.xml'
-
-uia 'projects/SimpleScene/SimpleScene.uia'
-show app.errors if app.errors?
-
-main = app.main_presentation
-
-assert main.find( _type:'Model' ).length==4
-assert main.find( _type:'Model', _slide:0 ).length==3
-assert main.find( _type:'Model', _slide:1 ).length==4
-assert main.find( _type:'Model', _slide:1, _master:false ).length==1
-assert main.find( _type:'Model', position:[-150,60,0] ).length==2
-assert main.find( _type:'Model', position:[-150,60,0] ).length==2
-assert main.find( _type:'Model', position:[nil,60,nil] ).length==4
-assert main.find( _type:'Model', sourcepath:'#Cube' ).length==1
-assert main.find( _under:main/"Scene.Layer.Sphere1" ).length==1
-assert main.find( name:'Material' ).length==4
-assert main.find( name:/^Sphere/ ).length==2
-
-# Return values are in Scene graph order
-assert main.find.first == main/"Scene"
-assert main.find.last  == main/"Scene.Layer.NonMaster.Material"
-
-# Any asset can be used as the 'root'
-sphere = main/"Scene.Layer.Sphere1"
-assert sphere.find.length==1
-
-# Supplying a block will iterate, including the index
-expected = main.find _type:'Model'
-found = 0
-main.find _type:'Model' do |mod,i|
-	found += 1
-	assert mod == expected[i]
-end
-assert found==4
-
-#
-['NOPE',false,/NOPE/,-1,[-1],nil].each do |v|
-	assert main.find(__type:v).length==0
-	assert main.find(NOPE:v).length==0
-	assert main.find('NOPE'=>v).length==0
-end
-
+metadata 'MetaData.xml'
+
+uia 'projects/SimpleScene/SimpleScene.uia'
+show app.errors if app.errors?
+
+main = app.main_presentation
+
+assert main.find( _type:'Model' ).length==4
+assert main.find( _type:'Model', _slide:0 ).length==3
+assert main.find( _type:'Model', _slide:1 ).length==4
+assert main.find( _type:'Model', _slide:1, _master:false ).length==1
+assert main.find( _type:'Model', position:[-150,60,0] ).length==2
+assert main.find( _type:'Model', position:[-150,60,0] ).length==2
+assert main.find( _type:'Model', position:[nil,60,nil] ).length==4
+assert main.find( _type:'Model', sourcepath:'#Cube' ).length==1
+assert main.find( _under:main/"Scene.Layer.Sphere1" ).length==1
+assert main.find( name:'Material' ).length==4
+assert main.find( name:/^Sphere/ ).length==2
+
+# Return values are in Scene graph order
+assert main.find.first == main/"Scene"
+assert main.find.last  == main/"Scene.Layer.NonMaster.Material"
+
+# Any asset can be used as the 'root'
+sphere = main/"Scene.Layer.Sphere1"
+assert sphere.find.length==1
+
+# Supplying a block will iterate, including the index
+expected = main.find _type:'Model'
+found = 0
+main.find _type:'Model' do |mod,i|
+	found += 1
+	assert mod == expected[i]
+end
+assert found==4
+
+#
+['NOPE',false,/NOPE/,-1,[-1],nil].each do |v|
+	assert main.find(__type:v).length==0
+	assert main.find(NOPE:v).length==0
+	assert main.find('NOPE'=>v).length==0
+end
+
 show "All #{File.basename(__FILE__)} assertions successful."

data/test/futureassets.ruic

@@ -1,9 +1,9 @@
-metadata 'MetaData-simple.xml'
-uia 'projects/CustomClasses/CustomClasses.uia'  # required before other commands
-show app.errors if app.errors?
-
-future = app["#future"]
-
-assert xyzzy=future.find(_type:'XYZZY').first
-assert xyzzy.type == 'XYZZY'
+metadata 'MetaData-simple.xml'
+uia 'projects/CustomClasses/CustomClasses.uia'  # required before other commands
+show app.errors if app.errors?
+
+future = app["#future"]
+
+assert xyzzy=future.find(_type:'XYZZY').first
+assert xyzzy.type == 'XYZZY'
 assert xyzzy['eyeball',0]==true # Unknown assets inherit from Asset

data/test/paths.ruic

@@ -1,19 +1,19 @@
-#!/usr/bin/env ruic
-metadata 'MetaData.xml'         # optional; also may be set via -m flag
-uia 'projects/Paths/Paths.uia'  # required before other commands
-
-show "Uh oh!", app.errors if app.errors?
-
-main = app.main
-paths = main.find _type:'Path'
-assert paths.length == 5
-assert paths.first == main/"Scene.Layer.Path1"
-assert paths.first['width'].value == 17
-
-assert main.find(_type:'PathAnchorPoint').length == 25
-
-assert paths.first.anchors
-assert paths.first.anchors.first == paths.first.find(_type:'PathAnchorPoint').first
-
-
+#!/usr/bin/env ruic
+metadata 'MetaData.xml'         # optional; also may be set via -m flag
+uia 'projects/Paths/Paths.uia'  # required before other commands
+
+show "Uh oh!", app.errors if app.errors?
+
+main = app.main
+paths = main.find _type:'Path'
+assert paths.length == 5
+assert paths.first == main/"Scene.Layer.Path1"
+assert paths.first['width'].value == 17
+
+assert main.find(_type:'PathAnchorPoint').length == 25
+
+assert paths.first.anchors
+assert paths.first.anchors.first == paths.first.find(_type:'PathAnchorPoint').first
+
+
 show "All assertions successful"

data/test/projects/CustomClasses/CustomClasses.uia

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://nvidia.com/uicomposer">
-	<assets initial="CustomClasses">
-		<presentation id="CustomClasses"	src="CustomClasses.uip"/>
-		<presentation id="future"	src="FutureAsset.uip"/>
-	</assets>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://nvidia.com/uicomposer">
+	<assets initial="main">
+		<presentation id="main"	src="CustomClasses.uip"/>
+		<presentation id="future"	src="FutureAsset.uip"/>
+	</assets>
+</application>

data/test/projects/CustomClasses/CustomClasses.uip

@@ -5,24 +5,30 @@
 		<Classes >
 			<Effect id="Brush Strokes" name="Brush Strokes" sourcepath=".\Brush Strokes.effect" />
 			<CustomMaterial id="copper" name="copper" sourcepath=".\copper.material" />
+			<Behavior id="DataDrivenTime" name="DataDrivenTime" sourcepath=".\scripts\DataDrivenTime.lua" />
+			<Behavior id="TimeDrivenAttribute" name="TimeDrivenAttribute" sourcepath=".\scripts\TimeDrivenAttribute.lua" />
 		</Classes>
 		<Graph >
 			<Scene id="Scene" >
+				<Behavior id="TimeDrivenAttribute_001" class="#TimeDrivenAttribute" />
 				<Layer id="Layer" >
 					<Camera id="Camera" />
 					<Light id="Light" />
-					<Effect id="Brush Strokes_001" class="#Brush Strokes" />
 					<Model id="Rectangle" >
 						<CustomMaterial id="Material" class="#copper" />
 					</Model>
+					<Behavior id="DataDrivenTime_001" class="#DataDrivenTime" />
+					<Effect id="Brush Strokes_001" class="#Brush Strokes" />
 				</Layer>
 			</Scene>
 		</Graph>
 		<Logic >
 			<State name="Master Slide" component="#Scene" >
+				<Add ref="#TimeDrivenAttribute_001" />
 				<Add ref="#Layer" />
 				<Add ref="#Camera" />
 				<Add ref="#Light" />
+				<Add ref="#DataDrivenTime_001" />
 				<State id="Scene-Slide1" name="Slide1" >
 					<Add ref="#Brush Strokes_001" name="Brush Strokes" />
 					<Add ref="#Rectangle" name="Rectangle" rotation="-4.94025 -10.2291 -12.3676" scale="5 5 5" sourcepath="#Rectangle" />

data/test/projects/CustomClasses/FutureAsset.uip

@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<UIP version="3" >
-	<Project >
-		<ProjectSettings author="" company="" presentationWidth="800" presentationHeight="480" maintainAspect="False" />
-		<Graph >
-			<Scene id="Scene" >
-				<XYZZY id="future"/>
-			</Scene>
-		</Graph>
-		<Logic >
-			<State name="Master Slide" component="#Scene" >
-				<Add ref="#future" />
-				<State id="Scene-Slide1" name="Slide1" />
-			</State>
-		</Logic>
-	</Project>
-</UIP>
+<?xml version="1.0" encoding="UTF-8" ?>
+<UIP version="3" >
+	<Project >
+		<ProjectSettings author="" company="" presentationWidth="800" presentationHeight="480" maintainAspect="False" />
+		<Graph >
+			<Scene id="Scene" >
+				<XYZZY id="future"/>
+			</Scene>
+		</Graph>
+		<Logic >
+			<State name="Master Slide" component="#Scene" >
+				<Add ref="#future" />
+				<State id="Scene-Slide1" name="Slide1" />
+			</State>
+		</Logic>
+	</Project>
+</UIP>

data/test/projects/CustomClasses/scripts/DataDrivenTime.lua

@@ -0,0 +1,58 @@
+-- Copyright (c) 2013 NVIDIA, Inc.
+-- Provided under the MIT License: http://opensource.org/licenses/MIT
+
+--[[
+	<Property name="machineid" formalName="State Machine"     description="The id of the statemachine asset to query."  type="String"    default="logic" />
+	<Property name="location"  formalName="Data Name"         description="Name of the data model attribute."           type="String"    default="vehicleSpeed" />
+	<Property name="minValue"  formalName="Min Value"         description="The min value of the data model value."      type="Float"     default="0" />
+	<Property name="maxValue"  formalName="Max Value"         description="The max value of the data model value."      type="Float"     default="100" />
+	<Property name="target"    formalName="Target Component"  description="The scene/component to control the time of." type="ObjectRef" default="parent" />
+	<Property name="minTime"   formalName="Min Time"          description="The time at which the min value is shown."   type="Float"     default="0" />
+	<Property name="maxTime"   formalName="Max Time"          description="The time at which the max value is shown."   type="Float"     default="10" />
+	<Property name="clampFlag" formalName="Clamp Values?"     description="Prevent times outside the min/max?"          type="Boolean"   default="True" />
+	<Property name="smoothing" formalName="Enable Smoothing?" description="Smooth out abrupt changes in the data?"      type="Boolean"   default="False" />
+--]]
+
+function self:onInitialize( )
+	self:cacheAttributeValues('machineid','location','minValue','maxValue','minTime','maxTime','smoothing','clampFlag')
+	self.target  = getElement( getAttribute( self.element, 'target' ), self.element )
+	self.machine = getStateMachine( self.machineid )
+	assert(self.machine,"Could not locate a State Machine with an id of '"..self.machineid.."'")
+
+	self.ratio = (self.maxTime  - self.minTime) / (self.maxValue - self.minValue)
+	self.weighting = 0.3
+	self.newTime = 0
+end
+
+function self:onActivate()
+	pause(self.target) -- In case the artist forgot to pause the context
+end
+
+function self:onUpdate( )
+	local theNewValue = self.machine:get(self.location)
+	if theNewValue ~= self.oldValue then
+		self.oldValue = theNewValue
+		self.newTime = ( theNewValue - self.minValue ) * self.ratio + self.minTime
+		
+		if self.clampFlag then
+			if self.newTime > self.maxTime then
+				self.newTime = self.maxTime 
+			elseif self.newTime < self.minTime then
+				self.newTime = self.minTime 
+			end
+		end
+	end
+
+	if self.smoothing then
+		local theCurrentTime = getTime( self.target )
+		if theCurrentTime ~= self.newTime then
+			goToTime( self.target, self.newTime*self.weighting + theCurrentTime*(1-self.weighting) )
+		end
+	else
+		goToTime( self.target, self.newTime )
+	end
+end
+
+function self:cacheAttributeValues(...)
+	for _,name in ipairs(arg) do self[name] = getAttribute( self.element, name ) end
+end

data/test/projects/CustomClasses/scripts/TimeDrivenAttribute.lua

@@ -0,0 +1,49 @@
+-- Copyright (c) 2013 NVIDIA, Inc.
+-- Provided under the MIT License: http://opensource.org/licenses/MIT
+
+--[[
+	<Property name="component" formalName="Component"      description="The element to use the time of."                 type="ObjectRef" default="parent"   />
+	<Property name="target"    formalName="Target"         description="The element to control."                         type="ObjectRef" default="parent"   />
+	<Property name="attrName"  formalName="Attribute"      description="Name of the attribute on the object to control." type="String"    default="rotation.x"   />
+	<Property name="isNumber"  formalName="Remap Numbers?" description="Is the value being read and set a number that needs to be transformed?" type="Boolean" default="False" />
+	<Property name="minTime"   formalName="Min Time"       description="The min time on the component."                  type="Float"     default="0"><ShowIfEqual property="isNumber" value="True" /></Property>
+	<Property name="maxTime"   formalName="Max Time"       description="The max time on the component."                  type="Float"     default="10"><ShowIfEqual property="isNumber" value="True" /></Property>
+	<Property name="minOutput" formalName="Min Set Value"  description="The min value to set the attribute to."          type="Float"     default="0"><ShowIfEqual property="isNumber" value="True" /></Property>
+	<Property name="maxOutput" formalName="Max Set Value"  description="The max value to set the attribute to."          type="Float"     default="1"><ShowIfEqual property="isNumber" value="True" /></Property>
+	<Property name="clamp"     formalName="Clamp Value?"   description="Prevent the value from being set outside the min/max range?"      type="Boolean" default="True"><ShowIfEqual property="isNumber" value="True" /></Property>
+	<Reference>
+		[target].[attrName]
+	</Reference>
+--]]
+
+
+function self:onInitialize()
+	self.comp   = getElement( getAttribute(self.element,'component'), self.element )
+	self.target = getElement( getAttribute(self.element,'target'), self.element )
+	self:cacheAttributeValues( 'attrName', 'isNumber' )
+	if self.isNumber then
+		self:cacheAttributeValues( 'minTime', 'maxTime', 'minOutput', 'maxOutput', 'clamp' )
+		self.degreesToRadians = string.find( self.attrName, 'rotation' ) and math.pi/180
+		self.ratio = (self.maxOutput  - self.minOutput) / (self.maxTime - self.minTime)
+	end
+end
+
+function self:onUpdate()
+	local theValue = getTime( self.comp )
+	if theValue ~= self.oldValue then
+		self.oldValue = theValue
+		if self.isNumber then
+			theValue = ( ( theValue - self.minTime ) * self.ratio + self.minOutput )
+			if self.clamp then
+				if     theValue < self.minOutput then theValue = self.minOutput
+				elseif theValue > self.maxOutput then theValue = self.maxOutput end
+			end
+			if self.degreesToRadians then theValue = theValue * self.degreesToRadians end
+		end
+		setAttribute( self.target, self.attrName, theValue )
+	end
+end
+
+function self:cacheAttributeValues(...)
+	for _,name in ipairs(arg) do self[name] = getAttribute( self.element, name ) end
+end

data/test/projects/Paths/Paths.uia

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://nvidia.com/uicomposer">
-	<assets><presentation id="main"	src="Paths.uip"/></assets>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://nvidia.com/uicomposer">
+	<assets><presentation id="main"	src="Paths.uip"/></assets>
+</application>

data/test/projects/Paths/Paths.uip

@@ -1,98 +1,98 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<UIP version="3" >
-	<Project >
-		<ProjectSettings author="" company="" presentationWidth="800" presentationHeight="480" maintainAspect="False" />
-		<Graph >
-			<Scene id="Scene" >
-				<Layer id="Layer" >
-					<Camera id="Camera" />
-					<Light id="Light" />
-					<Path id="Path" >
-						<Material id="M1" />
-						<PathAnchorPoint id="AnchorPoint" name="AnchorPoint" />
-						<PathAnchorPoint id="AnchorPoint_001" name="AnchorPoint" />
-						<PathAnchorPoint id="AnchorPoint_002" name="AnchorPoint" />
-						<PathAnchorPoint id="AnchorPoint_003" name="AnchorPoint" />
-						<PathAnchorPoint id="AnchorPoint_004" name="AnchorPoint" />
-					</Path>
-					<Path id="Path2" >
-						<Material id="M2" />
-						<PathAnchorPoint id="AnchorPoint_005" name="AnchorPoint" />
-						<PathAnchorPoint id="AnchorPoint_006" name="AnchorPoint" />
-						<PathAnchorPoint id="AnchorPoint_007" name="AnchorPoint" />
-						<PathAnchorPoint id="AnchorPoint_008" name="AnchorPoint" />
-						<PathAnchorPoint id="AnchorPoint_009" name="AnchorPoint" />
-					</Path>
-					<Path id="Path3" >
-						<Material id="M3" />
-						<PathAnchorPoint id="AnchorPoint_010" name="AnchorPoint" />
-						<PathAnchorPoint id="AnchorPoint_011" name="AnchorPoint" />
-						<PathAnchorPoint id="AnchorPoint_012" name="AnchorPoint" />
-						<PathAnchorPoint id="AnchorPoint_013" name="AnchorPoint" />
-						<PathAnchorPoint id="AnchorPoint_014" name="AnchorPoint" />
-					</Path>
-					<Path id="Path4" >
-						<Material id="M4" />
-						<PathAnchorPoint id="AnchorPoint_015" name="AnchorPoint" />
-						<PathAnchorPoint id="AnchorPoint_016" name="AnchorPoint" />
-						<PathAnchorPoint id="AnchorPoint_017" name="AnchorPoint" />
-						<PathAnchorPoint id="AnchorPoint_018" name="AnchorPoint" />
-						<PathAnchorPoint id="AnchorPoint_019" name="AnchorPoint" />
-					</Path>
-					<Path id="Path5" >
-						<Material id="M5" />
-						<PathAnchorPoint id="AnchorPoint_020" name="AnchorPoint" />
-						<PathAnchorPoint id="AnchorPoint_021" name="AnchorPoint" />
-						<PathAnchorPoint id="AnchorPoint_022" name="AnchorPoint" />
-						<PathAnchorPoint id="AnchorPoint_023" name="AnchorPoint" />
-						<PathAnchorPoint id="AnchorPoint_024" name="AnchorPoint" />
-					</Path>
-				</Layer>
-			</Scene>
-		</Graph>
-		<Logic >
-			<State name="Master Slide" component="#Scene" >
-				<Add ref="#Layer" multisampleaa="4x" />
-				<Add ref="#Camera" fov="58.1806" position="437 499 -600" />
-				<Add ref="#Light" brightness="50" />
-				<State id="Scene-Slide1" name="Slide1" >
-					<Add ref="#Path" name="Path1" diffuse="2 0 0" opacity="50" width="17" />
-					<Add ref="#M1" name="Path" />
-					<Add ref="#AnchorPoint" incomingcontrol="0 0" outgoingcontrol="-69.5 -36.6" position="1211.2 501.3" />
-					<Add ref="#AnchorPoint_001" incomingcontrol="103.9 2.39999" outgoingcontrol="-103.9 -2.4" position="968.3 425.6" />
-					<Add ref="#AnchorPoint_002" incomingcontrol="199.1 -19.6" outgoingcontrol="-199.1 19.7" position="631.3 465" />
-					<Add ref="#AnchorPoint_003" incomingcontrol="161.1 12.6" outgoingcontrol="-161.1 -12.6" position="90.5 391.5" />
-					<Add ref="#AnchorPoint_004" incomingcontrol="81.8 -50" outgoingcontrol="234.1 -478.8" position="-234.1 478.8" />
-					<Add ref="#Path2" name="Path2" diffuse="3 1.66274 1.50196" opacity="50" position="110 0 0" rotation="-20 -20 0" />
-					<Add ref="#M2" name="Path" />
-					<Add ref="#AnchorPoint_005" incomingcontrol="0 0" outgoingcontrol="-51.5 28.9" position="1218.2 431.5" />
-					<Add ref="#AnchorPoint_006" incomingcontrol="119 9.79999" outgoingcontrol="-119.1 -9.8" position="996.1 479.5" />
-					<Add ref="#AnchorPoint_007" incomingcontrol="188.6 -14.6" outgoingcontrol="-188.6 14.5" position="649.3 411.6" />
-					<Add ref="#AnchorPoint_008" incomingcontrol="161 12.6" outgoingcontrol="-161.1 -12.6" position="95.6 544.9" />
-					<Add ref="#AnchorPoint_009" incomingcontrol="77.7 58.3" outgoingcontrol="221 -415.7" position="-221 415.7" />
-					<Add ref="#Path3" name="Path3" diffuse="2.62745 0 0" opacity="50" rotation="10 10 0" />
-					<Add ref="#M3" name="Path" />
-					<Add ref="#AnchorPoint_010" incomingcontrol="0 0" outgoingcontrol="-87.5 -41.8" position="1259.8 557.6" />
-					<Add ref="#AnchorPoint_011" incomingcontrol="119.1 9.79999" outgoingcontrol="-119.1 -9.8" position="965.7 464.2" />
-					<Add ref="#AnchorPoint_012" incomingcontrol="199.1 -19.7" outgoingcontrol="-199.1 19.7" position="581.4 487.6" />
-					<Add ref="#AnchorPoint_013" incomingcontrol="155 19.4" outgoingcontrol="-155 -19.4" position="60.2 505.5" />
-					<Add ref="#AnchorPoint_014" incomingcontrol="73.4 63.6" outgoingcontrol="241.5 -359" position="-241.5 359" />
-					<Add ref="#Path4" name="Path4" diffuse="3 1.85882 0" opacity="50" rotation="11 0 0" />
-					<Add ref="#M4" name="Path" />
-					<Add ref="#AnchorPoint_015" incomingcontrol="0 0" outgoingcontrol="-71.9 51.6" position="1297.3 406.2" />
-					<Add ref="#AnchorPoint_016" incomingcontrol="139.1 2.5" outgoingcontrol="-139.1 -2.4" position="1014.4 506.9" />
-					<Add ref="#AnchorPoint_017" incomingcontrol="225.7 -1.40002" outgoingcontrol="-225.7 1.4" position="600.7 414.7" />
-					<Add ref="#AnchorPoint_018" incomingcontrol="211.8 47.8" outgoingcontrol="-211.8 -47.8" position="46.7 474.7" />
-					<Add ref="#AnchorPoint_019" incomingcontrol="79.9 95.4" outgoingcontrol="325 -236" position="-325 236" />
-					<Add ref="#Path5" name="Path5" diffuse="2 2 0" opacity="50" rotation="9 6.9 7.9" />
-					<Add ref="#M5" name="Path" />
-					<Add ref="#AnchorPoint_020" incomingcontrol="0 0" outgoingcontrol="-81.5 -61.8" position="1271.6 516.8" />
-					<Add ref="#AnchorPoint_021" incomingcontrol="103.9 2.40002" outgoingcontrol="-103.9 -2.4" position="1004.8 390.8" />
-					<Add ref="#AnchorPoint_022" incomingcontrol="199 -19.7" outgoingcontrol="-199.1 19.7" position="638.9 445.8" />
-					<Add ref="#AnchorPoint_023" incomingcontrol="161.1 12.6" outgoingcontrol="-161.1 -12.6" position="66.8 352.6" />
-					<Add ref="#AnchorPoint_024" incomingcontrol="85 -71.9" outgoingcontrol="264.3 -483.7" position="-264.3 483.7" />
-				</State>
-			</State>
-		</Logic>
-	</Project>
-</UIP>
+<?xml version="1.0" encoding="UTF-8" ?>
+<UIP version="3" >
+	<Project >
+		<ProjectSettings author="" company="" presentationWidth="800" presentationHeight="480" maintainAspect="False" />
+		<Graph >
+			<Scene id="Scene" >
+				<Layer id="Layer" >
+					<Camera id="Camera" />
+					<Light id="Light" />
+					<Path id="Path" >
+						<Material id="M1" />
+						<PathAnchorPoint id="AnchorPoint" name="AnchorPoint" />
+						<PathAnchorPoint id="AnchorPoint_001" name="AnchorPoint" />
+						<PathAnchorPoint id="AnchorPoint_002" name="AnchorPoint" />
+						<PathAnchorPoint id="AnchorPoint_003" name="AnchorPoint" />
+						<PathAnchorPoint id="AnchorPoint_004" name="AnchorPoint" />
+					</Path>
+					<Path id="Path2" >
+						<Material id="M2" />
+						<PathAnchorPoint id="AnchorPoint_005" name="AnchorPoint" />
+						<PathAnchorPoint id="AnchorPoint_006" name="AnchorPoint" />
+						<PathAnchorPoint id="AnchorPoint_007" name="AnchorPoint" />
+						<PathAnchorPoint id="AnchorPoint_008" name="AnchorPoint" />
+						<PathAnchorPoint id="AnchorPoint_009" name="AnchorPoint" />
+					</Path>
+					<Path id="Path3" >
+						<Material id="M3" />
+						<PathAnchorPoint id="AnchorPoint_010" name="AnchorPoint" />
+						<PathAnchorPoint id="AnchorPoint_011" name="AnchorPoint" />
+						<PathAnchorPoint id="AnchorPoint_012" name="AnchorPoint" />
+						<PathAnchorPoint id="AnchorPoint_013" name="AnchorPoint" />
+						<PathAnchorPoint id="AnchorPoint_014" name="AnchorPoint" />
+					</Path>
+					<Path id="Path4" >
+						<Material id="M4" />
+						<PathAnchorPoint id="AnchorPoint_015" name="AnchorPoint" />
+						<PathAnchorPoint id="AnchorPoint_016" name="AnchorPoint" />
+						<PathAnchorPoint id="AnchorPoint_017" name="AnchorPoint" />
+						<PathAnchorPoint id="AnchorPoint_018" name="AnchorPoint" />
+						<PathAnchorPoint id="AnchorPoint_019" name="AnchorPoint" />
+					</Path>
+					<Path id="Path5" >
+						<Material id="M5" />
+						<PathAnchorPoint id="AnchorPoint_020" name="AnchorPoint" />
+						<PathAnchorPoint id="AnchorPoint_021" name="AnchorPoint" />
+						<PathAnchorPoint id="AnchorPoint_022" name="AnchorPoint" />
+						<PathAnchorPoint id="AnchorPoint_023" name="AnchorPoint" />
+						<PathAnchorPoint id="AnchorPoint_024" name="AnchorPoint" />
+					</Path>
+				</Layer>
+			</Scene>
+		</Graph>
+		<Logic >
+			<State name="Master Slide" component="#Scene" >
+				<Add ref="#Layer" multisampleaa="4x" />
+				<Add ref="#Camera" fov="58.1806" position="437 499 -600" />
+				<Add ref="#Light" brightness="50" />
+				<State id="Scene-Slide1" name="Slide1" >
+					<Add ref="#Path" name="Path1" diffuse="2 0 0" opacity="50" width="17" />
+					<Add ref="#M1" name="Path" />
+					<Add ref="#AnchorPoint" incomingcontrol="0 0" outgoingcontrol="-69.5 -36.6" position="1211.2 501.3" />
+					<Add ref="#AnchorPoint_001" incomingcontrol="103.9 2.39999" outgoingcontrol="-103.9 -2.4" position="968.3 425.6" />
+					<Add ref="#AnchorPoint_002" incomingcontrol="199.1 -19.6" outgoingcontrol="-199.1 19.7" position="631.3 465" />
+					<Add ref="#AnchorPoint_003" incomingcontrol="161.1 12.6" outgoingcontrol="-161.1 -12.6" position="90.5 391.5" />
+					<Add ref="#AnchorPoint_004" incomingcontrol="81.8 -50" outgoingcontrol="234.1 -478.8" position="-234.1 478.8" />
+					<Add ref="#Path2" name="Path2" diffuse="3 1.66274 1.50196" opacity="50" position="110 0 0" rotation="-20 -20 0" />
+					<Add ref="#M2" name="Path" />
+					<Add ref="#AnchorPoint_005" incomingcontrol="0 0" outgoingcontrol="-51.5 28.9" position="1218.2 431.5" />
+					<Add ref="#AnchorPoint_006" incomingcontrol="119 9.79999" outgoingcontrol="-119.1 -9.8" position="996.1 479.5" />
+					<Add ref="#AnchorPoint_007" incomingcontrol="188.6 -14.6" outgoingcontrol="-188.6 14.5" position="649.3 411.6" />
+					<Add ref="#AnchorPoint_008" incomingcontrol="161 12.6" outgoingcontrol="-161.1 -12.6" position="95.6 544.9" />
+					<Add ref="#AnchorPoint_009" incomingcontrol="77.7 58.3" outgoingcontrol="221 -415.7" position="-221 415.7" />
+					<Add ref="#Path3" name="Path3" diffuse="2.62745 0 0" opacity="50" rotation="10 10 0" />
+					<Add ref="#M3" name="Path" />
+					<Add ref="#AnchorPoint_010" incomingcontrol="0 0" outgoingcontrol="-87.5 -41.8" position="1259.8 557.6" />
+					<Add ref="#AnchorPoint_011" incomingcontrol="119.1 9.79999" outgoingcontrol="-119.1 -9.8" position="965.7 464.2" />
+					<Add ref="#AnchorPoint_012" incomingcontrol="199.1 -19.7" outgoingcontrol="-199.1 19.7" position="581.4 487.6" />
+					<Add ref="#AnchorPoint_013" incomingcontrol="155 19.4" outgoingcontrol="-155 -19.4" position="60.2 505.5" />
+					<Add ref="#AnchorPoint_014" incomingcontrol="73.4 63.6" outgoingcontrol="241.5 -359" position="-241.5 359" />
+					<Add ref="#Path4" name="Path4" diffuse="3 1.85882 0" opacity="50" rotation="11 0 0" />
+					<Add ref="#M4" name="Path" />
+					<Add ref="#AnchorPoint_015" incomingcontrol="0 0" outgoingcontrol="-71.9 51.6" position="1297.3 406.2" />
+					<Add ref="#AnchorPoint_016" incomingcontrol="139.1 2.5" outgoingcontrol="-139.1 -2.4" position="1014.4 506.9" />
+					<Add ref="#AnchorPoint_017" incomingcontrol="225.7 -1.40002" outgoingcontrol="-225.7 1.4" position="600.7 414.7" />
+					<Add ref="#AnchorPoint_018" incomingcontrol="211.8 47.8" outgoingcontrol="-211.8 -47.8" position="46.7 474.7" />
+					<Add ref="#AnchorPoint_019" incomingcontrol="79.9 95.4" outgoingcontrol="325 -236" position="-325 236" />
+					<Add ref="#Path5" name="Path5" diffuse="2 2 0" opacity="50" rotation="9 6.9 7.9" />
+					<Add ref="#M5" name="Path" />
+					<Add ref="#AnchorPoint_020" incomingcontrol="0 0" outgoingcontrol="-81.5 -61.8" position="1271.6 516.8" />
+					<Add ref="#AnchorPoint_021" incomingcontrol="103.9 2.40002" outgoingcontrol="-103.9 -2.4" position="1004.8 390.8" />
+					<Add ref="#AnchorPoint_022" incomingcontrol="199 -19.7" outgoingcontrol="-199.1 19.7" position="638.9 445.8" />
+					<Add ref="#AnchorPoint_023" incomingcontrol="161.1 12.6" outgoingcontrol="-161.1 -12.6" position="66.8 352.6" />
+					<Add ref="#AnchorPoint_024" incomingcontrol="85 -71.9" outgoingcontrol="264.3 -483.7" position="-264.3 483.7" />
+				</State>
+			</State>
+		</Logic>
+	</Project>
+</UIP>