← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/blender/intrepid-updates

« back to all changes in this revision

Viewing changes to source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h

  • Committer: Bazaar Package Importer
  • Author(s): Cyril Brulebois
  • Date: 2008-08-08 02:45:40 UTC
  • mfrom: (12.1.14 intrepid)
  • Revision ID: james.westby@ubuntu.com-20080808024540-kkjp7ekfivzhuw3l
Tags: 2.46+dfsg-4
http://bugs.debian.org/492280
* Fix python syntax warning in import_dxf.py, which led to nasty output
  in installation/upgrade logs during byte-compilation, using a patch
  provided by the script author (Closes: #492280):
   - debian/patches/45_fix_python_syntax_warning

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
1
1
/**
2
 
 * $Id: DummyPhysicsEnvironment.h,v 1.11 2006/01/30 20:33:58 erwin Exp $
 
2
 * $Id: DummyPhysicsEnvironment.h 14444 2008-04-16 22:40:48Z hos $
3
3
 *
4
 
 * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
 
4
 * ***** BEGIN GPL LICENSE BLOCK *****
5
5
 *
6
6
 * This program is free software; you can redistribute it and/or
7
7
 * modify it under the terms of the GNU General Public License
8
8
 * as published by the Free Software Foundation; either version 2
9
 
 * of the License, or (at your option) any later version. The Blender
10
 
 * Foundation also sells licenses for use in proprietary software under
11
 
 * the Blender License.  See http://www.blender.org/BL/ for information
12
 
 * about this.
 
9
 * of the License, or (at your option) any later version.
13
10
 *
14
11
 * This program is distributed in the hope that it will be useful,
15
12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
27
24
 *
28
25
 * Contributor(s): none yet.
29
26
 *
30
 
 * ***** END GPL/BL DUAL LICENSE BLOCK *****
 
27
 * ***** END GPL LICENSE BLOCK *****
31
28
 */
32
29
#ifndef _DUMMYPHYSICSENVIRONMENT
33
30
#define _DUMMYPHYSICSENVIRONMENT
59
56
 
60
57
        virtual int                     createConstraint(class PHY_IPhysicsController* ctrl,class PHY_IPhysicsController* ctrl2,PHY_ConstraintType type,
61
58
                        float pivotX,float pivotY,float pivotZ,
62
 
                        float axisX,float axisY,float axisZ);
 
59
                        float axisX,float axisY,float axisZ,
 
60
                        float axis1X=0,float axis1Y=0,float axis1Z=0,
 
61
                        float axis2X=0,float axis2Y=0,float axis2Z=0
 
62
                        );
63
63
 
64
64
        virtual void            removeConstraint(int    constraintid);
65
65
 
83
83
                virtual PHY_IPhysicsController* CreateSphereController(float radius,const PHY__Vector3& position) {return 0;}
84
84
                virtual PHY_IPhysicsController* CreateConeController(float coneradius,float coneheight) { return 0;}
85
85
 
 
86
                virtual void    setConstraintParam(int constraintId,int param,float value,float value1)
 
87
                {
 
88
                }
86
89
 
87
90
};
88
91