From 7c7609045d8028b538c9c33e707b2386a549d903 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop+git@gmail.com>
Date: Fri, 17 Sep 2010 02:44:25 +0000
Subject: [PATCH] ag.pickObjects() now sets pick_dist, pick_pos, and
 pick_normal attributes on the selected objects

git-svn-id: svn://anubis/anaglym/trunk@307 99a6e188-d820-4881-8870-2d33a10e2619
---
 ag.cc | 45 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/ag.cc b/ag.cc
index c6da35d..7430879 100644
--- a/ag.cc
+++ b/ag.cc
@@ -104,19 +104,44 @@ namespace ag
                  it != objects->end();
                  it++)
             {
-                lua_getfield(L, LUA_GLOBALSINDEX, "ag");    /* pushes 1 */
-                lua_getfield(L, -1, "_objects");            /* pushes 1 */
-                lua_pushinteger(L, (*it)->id);              /* pushes 1 */
-                lua_gettable(L, -2);                        /* replace top */
-                lua_remove(L, -3);                          /* remove 1 */
-                lua_remove(L, -2);                          /* remove 1 */
+                lua_getfield(L, LUA_GLOBALSINDEX, "ag");/* {ag} */
+                lua_getfield(L, -1, "_objects");        /* {ag,_objects} */
+                lua_pushinteger(L, (*it)->id);          /* {ag,_objects,id} */
+                lua_gettable(L, -2);                    /* {ag,_objects,obj} */
+                lua_remove(L, -3);                      /* {_objects,obj} */
+                lua_remove(L, -2);                      /* {obj} */
                 if (!lua_isnil(L, -1))
                 {
-                    lua_pushinteger(L, next_index++);       /* push key */
-                    lua_pushvalue(L, -2);                   /* push value */
-                    lua_settable(L, argc + 1);              /* pop 2 */
+                    lua_pushinteger(L, next_index++);   /* {obj,index} */
+                    lua_pushvalue(L, -2);               /* {obj,index,obj} */
+                    lua_settable(L, argc + 1);          /* {obj} */
                 }
-                lua_pop(L, 1);                              /* pop 1 */
+                lua_pushstring(L, "pick_dist");     /* {obj,"pick_dist"} */
+                lua_pushnumber(L, (*it)->dist);     /* {obj,"pick_dist",dist} */
+                lua_settable(L, -3);                /* {obj} */
+                lua_createtable(L, 3, 0);           /* {obj,arr} */
+                for (int i = 0; i < 3; i++)
+                {
+                    lua_pushinteger(L, i + 1);      /* {obj,arr,index} */
+                    lua_pushnumber(L, (*it)->pos[i]);/* {obj,arr,index,pos_x} */
+                    lua_settable(L, -3);            /* {obj,arr} */
+                }
+                lua_pushstring(L, "pick_pos");      /* {obj,arr,"pick_pos"} */
+                lua_pushvalue(L, -2);           /* {obj,arr,"pick_pos",arr} */
+                lua_settable(L, -4);                /* {obj,arr} */
+                lua_pop(L, 1);                      /* {obj} */
+                lua_createtable(L, 3, 0);           /* {obj,arr} */
+                for (int i = 0; i < 3; i++)
+                {
+                    lua_pushinteger(L, i + 1);      /* {obj,arr,index} */
+                    lua_pushnumber(L, (*it)->normal[i]);/* {obj,arr,index,n} */
+                    lua_settable(L, -3);            /* {obj,arr} */
+                }
+                lua_pushstring(L, "pick_normal"); /* {obj,arr,"pick_normal"} */
+                lua_pushvalue(L, -2);       /* {obj,arr,"pick_normal",arr} */
+                lua_settable(L, -4);                /* {obj,arr} */
+                lua_pop(L, 1);                      /* {obj} */
+                lua_pop(L, 1);                      /* {} */
             }
         }
         else