From 4cd4d29ae10b87f7b280d537b8980d207a22dd43 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 21 Mar 2012 16:51:05 -0700
Subject: Synchronized material animation speed for pulse material between
 Ninja and runtime.

---
 assets/canvas-runtime.js | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'assets/canvas-runtime.js')

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index 87aac71f..7f2dc8ab 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -1249,6 +1249,7 @@ function RuntimePulseMaterial()
 	this.import = function( jObj )
 	{
 		this._texMap = jObj.texture;
+        if (jObj.dTime)  this._dTime = jObj.dTime;
 	}
 
 	this.init = function( world )
@@ -1603,6 +1604,12 @@ function RuntimePlasmaMaterial()
 		this.update();
 	}
 
+	this.importJSON = function( jObj )
+	{
+		this._speed = jObj.speed;
+		this._dTime = jObj.dTime;
+	}
+
 	this.update = function( time )
 	{
 		var material = this._materialNode;
-- 
cgit v1.2.3