Updated builds

tentone · Feb 11, 2018 · 00d9fb2 · 00d9fb2
1 parent 6a9fe1e
commit 00d9fb2
Show file tree

Hide file tree

Showing 16 changed files with 5,231 additions and 5,164 deletions.
diff --git a/build/nunu.editor.min.js b/build/nunu.editor.min.js
diff --git a/build/nunu.min.js b/build/nunu.min.js
diff --git a/docs/docs/data.json b/docs/docs/data.json
@@ -8686,7 +8686,7 @@
         },
         {
             "file": "..\\..\\source\\core\\objects\\misc\\LensFlare.js",
-            "line": 183,
+            "line": 188,
             "description": "Add texture to the lensFlare object.",
             "itemtype": "method",
             "name": "add",
@@ -8717,7 +8717,7 @@
         },
         {
             "file": "..\\..\\source\\core\\objects\\misc\\LensFlare.js",
-            "line": 217,
+            "line": 222,
             "description": "Serialize lensflare data to json.",
             "itemtype": "method",
             "name": "toJSON",
@@ -8795,7 +8795,7 @@
         },
         {
             "file": "..\\..\\source\\core\\objects\\particle\\ParticleEmitter.js",
-            "line": 143,
+            "line": 145,
             "description": "Dispose particle emitter.\n\nShould be called when destroying particle emitter.",
             "itemtype": "method",
             "name": "dispose",
@@ -8804,7 +8804,7 @@
         },
         {
             "file": "..\\..\\source\\core\\objects\\particle\\ParticleEmitter.js",
-            "line": 157,
+            "line": 159,
             "description": "Serialize object to JSON.",
             "itemtype": "method",
             "name": "toJSON",

diff --git a/docs/editor/nunu.editor.min.js b/docs/editor/nunu.editor.min.js
diff --git a/docs/editor/nunu.min.js b/docs/editor/nunu.min.js
diff --git a/source/core/objects/particle/ParticleEmitter.js b/source/core/objects/particle/ParticleEmitter.js
@@ -56,7 +56,6 @@ function ParticleEmitter(group, emitter)
 			set: function(texture)
 			{
 				self.group.texture = texture;
-				self.group.uniforms.texture.value = texture;
 			}
 		}
 	});

diff --git a/source/editor/Interface.js b/source/editor/Interface.js
@@ -1031,7 +1031,7 @@ Interface.initialize = function()
 		var mesh = new Mesh(geometry, Editor.defaultMaterial);
 		Editor.addToScene(mesh);
 
-		alert("Reduced from " + vertices + " to " + Math.ceil(vertices * level) + " vertex.");
+		Editor.alert("Reduced from " + vertices + " to " + Math.ceil(vertices * level) + " vertex.");
 
 	}, Editor.filePath + "icons/models/figures.png");
 

diff --git a/source/editor/ui/element/input/ImageChooser.js b/source/editor/ui/element/input/ImageChooser.js
@@ -57,6 +57,10 @@ function ImageChooser(parent)
 				self.setValue(value);
 				self.onChange(value);
 			}
+			else
+			{
+				Editor.alert("Only images accepted");
+			}
 		}
 	};
 

diff --git a/source/editor/ui/element/input/TextureChooser.js b/source/editor/ui/element/input/TextureChooser.js
@@ -73,12 +73,16 @@ function TextureChooser(parent)
 			//Image
 			else if(value instanceof Image)
 			{
-
+				self.setTexture(new Texture(value));
 			}
 			//Video
 			else if(value instanceof Video)
 			{
-
+				self.setTexture(new VideoTexture(value));
+			}
+			else
+			{
+				Editor.alert("Only textures, videos and images accepted");
 			}
 		}
 

diff --git a/source/editor/ui/tab/SceneEditor.js b/source/editor/ui/tab/SceneEditor.js
@@ -872,7 +872,7 @@ SceneEditor.prototype.update = function()
 		catch(e)
 		{
 			this.setState(SceneEditor.EDITING);
-			alert("Error testing program\nState update caused an error");
+			Editor.alert("Error testing program\nState update caused an error");
 			console.error("nunuStudio: Error updating program state", e);
 		}
 
@@ -1109,7 +1109,7 @@ SceneEditor.prototype.render = function()
 		catch(e)
 		{
 			this.setState(SceneEditor.EDITING);
-			alert("Error testing program\nRender caused an error");
+			Editor.alert("Error testing program\nRender caused an error");
 			console.error("nunuStudio: Error rendering program", e);
 		}
 	}
