Thread: [Yake-svn] SF.net SVN: yake: [1824] trunk/yake (Page 5)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1824
          http://yake.svn.sourceforge.net/yake/?rev=1824&view=rev
Author:   psyclonist
Date:     2007-08-28 10:53:02 -0700 (Tue, 28 Aug 2007)

Log Message:
-----------
* intermediate work for new property access and improved entity scripting
* src\bindings.lua\detail\property.lua.cpp needs more work! especially, the BindPropertySetFnList is disabled, at the moment.

Modified Paths:
--------------
    trunk/yake/src/bindings.lua/detail/ent.lua.cpp
    trunk/yake/src/bindings.lua/detail/property.lua.cpp

Added Paths:
-----------
    trunk/yake/common/media/scripts/o_access.lua

Added: trunk/yake/common/media/scripts/o_access.lua
===================================================================

--- trunk/yake/common/media/scripts/o_access.lua	                        (rev 0)
+++ trunk/yake/common/media/scripts/o_access.lua	2007-08-28 17:53:02 UTC (rev 1824)
@@ -0,0 +1,133 @@
+print("> Starting object script...");
+function startup()
+	--this:fsm("main"):connectTo("alive",fn) -- connects to 'enter', 'tick', 'exit'
+	--this:fsm("main"):connectToEnter("dead",fn) -- connects to 'enter' only
+	--this:fsm("main"):connect("alive", fnEnter, fnTick, fnExit)
+
+	this:events("spawn"):connect(
+		function()
+			
+		end
+		)
+end
+properties = {}
+properties_mt = {}
+
+properties_mt.__index = function(t,k)
+	print("INDEX",t,k)
+	--for u,v in pairs(t) do print(u,v) end
+	--return events[k]
+	return this:properties():get(k):get()
+end
+properties_mt.__newindex = function(t,k,v)
+	print("NEWINDEX",t,"'"..tostring(k).."'",v)
+	--rawset(t,k,v)
+	--for u,v in pairs(t) do print(u,v) end
+	local exists = this:properties():get(k)
+	if exists then
+		print("EXISTS")
+		exists:set(v)
+		return true
+	end
+	this:properties():create(k,v)
+	return true
+end
+
+setmetatable(properties, properties_mt)
+
+properties.s = 1
+properties["s"] = 2
+print(properties["s"])
+
+event = {
+	on_spawn = function()
+		print("  script event.on_spawn")
+		this:properties():create("ticks",0)
+	end,
+	on_tick = function()
+		print("  script event.on_tick")
+	end,
+	on_die = function()
+		print("  script event.on_die")
+	end,
+	-- various:
+	onArrived = function() --triggered as a result of "go to"
+	end,
+	-- Trigger
+	on_toggle = function()
+		print("event.on_toggle")
+	end
+}
+fsm = {
+	main = {
+		states = {
+			awakening,
+			alive,
+			dead
+		},
+		transitions = {
+			{awakening,"spawn",alive},
+			{alive,"die",dead}
+		}
+	}
+}
+state = {
+	off = {
+		on_enter = function()
+			print("state.off.enter()")
+
+			this:setCondition(function() return (this:property("ticks"):get() >= 1 and this:property("ticks"):get() <= 3) end)
+			this:events():get("onTriggered"):connect( function(a) print("TRIGGER:onTriggered:",a) end )
+		end,
+		on_tick = function()
+			local ticks = this:property("ticks")
+			if ticks then
+				ticks:set( ticks:get() + 1 )
+			end
+			print("state.off.tick()") --,ticks:get()
+			--
+			--if (state.off.ticks == 1) then
+			--	this:processFsmEvent("trigger")
+			--end
+			--
+			--this:events():get("onTriggered"):fire(42)
+		end,
+		on_exit = function()
+			print("state.off.exit()")
+		end
+	}
+	,
+	on = {
+		on_enter = function()
+			print("state.on.enter()")
+		end,
+		on_tick = function()
+			local ticks = this:property("ticks")
+			if ticks then
+				ticks:set( ticks:get() + 1 )
+			end
+			print("state.on.tick()") --,ticks:get()
+		end,
+		on_exit = function()
+			print("state.on.exit()")
+		end
+	}
+	,
+	dead = {
+		on_enter = function()
+			print("  script state.dead.on_enter")
+		end,
+		on_tick = function()
+			print("  script state.dead.on_tick")
+		end,
+		on_exit = function()
+			print("  script state.dead.on_exit")
+		end
+	}
+}
+print("> Object script up.");
+
+function main()
+	print("main()")
+end
+

Modified: trunk/yake/src/bindings.lua/detail/ent.lua.cpp
===================================================================
--- trunk/yake/src/bindings.lua/detail/ent.lua.cpp	2007-08-27 17:13:37 UTC (rev 1823)
+++ trunk/yake/src/bindings.lua/detail/ent.lua.cpp	2007-08-28 17:53:02 UTC (rev 1824)
@@ -175,6 +175,10 @@
 				return 0;
 			}
 		}
+		static property::PropertyBase* createAndAddPropertyFromNumber(Object::PropertyAccess& access, const char* name, int number)
+		{
+			return createAndAddPropertyFromAny(access,name,boost::any(number));
+		}
 	};
 	//-------------------------------------------------------------------------
 	void bind( lua_State* L )
@@ -216,6 +220,7 @@
 			.def( "create", (property::PropertyBase*(*)(Object::PropertyAccess&,const char*,const boost::any&))&LuaBinder::createAndAddPropertyFromAny )
 			// For all other 'custom' registered and unknown types:
 			.def( "create", (property::PropertyBase*(*)(Object::PropertyAccess&,const char*,luabind::object))&LuaBinder::createAndAddProperty )
+			//.def( "create", &LuaBinder::createAndAddPropertyFromNumber)
 		;
 		module( YAKE_MODEL_MODULE )
 		[ x_Object_PropertyAccess ];

Modified: trunk/yake/src/bindings.lua/detail/property.lua.cpp
===================================================================
--- trunk/yake/src/bindings.lua/detail/property.lua.cpp	2007-08-27 17:13:37 UTC (rev 1823)
+++ trunk/yake/src/bindings.lua/detail/property.lua.cpp	2007-08-28 17:53:02 UTC (rev 1824)
@@ -156,15 +156,17 @@
 			LuabindClass_PropertyBase x( "PropertyBase" );
 			x
 				.def( "type", &PropertyBase::type )
-				//.def( "set", &setPropertyValue ) // for boost::any
+				.def( "set", &setPropertyValue ) // for boost::any
 				.def( "get", (boost::any(PropertyBase::*)()const)&PropertyBase::getAny )
 				;
 			// register additional 'set' overloads:
+			/*
 			for (BindSetPropertyFnList::const_iterator it = setPropertyValue_binders().begin();
 				it != setPropertyValue_binders().end(); ++it)
 			{
 				(*it)(x);
 			}
+			*/
 			//
 			module( YAKE_MODEL_MODULE )[ x ] ;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Yake-svn] SF.net SVN: yake: [1824] trunk/yake (Page 5)

yake-svn