GNOME.org
 

gnomemm r1631 - in clutter-box2dmm/trunk: . clutter-box2d clutter-box2d/clutter-box2dmm clutter-box2d/clutter-box2dmm/private clutter-box2d/src docs docs/reference examples tools/extra_defs_gen tools/m4

Author: murrayc
Date: Fri Jul 25 09:53:50 2008
New Revision: 1631
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1631&view=rev

Log:
2008-07-25  Murray Cummin  <murrayc murrayc com>

* Added initial build structure, though something still is not 
quite right.

Added:
   clutter-box2dmm/trunk/ChangeLog
   clutter-box2dmm/trunk/Makefile.am
      - copied, changed from r1629, /clutter-cairomm/trunk/Makefile.am
   clutter-box2dmm/trunk/NEWS
   clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm-config.h.in
      - copied, changed from r1629, /clutter-cairomm/trunk/clutter-cairo/clutter-cairomm-config.h.in
   clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm.h
   clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm.pc.in
      - copied, changed from r1629, /clutter-cairomm/trunk/clutter-cairo/clutter-cairomm.pc.in
   clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm/init.cc
   clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm/init.h
   clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm/wrap_init.h
   clutter-box2dmm/trunk/clutter-box2d/src/Makefile_list_of_hg.am_fragment
   clutter-box2dmm/trunk/clutter-box2d/src/box2d.ccg
   clutter-box2dmm/trunk/clutter-box2d/src/box2d.hg
   clutter-box2dmm/trunk/clutter-box2d/src/clutter-box2d-docs.xml
   clutter-box2dmm/trunk/clutter-box2d/src/clutter-box2d-docs_override.xml
   clutter-box2dmm/trunk/clutter-box2d/src/clutter-box2d.defs
   clutter-box2dmm/trunk/clutter-box2d/src/clutter-box2d_enums.defs
   clutter-box2dmm/trunk/clutter-box2d/src/clutter-box2d_methods.defs
   clutter-box2dmm/trunk/clutter-box2d/src/clutter-box2d_signals.defs
   clutter-box2dmm/trunk/clutter-box2d/src/clutter-box2d_vfuncs.defs
   clutter-box2dmm/trunk/docs/
      - copied from r1629, /clutter-cairomm/trunk/docs/
   clutter-box2dmm/trunk/tools/extra_defs_gen/generate_defs_clutter_box2d.cc
      - copied, changed from r1630, /clutter-box2dmm/trunk/tools/extra_defs_gen/generate_defs_clutter_cairo.cc
   clutter-box2dmm/trunk/tools/m4/convert_clutter-box2dmm.m4
      - copied unchanged from r1630, /clutter-box2dmm/trunk/tools/m4/convert_cluttermm.m4
Removed:
   clutter-box2dmm/trunk/examples/README.txt
   clutter-box2dmm/trunk/examples/actor.png
   clutter-box2dmm/trunk/examples/effect.cc
   clutter-box2dmm/trunk/examples/flowers.cc
   clutter-box2dmm/trunk/examples/simple-cairo.cc
   clutter-box2dmm/trunk/examples/test-actors.cc
   clutter-box2dmm/trunk/examples/test-boxes.cc
   clutter-box2dmm/trunk/tools/extra_defs_gen/generate_defs_clutter_cairo.cc
   clutter-box2dmm/trunk/tools/m4/convert_cluttermm.m4
Modified:
   clutter-box2dmm/trunk/autogen.sh
   clutter-box2dmm/trunk/clutter-box2d/Makefile.am
   clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm/Makefile.am
   clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm/private/Makefile.am
   clutter-box2dmm/trunk/clutter-box2d/src/Makefile.am
   clutter-box2dmm/trunk/configure.in
   clutter-box2dmm/trunk/docs/reference/Doxyfile.in
   clutter-box2dmm/trunk/examples/Makefile.am
   clutter-box2dmm/trunk/examples/Makefile.am_fragment
   clutter-box2dmm/trunk/tools/extra_defs_gen/Makefile.am
   clutter-box2dmm/trunk/tools/m4/Makefile.am
   clutter-box2dmm/trunk/tools/m4/Makefile_list_of_sources.am_fragment
   clutter-box2dmm/trunk/tools/m4/convert.m4

Copied: clutter-box2dmm/trunk/Makefile.am (from r1629, /clutter-cairomm/trunk/Makefile.am)
==============================================================================
--- /clutter-cairomm/trunk/Makefile.am	(original)
+++ clutter-box2dmm/trunk/Makefile.am	Fri Jul 25 09:53:50 2008
@@ -1,4 +1,4 @@
-SUBDIRS		= tools clutter-cairo docs examples tests
+SUBDIRS		= tools clutter-box2d docs examples
 DIST_SUBDIRS	= $(SUBDIRS) scripts
 
 EXTRA_DIST	=  \