@@ -1398,7 +1398,7 @@ SceneEditor.prototype.setState = function(state)
 		catch(e)
 		{
 			this.setState(SceneEditor.EDITING);
-			alert("Error testing program\nInitialization caused an error");
+			Editor.alert("Error testing program\nInitialization caused an error");
 			console.error("nunuStudio: Error initializing program", e);
 		}
 		//Update interface

diff --git a/source/editor/ui/tab/animation/AnimationButton.js b/source/editor/ui/tab/animation/AnimationButton.js
@@ -54,7 +54,7 @@ function AnimationButton(parent, editor, animation)
 
 			if(value === object)
 			{
-				alert("Attribute not found");
+				Editor.alert("Attribute not found");
 			}
 
 			if(value instanceof THREE.Vector3)
@@ -90,7 +90,7 @@ function AnimationButton(parent, editor, animation)
 			else
 			{
 				console.warn("nunuStudio: Attribute it no animable", value);
-				alert("Attribute is not animable");
+				Editor.alert("Attribute is not animable");
 				return;
 			}
 
@@ -113,7 +113,7 @@ function AnimationButton(parent, editor, animation)
 			}
 			else
 			{
-				alert("Unable to delete animation");
+				Editor.alert("Unable to delete animation");
 			}
 
 			self.editor.createTimeline();

diff --git a/source/editor/ui/tab/animation/AnimationKeyframe.js b/source/editor/ui/tab/animation/AnimationKeyframe.js
@@ -36,7 +36,7 @@ function AnimationKeyframe(parent, editor, trackEditor, track, index)
 
 			if(self.track.times.length === 1)
 			{
-				alert("Track needs to have at least one keyframe!");
+				Editor.alert("Track needs to have at least one keyframe!");
 				return;
 			}
 
@@ -75,7 +75,7 @@ function AnimationKeyframe(parent, editor, trackEditor, track, index)
 
 			if(isNaN(time))
 			{
-				alert("Invalid time value!");
+				Editor.alert("Invalid time value!");
 				return;
 			}
 

diff --git a/source/editor/ui/tab/animation/AnimationTab.js b/source/editor/ui/tab/animation/AnimationTab.js
@@ -72,7 +72,7 @@ function AnimationTab(parent, closeable, container, index)
 	{
 		if(self.mixer == null)
 		{
-			alert("No animation found!");
+			Editor.alert("No animation found!");
 			return;
 		}
 
@@ -97,7 +97,7 @@ function AnimationTab(parent, closeable, container, index)
 	{
 		if(self.mixer == null)
 		{
-			alert("No animation playing!");
+			Editor.alert("No animation playing!");
 			return;
 		}
 

diff --git a/source/editor/ui/tab/animation/AnimationTrackButton.js b/source/editor/ui/tab/animation/AnimationTrackButton.js
@@ -54,7 +54,7 @@ function AnimationTrackButton(parent, editor, animation, track, trackTimeline)
 			}
 			else
 			{
-				alert("Unable to delete track");
+				Editor.alert("Unable to delete track");
 			}
 
 			self.editor.createTimeline();
@@ -65,7 +65,7 @@ function AnimationTrackButton(parent, editor, animation, track, trackTimeline)
 		{
 			track.optimize();
 
-			alert("Track optimized");
+			Editor.alert("Track optimized");
 
 			self.trackTimeline.updateKeyframes();
 			self.editor.createAnimationMixer();
@@ -77,7 +77,7 @@ function AnimationTrackButton(parent, editor, animation, track, trackTimeline)
 
 			if(isNaN(time))
 			{
-				alert("Invalid time value");
+				Editor.alert("Invalid time value");
 				return;
 			}
 
@@ -94,7 +94,7 @@ function AnimationTrackButton(parent, editor, animation, track, trackTimeline)
 
 			if(isNaN(start) || isNaN(end))
 			{
-				alert("Invalid time value");
+				Editor.alert("Invalid time value");
 				return;
 			}
 

diff --git a/source/editor/ui/tab/asset/asset/MaterialAsset.js b/source/editor/ui/tab/asset/asset/MaterialAsset.js
@@ -185,7 +185,7 @@ function MaterialAsset(parent)
 				}
 				catch(e)
 				{
-					alert("Material duplication failed\n" + e.stack);
+					Editor.alert("Material duplication failed\n" + e.stack);
 				}
 			}
 		});

diff --git a/source/editor/ui/tab/asset/asset/TextureAsset.js b/source/editor/ui/tab/asset/asset/TextureAsset.js
@@ -129,7 +129,7 @@ function TextureAsset(parent)
 				}
 				catch(e)
 				{
-					alert("Texture duplication failed\n" + e.stack);
+					Editor.alert("Texture duplication failed\n" + e.stack);
 				}
 			}
 		});