From 7279f0b37335396c85f6bdd7dc67ff56e53df0f9 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Sat, 14 Jan 2017 16:48:49 +0100
Subject: Add particle animation, glow

This is implemented by reusing and extending the
TileAnimation code for the methods used by particles.
---
 src/script/common/c_content.cpp | 60 +++++++++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 23 deletions(-)

(limited to 'src/script/common/c_content.cpp')

diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index b9bcfef69..84af4583b 100644
--- a/src/script/common/c_content.cpp
+++ b/src/script/common/c_content.cpp
@@ -322,7 +322,7 @@ TileDef read_tiledef(lua_State *L, int index, u8 drawtype)
 	}
 	else if(lua_istable(L, index))
 	{
-		// {name="default_lava.png", animation={}}
+		// name="default_lava.png"
 		tiledef.name = "";
 		getstringfield(L, index, "name", tiledef.name);
 		getstringfield(L, index, "image", tiledef.name); // MaterialSpec compat.
@@ -334,28 +334,7 @@ TileDef read_tiledef(lua_State *L, int index, u8 drawtype)
 			L, index, "tileable_vertical", default_tiling);
 		// animation = {}
 		lua_getfield(L, index, "animation");
-		if(lua_istable(L, -1)){
-			tiledef.animation.type = (TileAnimationType)
-				getenumfield(L, -1, "type", es_TileAnimationType,
-				TAT_NONE);
-			if (tiledef.animation.type == TAT_VERTICAL_FRAMES) {
-				// {type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0}
-				tiledef.animation.vertical_frames.aspect_w =
-					getintfield_default(L, -1, "aspect_w", 16);
-				tiledef.animation.vertical_frames.aspect_h =
-					getintfield_default(L, -1, "aspect_h", 16);
-				tiledef.animation.vertical_frames.length =
-					getfloatfield_default(L, -1, "length", 1.0);
-			} else if (tiledef.animation.type == TAT_SHEET_2D) {
-				// {type="sheet_2d", frames_w=5, frames_h=3, frame_length=0.5}
-				getintfield(L, -1, "frames_w",
-					tiledef.animation.sheet_2d.frames_w);
-				getintfield(L, -1, "frames_h",
-					tiledef.animation.sheet_2d.frames_h);
-				getfloatfield(L, -1, "frame_length",
-					tiledef.animation.sheet_2d.frame_length);
-			}
-		}
+		tiledef.animation = read_animation_definition(L, -1);
 		lua_pop(L, 1);
 	}
 
@@ -925,6 +904,41 @@ void read_inventory_list(lua_State *L, int tableindex,
 	}
 }
 
+/******************************************************************************/
+struct TileAnimationParams read_animation_definition(lua_State *L, int index)
+{
+	if(index < 0)
+		index = lua_gettop(L) + 1 + index;
+
+	struct TileAnimationParams anim;
+	anim.type = TAT_NONE;
+	if (!lua_istable(L, index))
+		return anim;
+
+	anim.type = (TileAnimationType)
+		getenumfield(L, index, "type", es_TileAnimationType,
+		TAT_NONE);
+	if (anim.type == TAT_VERTICAL_FRAMES) {
+		// {type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0}
+		anim.vertical_frames.aspect_w =
+			getintfield_default(L, index, "aspect_w", 16);
+		anim.vertical_frames.aspect_h =
+			getintfield_default(L, index, "aspect_h", 16);
+		anim.vertical_frames.length =
+			getfloatfield_default(L, index, "length", 1.0);
+	} else if (anim.type == TAT_SHEET_2D) {
+		// {type="sheet_2d", frames_w=5, frames_h=3, frame_length=0.5}
+		getintfield(L, index, "frames_w",
+			anim.sheet_2d.frames_w);
+		getintfield(L, index, "frames_h",
+			anim.sheet_2d.frames_h);
+		getfloatfield(L, index, "frame_length",
+			anim.sheet_2d.frame_length);
+	}
+
+	return anim;
+}
+
 /******************************************************************************/
 ToolCapabilities read_tool_capabilities(
 		lua_State *L, int table)
-- 
cgit v1.2.3