Added: clutter-box2dmm/trunk/NEWS
==============================================================================

Modified: clutter-box2dmm/trunk/autogen.sh
==============================================================================
--- clutter-box2dmm/trunk/autogen.sh	(original)
+++ clutter-box2dmm/trunk/autogen.sh	Fri Jul 25 09:53:50 2008
@@ -15,11 +15,11 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="clutter-cairomm"
+PKG_NAME="clutter-box2dmm"
 
 (test -f $srcdir/configure.in \
-  && test -d $srcdir/clutter-cairo/src \
-  && test -d $srcdir/clutter-cairo/clutter-cairomm) || {
+  && test -d $srcdir/clutter-box2d/src \
+  && test -d $srcdir/clutter-box2d/clutter-box2dmm) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1

Modified: clutter-box2dmm/trunk/clutter-box2d/Makefile.am
==============================================================================
--- clutter-box2dmm/trunk/clutter-box2d/Makefile.am	(original)
+++ clutter-box2dmm/trunk/clutter-box2d/Makefile.am	Fri Jul 25 09:53:50 2008
@@ -1,15 +1,15 @@
-SUBDIRS		= src clutter-cairomm
+SUBDIRS		= src clutter-box2dmm
 
 EXTRA_DIST	= README					\
-		  clutter-cairomm-config.h.in clutter-cairomm.h	\
-		  clutter-cairomm.pc.in
+		  clutter-box2dmm-config.h.in clutter-box2dmm.h	\
+		  clutter-box2dmm.pc.in
 
-cluttermm_includedir		= $(includedir)/clutter-cairomm-$(API_VER)
-cluttermm_include_HEADERS	= clutter-cairomm.h
+cluttermm_includedir		= $(includedir)/clutter-box2dmm-$(API_VER)
+cluttermm_include_HEADERS	= clutter-box2dmm.h
 
-cluttermm_configdir		= $(libdir)/clutter-cairomm-$(API_VER)/include
-cluttermm_config_DATA	= clutter-cairomm-config.h
+cluttermm_configdir		= $(libdir)/clutter-box2dmm-$(API_VER)/include
+cluttermm_config_DATA	= clutter-box2dmm-config.h
 
 pkgconfigdir		= $(libdir)/pkgconfig
-pkgconfig_DATA		= clutter-cairomm-$(API_VER).pc
+pkgconfig_DATA		= clutter-box2dmm-$(API_VER).pc
 DISTCLEANFILES = $(pkgconfig_DATA)

Copied: clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm-config.h.in (from r1629, /clutter-cairomm/trunk/clutter-cairo/clutter-cairomm-config.h.in)
==============================================================================
--- /clutter-cairomm/trunk/clutter-cairo/clutter-cairomm-config.h.in	(original)
+++ clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm-config.h.in	Fri Jul 25 09:53:50 2008
@@ -1,13 +1,13 @@
-#ifndef _LIBCLUTTERMM_CONFIG_H
-#define _LIBCLUTTERMM_CONFIG_H 1
+#ifndef _LIBCLUTTER_BOX2DMM_CONFIG_H
+#define _LIBCLUTTER_BOX2DMM_CONFIG_H 1
 
 #include "glibmmconfig.h"
 
 /* version numbers */
-#undef LIBCLUTTERMM_MAJOR_VERSION
-#undef LIBCLUTTERMM_MINOR_VERSION
-#undef LIBCLUTTERMM_MICRO_VERSION
-#undef LIBCLUTTERMM_VERSION
+#undef LIBCLUTTER_BOX2DMM_MAJOR_VERSION
+#undef LIBCLUTTER_BOX2DMM_MINOR_VERSION
+#undef LIBCLUTTER_BOX2DMM_MICRO_VERSION
+#undef LIBCLUTTER_BOX2DMM_VERSION
 
-#endif /* _LIBCLUTTERMM_CONFIG_H */
+#endif /* _LIBCLUTTER_BOX2DMM_CONFIG_H */
 

Added: clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm.h
==============================================================================

Copied: clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm.pc.in (from r1629, /clutter-cairomm/trunk/clutter-cairo/clutter-cairomm.pc.in)
==============================================================================
--- /clutter-cairomm/trunk/clutter-cairo/clutter-cairomm.pc.in	(original)
+++ clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm.pc.in	Fri Jul 25 09:53:50 2008
@@ -3,9 +3,9 @@
 libdir= libdir@
 includedir= includedir@
 
-Name: clutter-cairomm
+Name: clutter-box2dmm
 Description: C++ wrapper for clutter
