scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-11 17:49:53 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix mantis bug; add getOrientation to CVS

Browse Source 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3920 387891d4-d844-0410-90c0-e4c51a9137d3
This commit is contained in:
wmcoolmon authored and niffiwan committed 2015-04-29 18:42:48 +10:00
1 parent f7e5abbee4
commit 199948f4cc
1 file changed
+21 -3
Download Patch File Download Diff File Expand all files Collapse all files
code/parse/lua.cpp
+21 -3
View File
@@ -151,7 +151,7 @@ struct string_conv {
string_conv ade_Operators[] = {
{"__add", "+"}, //var + obj
{"__sub", "-"}, //var - obj
{"__mult", "*"}, //var * obj
{"__mul", "*"}, //var * obj
{"__div", "/"}, //var / obj
{"__mod", "%"}, //var % obj
{"__pow", "^"}, //var ^ obj
@@ -2365,7 +2365,7 @@ ADE_FUNC(__sub, l_Vector, "{Number, Vector}", "Vector", "Subtracts vector from a
return ade_set_args(L, "o", l_Vector.Set(v3));
}
ADE_FUNC(__mult, l_Vector, "number", "Vector", "Scales vector object (Multiplies all axes by number)")
ADE_FUNC(__mul, l_Vector, "number", "Vector", "Scales vector object (Multiplies all axes by number)")
{
vec3d v3;
if(lua_isnumber(L, 1) || lua_isnumber(L, 2))
@@ -2410,6 +2410,23 @@ ADE_FUNC(__tostring, l_Vector, NULL, "string", "Converts a vector to string with
return ade_set_args(L, "s", buf);
}
ADE_FUNC(getOrientation, l_Vector, NULL, "Orientation",
"Returns orientation object representing the direction of the vector. "
"Does not require vector to be normalized.")
{
vec3d v3;
if(!ade_get_args(L, "o", l_Vector.Get(&v3)))
return ADE_RETURN_NIL;
matrix mt = vmd_identity_matrix;
vm_vec_normalize_safe(&v3);
vm_vector_2_matrix_norm(&mt, &v3);
matrix_h mh(&mt);
return ade_set_args(L, "o", l_Matrix.Set(mh));
}
ADE_FUNC(getMagnitude, l_Vector, NULL, "Magnitude", "Returns the magnitude of a vector (Total regardless of direction)")
{
vec3d *v3;
@@ -5790,7 +5807,8 @@ ADE_FUNC(drawCircle, l_Graphics, "Radius, x, y", NULL, "Draws a circle")
if(!ade_get_args(L, "iii", &ra,&x,&y))
return ADE_RETURN_NIL;
gr_circle(x,y, ra, false);
//WMC - Circle takes...diameter.
gr_circle(x,y, ra*2, false);
return ADE_RETURN_NIL;
}