Joseph Gilbert
b89035906d
- also included is some fixes for preprocessor inclues and some clean up of the previous commit
-rewrite and bugfixes
----------------------------------
Here's my changelog:
-fixed Rand() so that it doesn't seed everytime and should generate better random numbers
- changed a few error return types to something more appropriate
- clean up of uninitialized variables & removal of unneccessary objects
- NMesh returns wrapped vectors now
- World returns wrapped matrices now
- Object.getEuler() and Object.getBoundingBox() return Wrapped data when data is present
- Object.getMatrix() returns wrapped data if it's worldspace, 'localspace' returns a new matrix
- Vector, Euler, Mat, Quat, call all now internally wrap object without destroying internal datablocks
- Removed memory allocation (unneeded) from all methods
- Vector's resize methods are only applicable to new vectors not wrapped data.
- Matrix(), Quat(), Euler(), Vector() now accepts ANY sequence list, including tuples, list, or a self object to copy - matrices accept multiple sequences
- Fixed Slerp() so that it now works correctly values are clamped between 0 and 1
- Euler.rotate does internal rotation now
- Slice assignment now works better for all types
- Vector * Vector and Quat * Quat are defined and return the DOT product
- Mat * Vec and Vec * Mat are defined now
- Moved #includes to .c file from headers. Also fixed prototypes in mathutils
- Added new helper functions for incref'ing to genutils
- Major cleanup of header files includes - include Mathutils.h for access to math types
- matrix.toQuat() and .toEuler() now fixed take appropriate matrix sizes
- Matrix() with no parameters now returns an identity matrix by default not a zero matrix
- printf() now prints with 6 digits instead of 4
- printf() now prints output with object descriptor
- Matrices now support [x][y] assignment (e.g. matrix[x][y] = 5.4)
- Matrix[index] = value now expectes a sequence not an integer. This will now set a ROW of the matrix through a sequence. index cannot go above the row size of the matrix.
- slice operations on matrices work with sequences now (rows of the matrix) example: mymatrix[0:2] returns a list of 2 wrapped vectors with access to the matrix data.
- slice assignment will no longer modify the data if the assignment operation fails
- fixed error in matrix * scalar multiplication
- euler.toMatrix(), toQuat() no longer causes "creep" from repeated use
- Wrapped data will generate wrapped objects when toEuler(), toQuat(), toMatrix() is used
- Quats can be created with angle/axis, axis/angle
- 4x4 matrices can be multiplied by 3D vectors (by popular demand :))
- vec *quat / quat * vec is now defined
- vec.magnitude alias for vec.length
- all self, internal methods return a pointer to self now so you can do print vector.internalmethod() or vector.internalmethod().nextmethod() (no more print matrix.inverse() returning 'none')
- these methods have been deprecated (still functioning but suggested to use the corrected functionality):
* CopyVec() - replaced by Vector() functionality
* CopyMat() - replaced by Matrix() functionality
* CopyQuat() - replace by Quaternion() functionality
* CopyEuler() - replaced by Euler() functionality
* RotateEuler() - replaced by Euler.rotate() funtionality
* MatMultVec() - replaced by matrix * vector
* VecMultMat() - replaced by vector * matrix
- New struct containers references to python object data or internally allocated blender data for wrapping
* Explaination here: math structs now function as a 'simple wrapper' or a 'py_object' - data that is created on the fly will now be a 'py_object' with its memory managed by python
* otherwise if the data is returned by blender's G.main then the math object is a 'simple wrapper' and data can be accessed directly from the struct just like other python objects.
115 lines
3.8 KiB
C++
115 lines
3.8 KiB
C++
/*
|
|
* $Id$
|
|
*
|
|
* ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version. The Blender
|
|
* Foundation also sells licenses for use in proprietary software under
|
|
* the Blender License. See http://www.blender.org/BL/ for information
|
|
* about this.
|
|
*
|
|
* This program 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 General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
|
* All rights reserved.
|
|
*
|
|
* This is a new part of Blender.
|
|
*
|
|
* Contributor(s): Michel Selten, Willian P. Germano, Alex Mole, Joseph Gilbert
|
|
*
|
|
* ***** END GPL/BL DUAL LICENSE BLOCK *****
|
|
*/
|
|
|
|
#ifndef EXPP_gen_utils_h
|
|
#define EXPP_gen_utils_h
|
|
|
|
#include <Python.h>
|
|
#include "compile.h"
|
|
#include "eval.h" /* for PyEval_GetLocals */
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include "BKE_global.h"
|
|
#include "BKE_main.h"
|
|
#include "BPI_script.h"
|
|
|
|
#include "DNA_ID.h"
|
|
#include "DNA_object_types.h"
|
|
#include "DNA_material_types.h"
|
|
#include "DNA_scriptlink_types.h"
|
|
#include "DNA_listBase.h"
|
|
|
|
#define Py_PI 3.14159265358979323846
|
|
#define Py_WRAP 1024
|
|
#define Py_NEW 2048
|
|
|
|
/*
|
|
Py_RETURN_NONE
|
|
Python 2.4 macro.
|
|
defined here until we switch to 2.4
|
|
*/
|
|
#ifndef Py_RETURN_NONE
|
|
#define Py_RETURN_NONE Py_INCREF( Py_None ); return Py_None
|
|
#endif
|
|
|
|
int StringEqual( const char *string1, const char *string2 );
|
|
char *GetIdName( ID * id );
|
|
ID *GetIdFromList( ListBase * list, char *name );
|
|
|
|
PyObject *PythonReturnErrorObject( PyObject * type, char *error_msg );
|
|
PyObject *PythonIncRef( PyObject * object );
|
|
|
|
char *event_to_name( short event );
|
|
|
|
float EXPP_ClampFloat( float value, float min, float max );
|
|
int EXPP_ClampInt( int value, int min, int max );
|
|
|
|
void EXPP_incr2( PyObject * ob1, PyObject * ob2 );
|
|
void EXPP_incr3( PyObject * ob1, PyObject * ob2, PyObject * ob3 );
|
|
void EXPP_decr2( PyObject * ob1, PyObject * ob2 );
|
|
void EXPP_decr3( PyObject * ob1, PyObject * ob2, PyObject * ob3 );
|
|
PyObject *EXPP_incr_ret( PyObject * object );
|
|
PyObject *EXPP_incr_ret_True(void);
|
|
PyObject *EXPP_incr_ret_False(void);
|
|
PyObject *EXPP_ReturnPyObjError( PyObject * type, char *error_msg );
|
|
int EXPP_ReturnIntError( PyObject * type, char *error_msg );
|
|
|
|
int EXPP_check_sequence_consistency( PyObject * seq, PyTypeObject * against );
|
|
PyObject *EXPP_tuple_repr( PyObject * self, int size );
|
|
|
|
/* mapping utilities - see Texture.c for an example of how to use these */
|
|
typedef struct {
|
|
const char *sval;
|
|
int ival;
|
|
} EXPP_map_pair;
|
|
|
|
/* maps must end with a pair that has NULL as sval */
|
|
int EXPP_map_getIntVal( const EXPP_map_pair * map,
|
|
const char *sval, int *ival );
|
|
int EXPP_map_case_getIntVal( const EXPP_map_pair * map,
|
|
const char *sval, int *ival );
|
|
int EXPP_map_getShortVal( const EXPP_map_pair * map,
|
|
const char *sval, short *ival );
|
|
int EXPP_map_getStrVal( const EXPP_map_pair * map,
|
|
int ival, const char **sval );
|
|
|
|
/* scriplinks-related: */
|
|
PyObject *EXPP_getScriptLinks(ScriptLink *slink, PyObject *args, int is_scene);
|
|
PyObject *EXPP_addScriptLink(ScriptLink *slink, PyObject *args, int is_scene);
|
|
PyObject *EXPP_clearScriptLinks(ScriptLink *slink, PyObject *args);
|
|
|
|
/* this queues redraws if we're not in background mode: */
|
|
void EXPP_allqueue(unsigned short event, short val);
|
|
|
|
#endif /* EXPP_gen_utils_h */
|