-Requires: clutter- API_VER@ cluttermm- API_VER@ cairomm-1.0
+Requires: clutter-box2d- API_VER@ cluttermm- API_VER@
 Version: @VERSION@
-Libs: -L${libdir} -lcluttermm-cairo- API_VER@
-Cflags: -I${includedir}/clutter-cairomm- API_VER@
+Libs: -L${libdir} -lclutter-box2dmm- API_VER@
+Cflags: -I${includedir}/clutter-box2dmm- API_VER@

Modified: clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm/Makefile.am
==============================================================================
--- clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm/Makefile.am	(original)
+++ clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm/Makefile.am	Fri Jul 25 09:53:50 2008
@@ -3,12 +3,12 @@
 
 SUBDIRS = private
 
-sublib_name = clutter-cairomm
-sublib_libname = clutter-cairomm-$(API_VER)
-sublib_libversion = $(CLUTTER_CAIROMM_SO_VERSION)
+sublib_name = clutter-box2dmm
+sublib_libname = clutter-box2dmm-$(API_VER)
+sublib_libversion = $(CLUTTER_BOX2DMM_SO_VERSION)
 sublib_namespace = Clutter
-sublib_cflags = $(CLUTTER_CAIROMM_CFLAGS) -I$(top_srcdir)/clutter
-sublib_topdir = clutter-cairo
+sublib_cflags = $(CLUTTER_BOX2DMM_CFLAGS) -I$(top_srcdir)/clutter
+sublib_topdir = clutter-box2d
 
 
 files_extra_h	= wrap_init.h init.h
@@ -16,8 +16,8 @@
 
 include $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment
 
-lib_LTLIBRARIES = libclutter-cairomm- API_VER@.la
-libclutter_cairomm_ API_VER@_la_SOURCES = $(files_all_cc)
-libclutter_cairomm_ API_VER@_la_LDFLAGS = $(common_ldflags)
-libclutter_cairomm_ API_VER@_la_LIBADD = $(CLUTTER_CAIROMM_LIBS)
+lib_LTLIBRARIES = libclutter-box2dmm- API_VER@.la
+libclutter_box2dmm_ API_VER@_la_SOURCES = $(files_all_cc)
+libclutter_box2dmm_ API_VER@_la_LDFLAGS = $(common_ldflags)
+libclutter_box2dmm_ API_VER@_la_LIBADD = $(CLUTTER_BOX2DMM_LIBS)
 

