teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-16 01:11:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lunatic: make geom.lua work standalone, fix __eq metamethods for dvec[23]_t.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3107 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-11-03 19:32:35 +00:00
parent d42c28c344
commit 2dfe3c3d93
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
polymer/eduke32/source/lunatic/geom.lua
View file

@ -34,14 +34,11 @@ local vec2_mt = {
assert(type(b)=="number")
return vec2_(a.x/b, a.y/b)
end,
--[[
-- NOTE: metamethods from metatype() are invoken on *any mix of types*
-- This means that we can't check a "maybe-vec2" variable like "v ~= nil".
__eq = function(a,b)
return (a.x==b.x and a.y==b.y)
return (ffi.istype(a,b) and a.x==b.x and a.y==b.y)
end,
--]]
__len = function(a) return math.sqrt(a.x*a.x + a.y*a.y) end,
__tostring = function(a) return "vec2("..a.x..", "..a.y..")" end,
@ -70,11 +67,11 @@ local vec3_mt = {
assert(type(b)=="number")
return vec2_(a.x/b, a.y/b, a.z/b)
end,
--[[
__eq = function(a,b)
return (a.x==b.x and a.y==b.y and a.z==b.z)
return (ffi.istype(a,b) and a.x==b.x and a.y==b.y and a.z==b.z)
end,
--]]
__len = function(a) return math.sqrt(a.x*a.x + a.y*a.y + a.z*a.z) end,
__tostring = function(a) return "vec3("..a.x..", "..a.y..", "..a.z..")" end,
@ -103,6 +100,11 @@ function tovec3(t) return vec3(t.x, t.y, t.z) end
-- integer values, e.g. geom.ivec3(x, y, z) is a reasonable way to round
-- a vec3. It can be also used as the RHS to the vec2/vec3 arithmetic
-- methods.
ffi.cdef[[
#pragma pack(push,1)
typedef struct { int32_t x, y, z; } vec3_t;
#pragma pack(pop)
]]
ivec3 = ffi.typeof("vec3_t")