Add offset to automatic_face_movement_dir

PilzAdam · PilzAdam · commit 4feea0ac6845 · 2013-09-10T23:31:44.000+02:00
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
@@ -1888,7 +1888,8 @@ Object Properties
     makes_footstep_sound = false,
     automatic_rotate = false,
     stepheight = 0,
-    automatic_face_movement_dir = false,
+    automatic_face_movement_dir = 0.0,
+    ^ automatically set yaw to movement direction; offset in degrees; false to disable
 }
 
 Entity definition (register_entity)
diff --git a/src/clientserver.h b/src/clientserver.h
@@ -98,7 +98,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 		drowning, leveled and liquid_range added to ContentFeatures
 		stepheight and collideWithObjects added to object properties
 		version, heat and humidity transfer in MapBock
-		added new property to entities automatic_face_movement_dir
+		automatic_face_movement_dir and automatic_face_movement_dir_offset
+			added to object properties
 */
 
 #define LATEST_PROTOCOL_VERSION 21
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
@@ -1211,8 +1211,9 @@ class GenericCAO : public ClientActiveObject
 			updateNodePos();
 		}
 
-		if (getParent() == NULL && m_prop.automatic_face_movement_dir){
-			m_yaw = atan2(m_velocity.Z,m_velocity.X) * 180 / M_PI;
+		if (getParent() == NULL && m_prop.automatic_face_movement_dir &&
+				(fabs(m_velocity.Z) > 0.001 || fabs(m_velocity.X) > 0.001)){
+			m_yaw = atan2(m_velocity.Z,m_velocity.X) * 180 / M_PI + m_prop.automatic_face_movement_dir_offset;
 			updateNodePos();
 		}
 	}
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
@@ -527,8 +527,9 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
 			m_velocity += dtime * m_acceleration;
 		}
 
-		if(m_prop.automatic_face_movement_dir){
-			m_yaw = atan2(m_velocity.Z,m_velocity.X) * 180 / M_PI;
+		if((m_prop.automatic_face_movement_dir) &&
+				(fabs(m_velocity.Z) > 0.001 || fabs(m_velocity.X) > 0.001)){
+			m_yaw = atan2(m_velocity.Z,m_velocity.X) * 180 / M_PI + m_prop.automatic_face_movement_dir_offset;
 		}
 	}
 
diff --git a/src/object_properties.cpp b/src/object_properties.cpp
@@ -41,7 +41,8 @@ ObjectProperties::ObjectProperties():
 	makes_footstep_sound(false),
 	automatic_rotate(0),
 	stepheight(0),
-	automatic_face_movement_dir(false)
+	automatic_face_movement_dir(false),
+	automatic_face_movement_dir_offset(0.0)
 {
 	textures.push_back("unknown_object.png");
 	colors.push_back(video::SColor(255,255,255,255));
@@ -104,6 +105,7 @@ void ObjectProperties::serialize(std::ostream &os) const
 	writeU8(os, collideWithObjects);
 	writeF1000(os,stepheight);
 	writeU8(os, automatic_face_movement_dir);
+	writeF1000(os, automatic_face_movement_dir_offset);
 	// Add stuff only at the bottom.
 	// Never remove anything, because we don't want new versions of this
 }
@@ -139,6 +141,7 @@ void ObjectProperties::deSerialize(std::istream &is)
 			collideWithObjects = readU8(is);
 			stepheight = readF1000(is);
 			automatic_face_movement_dir = readU8(is);
+			automatic_face_movement_dir_offset = readF1000(is);
 		}catch(SerializationError &e){}
 	}
 	else
diff --git a/src/object_properties.h b/src/object_properties.h
@@ -46,6 +46,7 @@ struct ObjectProperties
 	float automatic_rotate;
 	f32 stepheight;
 	bool automatic_face_movement_dir;
+	f32 automatic_face_movement_dir_offset;
 
 
 	ObjectProperties();
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
@@ -191,7 +191,15 @@ void read_object_properties(lua_State *L, int index,
 	getfloatfield(L, -1, "automatic_rotate", prop->automatic_rotate);
 	getfloatfield(L, -1, "stepheight", prop->stepheight);
 	prop->stepheight*=BS;
-	getboolfield(L, -1, "automatic_face_movement_dir", prop->automatic_face_movement_dir);
+	lua_getfield(L, -1, "automatic_face_movement_dir");
+	if (lua_isnumber(L, -1)) {
+		prop->automatic_face_movement_dir = true;
+		prop->automatic_face_movement_dir_offset = luaL_checknumber(L, -1);
+	} else if (lua_isboolean(L, -1)) {
+		prop->automatic_face_movement_dir = lua_toboolean(L, -1);
+		prop->automatic_face_movement_dir_offset = 0.0;
+	}
+	lua_pop(L, 1);
 }
 
 /******************************************************************************/

Original file line number	Diff line number	Diff line change
`@@ -1888,7 +1888,8 @@ Object Properties`
`1888`	`1888`	`makes_footstep_sound = false,`
`1889`	`1889`	`automatic_rotate = false,`
`1890`	`1890`	`stepheight = 0,`
`1891`		`- automatic_face_movement_dir = false,`
	`1891`	`+ automatic_face_movement_dir = 0.0,`
	`1892`	`+ ^ automatically set yaw to movement direction; offset in degrees; false to disable`
`1892`	`1893`	`}`
`1893`	`1894`
`1894`	`1895`	`Entity definition (register_entity)`
Original file line number	Diff line number	Diff line change
`@@ -1211,8 +1211,9 @@ class GenericCAO : public ClientActiveObject`
`1211`	`1211`	`updateNodePos();`
`1212`	`1212`	`}`
`1213`	`1213`
`1214`		`- if (getParent() == NULL && m_prop.automatic_face_movement_dir){`
`1215`		`- m_yaw = atan2(m_velocity.Z,m_velocity.X) * 180 / M_PI;`
	`1214`	`+ if (getParent() == NULL && m_prop.automatic_face_movement_dir &&`
	`1215`	`+ (fabs(m_velocity.Z) > 0.001 \|\| fabs(m_velocity.X) > 0.001)){`
	`1216`	`+ m_yaw = atan2(m_velocity.Z,m_velocity.X) * 180 / M_PI + m_prop.automatic_face_movement_dir_offset;`
`1216`	`1217`	`updateNodePos();`
`1217`	`1218`	`}`
`1218`	`1219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -527,8 +527,9 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)`
`527`	`527`	`m_velocity += dtime * m_acceleration;`
`528`	`528`	`}`
`529`	`529`
`530`		`- if(m_prop.automatic_face_movement_dir){`
`531`		`- m_yaw = atan2(m_velocity.Z,m_velocity.X) * 180 / M_PI;`
	`530`	`+ if((m_prop.automatic_face_movement_dir) &&`
	`531`	`+ (fabs(m_velocity.Z) > 0.001 \|\| fabs(m_velocity.X) > 0.001)){`
	`532`	`+ m_yaw = atan2(m_velocity.Z,m_velocity.X) * 180 / M_PI + m_prop.automatic_face_movement_dir_offset;`
`532`	`533`	`}`
`533`	`534`	`}`
`534`	`535`