Added: clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm/init.cc
==============================================================================
--- (empty file)
+++ clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm/init.cc	Fri Jul 25 09:53:50 2008
@@ -0,0 +1,38 @@
+// -*- c++ -*-
+/*
+ * Copyright 2008 cluttermm development team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <clutter-box2dmm-config.h> //For LIBCLUTTERMM_VERSION
+#include <clutter-box2dmm/wrap_init.h>
+#include <cluttermm/init.h>
+
+namespace Clutter
+{
+
+namespace Box2D
+{
+
+void init(int* nargs, gchar **args[])
+{
+  Clutter::init(nargs, args);
+  wrap_init(); //Tells the Glib::wrap() table about the libclutter-box2dmm classes.
+}
+
+} //namespace Cairo
+
+} //namespace Clutter

Added: clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm/init.h
==============================================================================
--- (empty file)
+++ clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm/init.h	Fri Jul 25 09:53:50 2008
@@ -0,0 +1,37 @@
+// -*- c++ -*-
+#ifndef _LIBCLUTTER_BOX2DMM_INIT_H
+#define _LIBCLUTTER_BOX2DMM_INIT_H
+/*
+ * Copyright 2008 cluttermm development team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <glibmm.h>
+
+namespace Clutter
+{
+
+namespace Box2D
+{
+
+void init(int* nargs, gchar** args[]);
+
+} //namespace Box2D
+
+} //namespace Clutter
+
+#endif //_LIBCLUTTER_BOX2DMM_INIT_H
+

Modified: clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm/private/Makefile.am
==============================================================================
--- clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm/private/Makefile.am	(original)
+++ clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm/private/Makefile.am	Fri Jul 25 09:53:50 2008
@@ -4,7 +4,7 @@
 include $(srcdir)/../../src/Makefile_list_of_hg.am_fragment
 files_built_h		= $(files_hg:.hg=_p.h)
 
-private_includedir	= ${includedir}/clutter-cairomm-$(API_VER)/clutter-cairomm/private
+private_includedir	= ${includedir}/clutter-box2dmm-$(API_VER)/clutter-box2dmm/private
 private_include_HEADERS	= $(files_built_h)
 
 maintainer-clean-local:

Added: clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm/wrap_init.h
==============================================================================
--- (empty file)
+++ clutter-box2dmm/trunk/clutter-box2d/clutter-box2dmm/wrap_init.h	Fri Jul 25 09:53:50 2008
@@ -0,0 +1,32 @@
+#ifndef _LIBCLUTTER_BOX2DMM_WRAP_INIT_H
+#define _LIBCLUTTER_BOX2DMM_WRAP_INIT_H
+
+/* wrap_init.h
+ *
+ * Copyright (C) 2002-2003 The cluttermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+// wrap_init.cc is generated by tools/generate_wrap_init.pl
+
+namespace Clutter
+{
+
+void wrap_init();
+
+} //namespace Clutter
+
+#endif // _LIBCLUTTER_BOX2DMM_WRAP_INIT_H

Modified: clutter-box2dmm/trunk/clutter-box2d/src/Makefile.am
==============================================================================
--- clutter-box2dmm/trunk/clutter-box2d/src/Makefile.am	(original)
+++ clutter-box2dmm/trunk/clutter-box2d/src/Makefile.am	Fri Jul 25 09:53:50 2008
@@ -1,18 +1,17 @@
 ## Copyright (c) 2001
 ## The cluttermm development team.
 
-sublib_name	= clutter-cairomm
+sublib_name	= clutter-box2dmm
 #nested namespaces separated with spaces
-sublib_namespace = Clutter Cairo
-sublib_parentdir = clutter-cairomm
-files_defs	= clutter-cairo.defs \
-			  clutter-cairo_methods.defs \
-			  clutter-cairo_signals.defs \
-			  clutter-cairo_enums.defs \
-			  clutter-cairo_vfuncs.defs \
-			  clutter-cairo_others.defs \
-			  clutter-cairo_docs.xml \
-			  clutter-cairo_docs_override.xml
+sublib_namespace = Clutter Box2D
+sublib_parentdir = clutter-box2dmm
+files_defs	= clutter-box2d.defs \
+			  clutter-box2d_methods.defs \
+			  clutter-box2d_signals.defs \
+			  clutter-box2d_enums.defs \
+			  clutter-box2d_vfuncs.defs \
+			  clutter-box2d_docs.xml \
+			  clutter-box2d_docs_override.xml
 
 include $(top_srcdir)/build_shared/Makefile_gensrc.am_fragment
 

Added: clutter-box2dmm/trunk/clutter-box2d/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- (empty file)
+++ clutter-box2dmm/trunk/clutter-box2d/src/Makefile_list_of_hg.am_fragment	Fri Jul 25 09:53:50 2008
@@ -0,0 +1,5 @@
+# This file is include by other Makefile.am files, using the new automake include feature.
+# The include happens in Makefile.am, not Makefile.in or Makefile,
+# so it's like copy-and-pasting this into each of those Makefile.am files.
+
+files_hg = box2d.hg

Added: clutter-box2dmm/trunk/clutter-box2d/src/box2d.ccg
==============================================================================

Added: clutter-box2dmm/trunk/clutter-box2d/src/box2d.hg
==============================================================================
--- (empty file)
+++ clutter-box2dmm/trunk/clutter-box2d/src/box2d.hg	Fri Jul 25 09:53:50 2008
@@ -0,0 +1,54 @@
+/* Copyright (C) 2008 The cluttermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <cluttermm/texture.h>
+#include <cairomm/context.h>
+ 
+_DEFS(clutter-cairomm,clutter-cairo)
+_PINCLUDE(cluttermm/private/texture_p.h)
+
+
+namespace Clutter
+{
+
+namespace Box2D
+{
+
+//TODO: Documentation.
+class Box2D :
+  public Clutter::Group
+{
+  _CLASS_GOBJECT(Box2D, ClutterBox2D, CLUTTER_BOX2D, Clutter::Group, ClutterGroup)
+
+protected:
+  _DEFAULT_CTOR()
+  _IGNORE(clutter_box2d_new)
+
+  _WRAP_CTOR(CairoTexture(guint surface_width, guint surface_height), clutter_cairo_new)
+
+public:
+  _WRAP_CREATE();
+
+  _WRAP_METHOD(void set_simulating(bool simulating = true), clutter_box2d_set_simulating)
+  _WRAP_METHOD(bool get_simulating() const, clutter_box2d_get_simulating)
+};
+
+} // namespace Cairo
+
+} // namespace Clutter
+
+//vim: ts=2,sw=2

Added: clutter-box2dmm/trunk/clutter-box2d/src/clutter-box2d-docs.xml
==============================================================================

Added: clutter-box2dmm/trunk/clutter-box2d/src/clutter-box2d-docs_override.xml
==============================================================================

Added: clutter-box2dmm/trunk/clutter-box2d/src/clutter-box2d.defs
==============================================================================
--- (empty file)
+++ clutter-box2dmm/trunk/clutter-box2d/src/clutter-box2d.defs	Fri Jul 25 09:53:50 2008
@@ -0,0 +1,4 @@
+(include clutter-box2d_methods.defs)
+(include clutter-box2d_signals.defs)
+(include clutter-box2d_vfuncs.defs)
+(include clutter-box2d_enums.defs)

Added: clutter-box2dmm/trunk/clutter-box2d/src/clutter-box2d_enums.defs
==============================================================================

Added: clutter-box2dmm/trunk/clutter-box2d/src/clutter-box2d_methods.defs
==============================================================================
--- (empty file)
+++ clutter-box2dmm/trunk/clutter-box2d/src/clutter-box2d_methods.defs	Fri Jul 25 09:53:50 2008
@@ -0,0 +1,163 @@
+;; -*- scheme -*-
+; object definitions ...
+(define-object Box2D
+  (in-module "Clutter")
+  (parent "ClutterGroup")
+  (c-name "ClutterBox2D")
+  (gtype-id "CLUTTER_TYPE_BOX2_D")
+)
+
+(define-object Box2DActor
+  (in-module "Clutter")
+  (parent "ClutterChildMeta")
+  (c-name "ClutterBox2DActor")
+  (gtype-id "CLUTTER_TYPE_BOX2_DACTOR")
+)
+
+;; Enumerations and flags ...
+
+
+;; From clutter-box2d-actor.h
+
+(define-method get_actor
+  (of-object "ClutterBox2D")
+  (c-name "clutter_box2d_get_actor")
+  (return-type "ClutterBox2DActor*")
+  (parameters
+    '("ClutterActor*" "actor")
+  )
+)
+
+(define-function clutter_box2d_actor_get_type
+  (c-name "clutter_box2d_actor_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From clutter-box2d.h
+
+(define-function clutter_box2d_get_type
+  (c-name "clutter_box2d_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_box2d_new
+  (c-name "clutter_box2d_new")
+  (is-constructor-of "ClutterBox2D")
+  (return-type "ClutterActor*")
+)
+
+(define-method set_simulating
+  (of-object "ClutterBox2D")
+  (c-name "clutter_box2d_set_simulating")
+  (return-type "none")
+  (parameters
+    '("gboolean" "simulating")
+  )
+)
+
+(define-method get_simulating
+  (of-object "ClutterBox2D")
+  (c-name "clutter_box2d_get_simulating")
+  (return-type "gboolean")
+)
+
+
+
+;; From clutter-box2d-joint.h
+
+(define-method add_revolute_joint
+  (of-object "ClutterBox2D")
+  (c-name "clutter_box2d_add_revolute_joint")
+  (return-type "ClutterBox2DJoint*")
+  (parameters
+    '("ClutterActor*" "actor1")
+    '("ClutterActor*" "actor2")
+    '("const-ClutterVertex*" "anchor1")
+    '("const-ClutterVertex*" "anchor2")
+    '("gdouble" "reference_angle")
+  )
+)
+
+(define-method add_revolute_joint2
+  (of-object "ClutterBox2D")
+  (c-name "clutter_box2d_add_revolute_joint2")
+  (return-type "ClutterBox2DJoint*")
+  (parameters
+    '("ClutterActor*" "actor1")
+    '("ClutterActor*" "actor2")
+    '("const-ClutterVertex*" "anchor")
+  )
+)
+
+(define-method add_distance_joint
+  (of-object "ClutterBox2D")
+  (c-name "clutter_box2d_add_distance_joint")
+  (return-type "ClutterBox2DJoint*")
+  (parameters
+    '("ClutterActor*" "actor1")
+    '("ClutterActor*" "actor2")
+    '("const-ClutterVertex*" "anchor1")
+    '("const-ClutterVertex*" "anchor2")
+    '("gdouble" "length")
+    '("gdouble" "frequency")
+    '("gdouble" "damping_ratio")
+  )
+)
+
+(define-method add_prismatic_joint
+  (of-object "ClutterBox2D")
+  (c-name "clutter_box2d_add_prismatic_joint")
+  (return-type "ClutterBox2DJoint*")
+  (parameters
+    '("ClutterActor*" "actor1")
+    '("ClutterActor*" "actor2")
+    '("const-ClutterVertex*" "anchor1")
+    '("const-ClutterVertex*" "anchor2")
+    '("gdouble" "min_length")
+    '("gdouble" "max_length")
+    '("const-ClutterVertex*" "axis")
+  )
+)
+
+(define-method add_mouse_joint
+  (of-object "ClutterBox2D")
+  (c-name "clutter_box2d_add_mouse_joint")
+  (return-type "ClutterBox2DJoint*")
+  (parameters
+    '("ClutterActor*" "actor")
+    '("ClutterVertex*" "target")
+  )
+)
+
+(define-function clutter_box2d_mouse_joint_update_target
+  (c-name "clutter_box2d_mouse_joint_update_target")
+  (return-type "none")
+  (parameters
+    '("ClutterBox2DJoint*" "mouse_joint")
+    '("const-ClutterVertex*" "target")
+  )
+)
+
+(define-method destroy
+  (of-object "ClutterBox2DJoint")
+  (c-name "clutter_box2d_joint_destroy")
+  (return-type "none")
+)
+
+
+
+;; From clutter-box2d-util.h
+
+(define-function clutter_box2d_actor_track
+  (c-name "clutter_box2d_actor_track")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "actor")
+    '("ClutterActor*" "other")
+    '("ClutterBox2DTrackFlags" "flags")
+  )
+)
+
+

Added: clutter-box2dmm/trunk/clutter-box2d/src/clutter-box2d_signals.defs
==============================================================================

Added: clutter-box2dmm/trunk/clutter-box2d/src/clutter-box2d_vfuncs.defs
==============================================================================

Modified: clutter-box2dmm/trunk/configure.in
==============================================================================
--- clutter-box2dmm/trunk/configure.in	(original)
+++ clutter-box2dmm/trunk/configure.in	Fri Jul 25 09:53:50 2008
@@ -1,11 +1,11 @@
-AC_INIT(clutter-cairo/clutter-cairomm-config.h.in)
+AC_INIT(clutter-box2d/clutter-box2dmm-config.h.in)
 
 #########################################################################
 #  Version and initialization
 #########################################################################
-CLUTTER_CAIROMM_MAJOR_VERSION=0
-CLUTTER_CAIROMM_MINOR_VERSION=7
-CLUTTER_CAIROMM_MICRO_VERSION=3
+CLUTTER_BOX2DMM_MAJOR_VERSION=0
+CLUTTER_BOX2DMM_MINOR_VERSION=7
+CLUTTER_BOX2DMM_MICRO_VERSION=2
 
 #
 # +1 : ? : +1  == new interface that does not break old one
@@ -14,29 +14,29 @@
 #  ? :+1 : ?   == just some internal changes, nothing breaks but might work
 #                 better
 # CURRENT : REVISION : AGE
-CLUTTER_CAIROMM_SO_VERSION=1:0:0
+CLUTTER_BOX2DMM_SO_VERSION=1:0:0
 
-CLUTTER_CAIROMM_VERSION=$CLUTTER_CAIROMM_MAJOR_VERSION.$CLUTTER_CAIROMM_MINOR_VERSION.$CLUTTER_CAIROMM_MICRO_VERSION
-CLUTTER_CAIROMM_RELEASE=$CLUTTER_CAIROMM_MAJOR_VERSION.$CLUTTER_CAIROMM_MINOR_VERSION
-AC_DEFINE_UNQUOTED([CLUTTER_CAIROMM_MAJOR_VERSION], $CLUTTER_CAIROMM_MAJOR_VERSION, major version)
-AC_DEFINE_UNQUOTED([CLUTTER_CAIROMM_MINOR_VERSION], $CLUTTER_CAIROMM_MINOR_VERSION, minor version)
-AC_DEFINE_UNQUOTED([CLUTTER_CAIROMM_MICRO_VERSION], $CLUTTER_CAIROMM_MICRO_VERSION, micro version)
-AC_DEFINE_UNQUOTED([CLUTTERMM_VERSION], "$CLUTTER_CAIROMM_VERSION", clutter-cairomm version string)
-AC_SUBST(CLUTTER_CAIROMM_VERSION)
-AC_SUBST(CLUTTER_CAIROMM_RELEASE)
-AC_SUBST(CLUTTER_CAIROMM_SO_VERSION)
+CLUTTER_BOX2DMM_VERSION=$CLUTTER_BOX2DMM_MAJOR_VERSION.$CLUTTER_BOX2DMM_MINOR_VERSION.$CLUTTER_BOX2DMM_MICRO_VERSION
+CLUTTER_BOX2DMM_RELEASE=$CLUTTER_BOX2DMM_MAJOR_VERSION.$CLUTTER_BOX2DMM_MINOR_VERSION
+AC_DEFINE_UNQUOTED([CLUTTER_BOX2DMM_MAJOR_VERSION], $CLUTTER_BOX2DMM_MAJOR_VERSION, major version)
+AC_DEFINE_UNQUOTED([CLUTTER_BOX2DMM_MINOR_VERSION], $CLUTTER_BOX2DMM_MINOR_VERSION, minor version)
+AC_DEFINE_UNQUOTED([CLUTTER_BOX2DMM_MICRO_VERSION], $CLUTTER_BOX2DMM_MICRO_VERSION, micro version)
+AC_DEFINE_UNQUOTED([CLUTTERMM_VERSION], "$CLUTTER_BOX2DMM_VERSION", clutter-box2dmm version string)
+AC_SUBST(CLUTTER_BOX2DMM_VERSION)
+AC_SUBST(CLUTTER_BOX2DMM_RELEASE)
+AC_SUBST(CLUTTER_BOX2DMM_SO_VERSION)
 
 AC_CONFIG_AUX_DIR(scripts)
 
 dnl For automake.
-VERSION=$CLUTTER_CAIROMM_VERSION
-PACKAGE=clutter-cairomm
+VERSION=$CLUTTER_BOX2DMM_VERSION
+PACKAGE=clutter-box2dmm
 
 dnl Initialize automake stuff
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 
 dnl Specify a configuration file (no autoheader)
-AM_CONFIG_HEADER(clutter-cairo/clutter-cairomm-config.h)
+AM_CONFIG_HEADER(clutter-box2d/clutter-box2dmm-config.h)
 AM_MAINTAINER_MODE
 AL_ACLOCAL_INCLUDE(scripts)
 
@@ -71,10 +71,9 @@
 #  Dependancy checks
 #########################################################################
 
-PKG_CHECK_MODULES(CLUTTER_CAIROMM,
+PKG_CHECK_MODULES(CLUTTER_BOX2DMM,
                   [cluttermm-0.8
-                   clutter-cairo-0.8
-                   cairomm-1.0])
+                   clutter-box2d-0.8])
 
 
 # the API version of the library.  Libraries and pkg-config files will have this
@@ -102,11 +101,11 @@
 AC_OUTPUT([
   Makefile
 
-  clutter-cairo/Makefile
-  clutter-cairo/clutter-cairomm-$API_VER.pc:clutter-cairo/clutter-cairomm.pc.in
-  clutter-cairo/src/Makefile
-  clutter-cairo/clutter-cairomm/Makefile
-  clutter-cairo/clutter-cairomm/private/Makefile
+  clutter-box2d/Makefile
+  clutter-box2d/clutter-box2dmm-$API_VER.pc:clutter-box2d/clutter-box2dmm.pc.in
+  clutter-box2d/src/Makefile
+  clutter-box2d/clutter-box2dmm/Makefile
+  clutter-box2d/clutter-box2dmm/private/Makefile
 
   tools/Makefile
     tools/extra_defs_gen/Makefile
@@ -119,6 +118,5 @@
     docs/reference/Doxyfile
 
   examples/Makefile
-  tests/Makefile
 ])
 :

Modified: clutter-box2dmm/trunk/docs/reference/Doxyfile.in
==============================================================================
--- /clutter-cairomm/trunk/docs/reference/Doxyfile.in	(original)
+++ clutter-box2dmm/trunk/docs/reference/Doxyfile.in	Fri Jul 25 09:53:50 2008
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = clutter-cairomm
-PROJECT_NUMBER         = @CLUTTER_CAIROMM_VERSION@
+PROJECT_NUMBER         = @CLUTTER_BOX2DMM_VERSION@
 OUTPUT_DIRECTORY       = 
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English

Modified: clutter-box2dmm/trunk/examples/Makefile.am
==============================================================================
--- clutter-box2dmm/trunk/examples/Makefile.am	(original)
+++ clutter-box2dmm/trunk/examples/Makefile.am	Fri Jul 25 09:53:50 2008
@@ -1,13 +1,3 @@
 SUBDIRS = 
 
-include Makefile.am_fragment
-
-noinst_PROGRAMS = actors flowers simple-cairo effect
-actors_SOURCES = test-actors.cc
-flowers_SOURCES = flowers.cc
-simple_cairo_SOURCES = simple-cairo.cc
-effect_SOURCES = effect.cc
-#boxes_SOURCES = test-boxes.cc
-
-EXTRA_DIST = actor.png
 

Modified: clutter-box2dmm/trunk/examples/Makefile.am_fragment
==============================================================================
--- clutter-box2dmm/trunk/examples/Makefile.am_fragment	(original)
+++ clutter-box2dmm/trunk/examples/Makefile.am_fragment	Fri Jul 25 09:53:50 2008
@@ -1,8 +1,8 @@
-local_clutter_cairomm_libs = $(top_builddir)/clutter-cairo/clutter-cairomm/libclutter-cairomm-$(API_VER).la
+local_clutter_cairomm_libs = $(top_builddir)/clutter-box2d/clutter-box2dmm/libclutter-box2dmm-$(API_VER).la
 
 LIBS  = $(CLUTTER_CAIROMM_LIBS) $(local_clutter_cairomm_libs)
 
-all_includes = -I$(top_builddir)/clutter-cairo -I$(top_srcdir)/clutter-cairo \
+all_includes = -I$(top_builddir)/clutter-box2d -I$(top_srcdir)/clutter-box2d \
               $(CLUTTER_CAIROMM_CFLAGS)
 
 DEFS = @DEFS@

Modified: clutter-box2dmm/trunk/tools/extra_defs_gen/Makefile.am
==============================================================================
--- clutter-box2dmm/trunk/tools/extra_defs_gen/Makefile.am	(original)
+++ clutter-box2dmm/trunk/tools/extra_defs_gen/Makefile.am	Fri Jul 25 09:53:50 2008
@@ -3,8 +3,8 @@
 
 LIBS = -lglibmm_generate_extra_defs-2.4
 
-noinst_PROGRAMS = generate_extra_defs_clutter_cairo
-generate_extra_defs_clutter_cairo_SOURCES = generate_defs_clutter_cairo.cc
+noinst_PROGRAMS = generate_extra_defs_clutter_box2d
+generate_extra_defs_clutter_box2d_SOURCES = generate_defs_clutter_box2d.cc
 
-generate_extra_defs_clutter_cairo_CXXFLAGS = $(CLUTTER_CAIROMM_CFLAGS)
-generate_extra_defs_clutter_cairo_LDADD = $(CLUTTER_CAIROMM_LIBS)
+generate_extra_defs_clutter_box2d_CXXFLAGS = $(CLUTTER_BOX2DMM_CFLAGS)
+generate_extra_defs_clutter_box2d_LDADD = $(CLUTTER_BOX2DMM_LIBS)

Copied: clutter-box2dmm/trunk/tools/extra_defs_gen/generate_defs_clutter_box2d.cc (from r1630, /clutter-box2dmm/trunk/tools/extra_defs_gen/generate_defs_clutter_cairo.cc)
==============================================================================
--- /clutter-box2dmm/trunk/tools/extra_defs_gen/generate_defs_clutter_cairo.cc	(original)
+++ clutter-box2dmm/trunk/tools/extra_defs_gen/generate_defs_clutter_box2d.cc	Fri Jul 25 09:53:50 2008
@@ -17,7 +17,7 @@
 
 #include "glibmm_generate_extra_defs/generate_extra_defs.h"
 #include <clutter/clutter.h>
-#include <clutter-cairo/clutter-cairo.h>
+#include <clutter-box2d/clutter-box2d.h>
 #include <iostream>
 
 
@@ -26,7 +26,7 @@
   clutter_init(&argc, &argv) ;
 
   std::cout 
-    << get_defs(CLUTTER_TYPE_CAIRO)
+    << get_defs(CLUTTER_TYPE_BOX2D)
     ;
 
   return 0;

Modified: clutter-box2dmm/trunk/tools/m4/Makefile.am
==============================================================================
--- clutter-box2dmm/trunk/tools/m4/Makefile.am	(original)
+++ clutter-box2dmm/trunk/tools/m4/Makefile.am	Fri Jul 25 09:53:50 2008
@@ -5,5 +5,5 @@
 
 # Install the .m4, files:
 
-tools_m4_includedir = $(libdir)/cluttermm-$(API_VER)/proc/m4
+tools_m4_includedir = $(libdir)/clutter-box2dmm-$(API_VER)/proc/m4
 tools_m4_include_HEADERS = $(files_tools_m4)

Modified: clutter-box2dmm/trunk/tools/m4/Makefile_list_of_sources.am_fragment
==============================================================================
--- clutter-box2dmm/trunk/tools/m4/Makefile_list_of_sources.am_fragment	(original)
+++ clutter-box2dmm/trunk/tools/m4/Makefile_list_of_sources.am_fragment	Fri Jul 25 09:53:50 2008
@@ -1 +1 @@
-files_tools_m4 = convert.m4 convert_cluttermm.m4
+files_tools_m4 = convert.m4 convert_clutter-box2dmm.m4

Modified: clutter-box2dmm/trunk/tools/m4/convert.m4
==============================================================================
--- clutter-box2dmm/trunk/tools/m4/convert.m4	(original)
+++ clutter-box2dmm/trunk/tools/m4/convert.m4	Fri Jul 25 09:53:50 2008
@@ -3,4 +3,4 @@
 # Override of the file of the same name in gtkmm.
 
 include(convert_gtkmm.m4)
-include(convert_cluttermm.m4)
+include(convert_clutter-box2dmm.m4)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]