Slap my wrists and shan't happen again friend :) Shhh, one won't spill that
what you saw the fringes of my brain. WIP pending.
On Sat, Jul 26, 2008 at 7:32 AM, <[EMAIL PROTECTED]> wrote:
> Hi Amir,
>
> seeing https://www.crystalspace3d.org/trac/cel/changeset/3567 should have
> tipped you about "ledges" stuff not being present in actual CEL trunk...
> Probably forgot to add & commit it ?
> Btw, what's that stuff about ? Ditto for all the recent stuff you added,
> like "pcgrab" and iGenjix (renaming pending ?)...
> How is that to be used ?
>
>
> >Sujet: [Cel-cvs-update] SF.net SVN: cel:[3576] cel/trunk
> > <mailto:[EMAIL PROTECTED]
> ?subject=unsubscribe>
> > <mailto:[EMAIL PROTECTED]
> ?subject=subscribe>
> >
> >Revision: 3576
> > http://cel.svn.sourceforge.net/cel/?rev=3576&view=rev
> >Author: genjix
> >Date: 2008-07-26 05:23:20 +0000 (Sat, 26 Jul 2008)
> >
> >Log Message:
> >-----------
> >nested property classes...
> >
> >Modified Paths:
> >--------------
> > cel/trunk/apps/celtest/celtest.cpp
> > cel/trunk/data/basic_entities
> > cel/trunk/data/basic_world
> > cel/trunk/include/celtool/stdpcimp.h
> > cel/trunk/include/physicallayer/propclas.h
> > cel/trunk/include/propclass/bag.h
> > cel/trunk/libs/celtool/stdpcimp.cpp
> > cel/trunk/plugins/addons/Jamfile
> > cel/trunk/plugins/addons/celentity/celentity.cpp
> > cel/trunk/plugins/addons/celgraph/celgraph.cpp
> > cel/trunk/plugins/behaviourlayer/xml/xmlscript.cpp
> > cel/trunk/plugins/propclass/tools/bagfact.cpp
> > cel/trunk/plugins/propclass/tools/bagfact.h
> > cel/trunk/plugins/tools/Jamfile
> > cel/trunk/plugins/tools/celgraph/celgraph.h
> >
> >Modified: cel/trunk/apps/celtest/celtest.cpp
> >===================================================================
> >--- cel/trunk/apps/celtest/celtest.cpp 2008-07-25 13:44:13 UTC (rev 3575)
> >+++ cel/trunk/apps/celtest/celtest.cpp 2008-07-26 05:23:20 UTC (rev 3576)
> >@@ -193,7 +193,7 @@
> > "pcobject.mesh",
> > "pcobject.mesh.select",
> > "pcmove.linear",
> >- "pc2d.tooltip",
> >+ //"pc2d.tooltip",
> > "pctools.inventory",
> > "pctools.timer",
> > "pcsound.listener",
> >
> >Modified: cel/trunk/data/basic_entities
> >===================================================================
> >--- cel/trunk/data/basic_entities 2008-07-25 13:44:13 UTC (rev 3575)
> >+++ cel/trunk/data/basic_entities 2008-07-26 05:23:20 UTC (rev 3576)
> >@@ -27,7 +27,7 @@
> > <texture>marble</texture>
> > </material>
> > </materials>
> >-<!--
> >+<!-- -->
> > <sounds>
> > <sound name="loopbzzt" mode3d="absolute"
> > file="/this/sounds/outdoor/ambient/wind_flute_building_l_c.ogg" />
> >
> >Modified: cel/trunk/data/basic_world
> >===================================================================
> >--- cel/trunk/data/basic_world 2008-07-25 13:44:13 UTC (rev 3575)
> >+++ cel/trunk/data/basic_world 2008-07-26 05:23:20 UTC (rev 3576)
> >@@ -460,6 +460,10 @@
> > <sector name="room">
> > <addon plugin="cel.addons.ledges">
> > <genjix name="Amir" />
> >+ <ledge>
> >+ <p x="2" y="1.3" z="-4.9" />
> >+ <p x="0" y="1.3" z="-4.9" />
> >+ </ledge>
> > </addon>
> >
> > <meshobj name="Cube">
> >
> >Modified: cel/trunk/include/celtool/stdpcimp.h
> >===================================================================
> >--- cel/trunk/include/celtool/stdpcimp.h 2008-07-25 13:44:13 UTC
> (rev 3575)
> >+++ cel/trunk/include/celtool/stdpcimp.h 2008-07-26 05:23:20 UTC
> (rev 3576)
> >@@ -24,6 +24,7 @@
> > #include "iutil/comp.h"
> > #include "iutil/objreg.h"
> > #include "ivaria/reporter.h"
> >+#include "csutil/csobject.h"
> > #include "csutil/scf.h"
> > #include "csutil/scf_implementation.h"
> > #include "csutil/refarr.h"
> >@@ -84,11 +85,8 @@
> > * from which all other property classes can inherit.
> > * This makes it easier to write a property class.
> > */
> >-class CEL_CELTOOL_EXPORT celPcCommon :
> >- public scfImplementation3<celPcCommon,
> >- iCelPropertyClass,
> >- iCelTimerListener,
> >- iMessageSender>
> >+class CEL_CELTOOL_EXPORT celPcCommon
> >+ : public scfImplementationExt3<celPcCommon, csObject,
> iCelPropertyClass, iCelTimerListener, iMessageSender>
> > {
> > private:
> > csRefArray<iCelPropertyChangeCallback> callbacks;
> >@@ -98,8 +96,7 @@
> > // and cleared by HavePropertyClassesChanged().
> > bool propclasses_dirty;
> > char* tag;
> >- // the name of the property class
> >- const char* name;
> >+ // the name of the property class stored in the iObject
> >
> > protected:
> > iCelEntity* entity;
> >@@ -140,10 +137,10 @@
> > if (rep)
> > rep->ReportError("crystalspace.cel.physicallayer",
> > "celPcCommon::AddProperty out of bounds %zu >= %zu!",
> >- idx,propholder->propertycount);
> >+ idx, propholder->propertycount);
> > else
> > csPrintf("Error: celPcCommon::AddProperty out of bounds %zu >=
> %zu!",
> >- idx,propholder->propertycount);
> >+ idx, propholder->propertycount);
> > return;
> > }
> > if (propdata == 0)
> >@@ -188,9 +185,11 @@
> > virtual void SetTag (const char* tagname);
> > virtual const char* GetTag () const { return tag; }
> >
> >+ virtual const char* GetName () const;
> > virtual void SetName (const char* pcname);
> >- virtual const char* GetName () const { return name; }
> >
> >+ iObject *QueryObject () { return (iObject*)this; }
> >+
> > virtual iCelEntity* GetEntity () { return entity; }
> > virtual void SetEntity (iCelEntity* entity);
> > virtual bool AddPropertyChangeCallback (iCelPropertyChangeCallback*
> cb);
> >
> >Modified: cel/trunk/include/physicallayer/propclas.h
> >===================================================================
> >--- cel/trunk/include/physicallayer/propclas.h 2008-07-25 13:44:13 UTC
> (rev 3575)
> >+++ cel/trunk/include/physicallayer/propclas.h 2008-07-26 05:23:20 UTC
> (rev 3576)
> >@@ -117,6 +117,11 @@
> > virtual const char* GetName () const = 0;
> >
> > /**
> >+ * Get the associated iObject from this property class.
> >+ */
> >+ virtual iObject *QueryObject () = 0;
> >+
> >+ /**
> > * Set the optional tag of this property class. Multiple property
> > * classes of the same type (same name) can be attached to the same
> > * entity. To do that you need to add a tag so that you can uniquely
> >
> >Modified: cel/trunk/include/propclass/bag.h
> >===================================================================
> >--- cel/trunk/include/propclass/bag.h 2008-07-25 13:44:13 UTC (rev 3575)
> >+++ cel/trunk/include/propclass/bag.h 2008-07-26 05:23:20 UTC (rev 3576)
> >@@ -71,7 +71,7 @@
> > /**
> > * Return an iterator iterating over all strings.
> > */
> >- virtual csSet<csString>::GlobalIterator GetIterator () = 0;
> >+ //virtual csSet<csString>::GlobalIterator GetIterator () = 0;
> > };
> >
> > #endif // __CEL_PF_BAG
> >
> >Modified: cel/trunk/libs/celtool/stdpcimp.cpp
> >===================================================================
> >--- cel/trunk/libs/celtool/stdpcimp.cpp 2008-07-25 13:44:13 UTC
> (rev 3575)
> >+++ cel/trunk/libs/celtool/stdpcimp.cpp 2008-07-26 05:23:20 UTC
> (rev 3576)
> >@@ -39,7 +39,6 @@
> > propholder = 0;
> > propclasses_dirty = true;
> > tag = 0;
> >- name = 0;
> >
> > pl = csQueryRegistry<iCelPlLayer> (object_reg);
> > }
> >@@ -47,7 +46,6 @@
> > celPcCommon::~celPcCommon ()
> > {
> > delete[] tag;
> >- delete[] name;
> > }
> >
> > void celPcCommon::SetTag (const char* tagname)
> >@@ -55,13 +53,17 @@
> > delete[] tag;
> > tag = csStrNew (tagname);
> > }
> >+
> >+const char* celPcCommon::GetName () const
> >+{
> >+ return csObject::GetName ();
> >+}
> > // @@@ (ge) Please note that after the alternate names are deprecated
> > // that this can turn into a simple assignment and the macro factory
> > // definition should pass in a hard reference for the name.
> > void celPcCommon::SetName (const char* pcname)
> > {
> >- delete[] name;
> >- name = csStrNew (pcname);
> >+ csObject::SetName (pcname);
> > }
> >
> > void celPcCommon::SetEntity (iCelEntity* entity)
> >
> >Modified: cel/trunk/plugins/addons/Jamfile
> >===================================================================
> >--- cel/trunk/plugins/addons/Jamfile 2008-07-25 13:44:13 UTC (rev 3575)
> >+++ cel/trunk/plugins/addons/Jamfile 2008-07-26 05:23:20 UTC (rev 3576)
> >@@ -5,3 +5,4 @@
> > SubInclude TOP plugins addons xmlscripts ;
> > SubInclude TOP plugins addons ruledef ;
> > SubInclude TOP plugins addons celgraph ;
> >+SubInclude TOP plugins addons ledges ;
> >
> >Modified: cel/trunk/plugins/addons/celentity/celentity.cpp
> >===================================================================
> >--- cel/trunk/plugins/addons/celentity/celentity.cpp 2008-07-25 13:44:13
> UTC (rev 3575)
> >+++ cel/trunk/plugins/addons/celentity/celentity.cpp 2008-07-26 05:23:20
> UTC (rev 3576)
> >@@ -52,6 +52,7 @@
> > XMLTOKEN_PARAMS,
> > XMLTOKEN_CALL,
> > XMLTOKEN_CLASS,
> >+ XMLTOKEN_ENTITY,
> >
> > XMLTOKEN_FLOAT,
> > XMLTOKEN_BOOL,
> >@@ -100,6 +101,7 @@
> > xmltokens.Register ("params", XMLTOKEN_PARAMS);
> > xmltokens.Register ("call", XMLTOKEN_CALL);
> > xmltokens.Register ("class", XMLTOKEN_CLASS);
> >+ xmltokens.Register ("entity", XMLTOKEN_ENTITY);
> >
> > xmltokens.Register ("float", XMLTOKEN_FLOAT);
> > xmltokens.Register ("bool", XMLTOKEN_BOOL);
> >@@ -468,6 +470,12 @@
> > csStringID id = xmltokens.Request (value);
> > switch (id)
> > {
> >+ case XMLTOKEN_ENTITY:
> >+ {
> >+ iCelEntity* childent = Load (child, mesh);
> >+ ent->QueryObject ()->ObjAdd (childent->QueryObject ());
> >+ break;
> >+ }
> > case XMLTOKEN_BEHAVIOUR:
> > {
> > csRef<iCelBlLayer> bl;
> >
> >Modified: cel/trunk/plugins/addons/celgraph/celgraph.cpp
> >===================================================================
> >--- cel/trunk/plugins/addons/celgraph/celgraph.cpp 2008-07-25 13:44:13
> UTC (rev 3575)
> >+++ cel/trunk/plugins/addons/celgraph/celgraph.cpp 2008-07-26 05:23:20
> UTC (rev 3576)
> >@@ -91,7 +91,7 @@
> >
> > xmltokens.Register ("node", XMLTOKEN_NODE);
> > xmltokens.Register ("edge", XMLTOKEN_EDGE);
> >-
> >+
> > return true;
> > }
> >
> >@@ -132,8 +132,8 @@
> > if (!sector)
> > {
> > synldr->ReportError (
> >- "cel.addons.celgraph", node,
> >- "Graph addons must be placed inside sectors!");
> >+ "cel.addons.celgraph", node,
> >+ "Graph addons must be placed inside sectors!");
> > return 0;
> > }
> > csRef<iCelGraph> graph;
> >@@ -197,7 +197,6 @@
> > if(!graph)
> > fprintf(stderr, "Error Loading CelGraph!\n");
> >
> >-
> > csRef<iDocumentNodeIterator> it = node->GetNodes ();
> > while (it->HasNext ())
> > {
> >
> >Modified: cel/trunk/plugins/behaviourlayer/xml/xmlscript.cpp
> >===================================================================
> >--- cel/trunk/plugins/behaviourlayer/xml/xmlscript.cpp 2008-07-25 13:44:13
> UTC (rev 3575)
> >+++ cel/trunk/plugins/behaviourlayer/xml/xmlscript.cpp 2008-07-26 05:23:20
> UTC (rev 3576)
> >@@ -4329,7 +4329,7 @@
> > csRef<iPcBag> pcbag = scfQueryInterface<iPcBag> (pc);
> > if (!pcbag)
> > return ReportError (cbl, "This property class is not a bag!");
> >- csSet<csString>::GlobalIterator iterator = pcbag->GetIterator ();
> >+ /*csSet<csString>::GlobalIterator iterator = pcbag->GetIterator
> ();
> > size_t endlocation = op.arg.arg.codelocation;
> > celData ret;
> > cbl->call_stack.Push (GetName ());
> >@@ -4346,7 +4346,7 @@
> > cbl->call_stack_params.Pop ();
> > cbl->call_stack.Pop ();
> > delete[] copy_varname;
> >- i = endlocation;
> >+ i = endlocation;*/
> > }
> > break;
> > case CEL_OPERATION_FORI:
> >
> >Modified: cel/trunk/plugins/propclass/tools/bagfact.cpp
> >===================================================================
> >--- cel/trunk/plugins/propclass/tools/bagfact.cpp 2008-07-25 13:44:13
> UTC (rev 3575)
> >+++ cel/trunk/plugins/propclass/tools/bagfact.cpp 2008-07-26 05:23:20
> UTC (rev 3576)
> >@@ -163,10 +163,10 @@
> > return bag.Contains (str);
> > }
> >
> >-csSet<csString>::GlobalIterator celPcBag::GetIterator ()
> >+/*csSet<csString>::GlobalIterator celPcBag::GetIterator ()
> > {
> > return bag.GetIterator ();
> >-}
> >+}*/
> >
> >
> //---------------------------------------------------------------------------
> >
> >
> >Modified: cel/trunk/plugins/propclass/tools/bagfact.h
> >===================================================================
> >--- cel/trunk/plugins/propclass/tools/bagfact.h 2008-07-25 13:44:13
> UTC (rev 3575)
> >+++ cel/trunk/plugins/propclass/tools/bagfact.h 2008-07-26 05:23:20
> UTC (rev 3576)
> >@@ -84,8 +84,7 @@
> > virtual void RemoveString (const char* str);
> > virtual void Clear ();
> > virtual bool HasString (const char* str);
> >- virtual csSet<csString>::GlobalIterator GetIterator ();
> >+ //virtual csSet<csString>::GlobalIterator GetIterator ();
> > };
> >
> > #endif // __CEL_PF_BAGFACT__
> >-
> >
> >Modified: cel/trunk/plugins/tools/Jamfile
> >===================================================================
> >--- cel/trunk/plugins/tools/Jamfile 2008-07-25 13:44:13 UTC (rev 3575)
> >+++ cel/trunk/plugins/tools/Jamfile 2008-07-26 05:23:20 UTC (rev 3576)
> >@@ -5,6 +5,4 @@
> > SubInclude TOP plugins tools quests ;
> > SubInclude TOP plugins tools rulebase ;
> > SubInclude TOP plugins tools celgraph ;
> >-
> >-
> >-
> >+SubInclude TOP plugins tools ledges ;
> >
> >Modified: cel/trunk/plugins/tools/celgraph/celgraph.h
> >===================================================================
> >--- cel/trunk/plugins/tools/celgraph/celgraph.h 2008-07-25 13:44:13
> UTC (rev 3575)
> >+++ cel/trunk/plugins/tools/celgraph/celgraph.h 2008-07-26 05:23:20
> UTC (rev 3576)
> >@@ -55,7 +55,6 @@
> > csRef<iCelNode> successor;
> > bool state;
> >
> >-
> > public:
> > celEdge ();
> > virtual ~celEdge ();
> >@@ -76,8 +75,8 @@
> > float cost;
> > csString name;
> > float multiplier;
> >+
> > public:
> >-
> > celNode ();
> > virtual ~celNode ();
> > virtual void AddSuccessor (iCelNode* node, bool state);
> >
> >
> >This was sent by the SourceForge.net collaborative development platform,
> the world's largest Open Source development site.
> >
> >-------------------------------------------------------------------------
> >This SF.Net email is sponsored by the Moblin Your Move Developer's
> challenge
> >Build the coolest Linux based applications with Moblin SDK & win great
> prizes
> >Grand prize is a trip for two to an Open Source event anywhere in the
> world
> >http://moblin-contest.org/redirect.php?banner_id=100&url=/
> >_______________________________________________
> >Cel-cvs-update mailing list
> >[EMAIL PROTECTED]
> >https://lists.sourceforge.net/lists/listinfo/cel-cvs-update
> >
>
>
> -------------------------------------------------------------------------
> This SF.Net email is sponsored by the Moblin Your Move Developer's
> challenge
> Build the coolest Linux based applications with Moblin SDK & win great
> prizes
> Grand prize is a trip for two to an Open Source event anywhere in the world
> http://moblin-contest.org/redirect.php?banner_id=100&url=/
> _______________________________________________
> Cel-main mailing list
> Cel-main@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/cel-main
>
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Cel-main mailing list
Cel-main@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cel-main
