Author: pdewacht-guest Date: 2009-02-18 23:07:11 +0000 (Wed, 18 Feb 2009) New Revision: 8883
Added: packages/trunk/mu-cade/debian/patches/ode.patch Modified: packages/trunk/mu-cade/debian/changelog packages/trunk/mu-cade/debian/control packages/trunk/mu-cade/debian/patches/series Log: patched to work with ode ode 2:0.10.1-1 (untested!) Modified: packages/trunk/mu-cade/debian/changelog =================================================================== --- packages/trunk/mu-cade/debian/changelog 2009-02-18 23:06:30 UTC (rev 8882) +++ packages/trunk/mu-cade/debian/changelog 2009-02-18 23:07:11 UTC (rev 8883) @@ -7,6 +7,10 @@ [ Ansgar Burchardt ] * Remove deprecated Encoding key from .desktop file + [ Peter De Wachter ] + * Patched to work with ode 2:0.10.1-1. (UNTESTED!) + * Fixed Makefile clean target. + -- Ansgar Burchardt <[email protected]> Fri, 29 Feb 2008 01:21:17 +0100 mu-cade (0.11.dfsg1-2) unstable; urgency=low Modified: packages/trunk/mu-cade/debian/control =================================================================== --- packages/trunk/mu-cade/debian/control 2009-02-18 23:06:30 UTC (rev 8882) +++ packages/trunk/mu-cade/debian/control 2009-02-18 23:07:11 UTC (rev 8883) @@ -5,7 +5,7 @@ Uploaders: Miriam Ruiz <[email protected]>, Peter De Wachter <[email protected]>, Barry deFreese <[email protected]> Build-Depends: debhelper (>= 5), quilt, gdc, libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev, - libsdl1.2-dev, libsdl-mixer1.2-dev, libbulletml-dev, libode0-dev + libsdl1.2-dev, libsdl-mixer1.2-dev, libbulletml-dev, libode-dev Standards-Version: 3.7.3 Homepage: http://www.asahi-net.or.jp/~cs8k-cyu/windows/mcd_e.html Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/mu-cade/ Added: packages/trunk/mu-cade/debian/patches/ode.patch =================================================================== --- packages/trunk/mu-cade/debian/patches/ode.patch (rev 0) +++ packages/trunk/mu-cade/debian/patches/ode.patch 2009-02-18 23:07:11 UTC (rev 8883) @@ -0,0 +1,96 @@ +# Copyright (C) 2009 Peter De Wachter <[email protected]> +# Distributed under the same license as the game. See debian/copyright. + +This is an attempt to make mu-cade compatible with libode 2:0.10.1-1 + +--- a/import/ode/common.d ++++ b/import/ode/common.d +@@ -69,8 +69,8 @@ + + /* floating point data type, vector, matrix and quaternion types */ + +-//alias double dReal; +-alias float dReal; ++alias double dReal; ++//alias float dReal; + + /* round an integer up to a multiple of 4, except that 0 and 1 are unmodified + * (used to compute matrix leading dimensions) +@@ -256,6 +256,7 @@ + dParamSuspensionCFM, + + #define D_ALL_PARAM_NAMES_X(start,x) \ ++ dParamGroup ## x = start, \ + /* parameters for limits and motors */ \ + dParamLoStop ## x = start, \ + dParamHiStop ## x, \ +@@ -272,6 +273,8 @@ + + enum { + D_ALL_PARAM_NAMES(0) ++ dParamsInGroup, ++ D_ALL_PARAM_NAMES_X(0x000,1) + D_ALL_PARAM_NAMES_X(0x100,2) + D_ALL_PARAM_NAMES_X(0x200,3) + +--- a/import/ode/collision.d ++++ b/import/ode/collision.d +@@ -89,6 +89,7 @@ + dFirstSpaceClass, + dSimpleSpaceClass = dFirstSpaceClass, + dHashSpaceClass, ++ dSweepAndPruneSpaceClass, + dQuadTreeSpaceClass, + dLastSpaceClass = dQuadTreeSpaceClass, + +@@ -155,6 +156,7 @@ + dMatrix3 R2, dVector3 side2); + + void dInfiniteAABB (dGeomID geom, dReal aabb[6]); ++void dInitODE(); + void dCloseODE(); + + /* ************************************************************************ */ +--- a/import/ode/mass.d ++++ b/import/ode/mass.d +@@ -62,6 +62,6 @@ + + struct dMass { + dReal mass; +- dVector4 c; ++ dVector3 c; + dMatrix3 I; + }; +--- a/import/ode/contact.d ++++ b/import/ode/contact.d +@@ -33,8 +33,9 @@ + dContactSoftCFM = 0x010, + dContactMotion1 = 0x020, + dContactMotion2 = 0x040, +- dContactSlip1 = 0x080, +- dContactSlip2 = 0x100, ++ dContactMotionN = 0x080, ++ dContactSlip1 = 0x100, ++ dContactSlip2 = 0x200, + + dContactApprox0 = 0x0000, + dContactApprox1_1 = 0x1000, +@@ -54,7 +55,7 @@ + dReal bounce_vel; + dReal soft_erp; + dReal soft_cfm; +- dReal motion1,motion2; ++ dReal motion1,motion2,motionN; + dReal slip1,slip2; + }; + +--- a/src/abagames/util/ode/world.d ++++ b/src/abagames/util/ode/world.d +@@ -41,6 +41,7 @@ + bool initialized = false; + + public void init() { ++ dInitODE(); + world = dWorldCreate(); + dWorldSetContactMaxCorrectingVel(world, CONTACT_MAX_CORRECTING_VEL); + dWorldSetContactSurfaceLayer (world, CONTACT_SURFACE_LAYER); Modified: packages/trunk/mu-cade/debian/patches/series =================================================================== --- packages/trunk/mu-cade/debian/patches/series 2009-02-18 23:06:30 UTC (rev 8882) +++ packages/trunk/mu-cade/debian/patches/series 2009-02-18 23:07:11 UTC (rev 8883) @@ -6,3 +6,4 @@ makefile.patch gdc-0.24-semantics-for-version.patch fullscreen-option.patch +ode.patch _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
