big warning hunt commit
lot of casts, added prototypes, missing includes and some true errors
This commit is contained in:
Jean-Luc Peurière
parent
77d44e88e9
commit
c78e44cdc5
@ -393,7 +393,9 @@ SND_WaveSlot* SND_OpenALDevice::LoadSample(const STR_String& name,
|
||||
{
|
||||
int buffer = waveslot->GetBuffer();
|
||||
void* data = NULL;
|
||||
#ifndef __APPLE__
|
||||
char loop = 'a';
|
||||
#endif
|
||||
int sampleformat, bitrate, numberofchannels;
|
||||
ALenum al_error = alGetError();
|
||||
|
||||
|
||||
@ -78,7 +78,7 @@ void BMF_BitmapFont::DrawString(char* str)
|
||||
glGetIntegerv(GL_UNPACK_ALIGNMENT, &alignment);
|
||||
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
|
||||
|
||||
while (c = (unsigned char) *str++) {
|
||||
while ( (c = (unsigned char) *str++) ) {
|
||||
BMF_CharData & cd = m_fontData->chars[c];
|
||||
|
||||
if (cd.data_offset==-1) {
|
||||
@ -101,7 +101,7 @@ int BMF_BitmapFont::GetStringWidth(char* str)
|
||||
unsigned char c;
|
||||
int length = 0;
|
||||
|
||||
while (c = (unsigned char) *str++) {
|
||||
while ( (c = (unsigned char) *str++) ) {
|
||||
length += m_fontData->chars[c].advance;
|
||||
}
|
||||
|
||||
@ -185,7 +185,7 @@ void BMF_BitmapFont::DrawStringTexture(char *str, float x, float y, float z)
|
||||
int baseLine = -(m_fontData->ymin);
|
||||
|
||||
glBegin(GL_QUADS);
|
||||
while (c = (unsigned char) *str++) {
|
||||
while ( (c = (unsigned char) *str++) ) {
|
||||
BMF_CharData & cd = m_fontData->chars[c];
|
||||
|
||||
if (cd.data_offset != -1) {
|
||||
|
||||
@ -407,7 +407,7 @@ DuplicateMesh(
|
||||
|
||||
// Run through the result and add in the triangle faces.
|
||||
|
||||
int i;
|
||||
unsigned int i;
|
||||
for (i = 0; i < triangle_indices.size(); i+=3) {
|
||||
// duplicate the face data for this face.
|
||||
o_f_data.Duplicate(i_f_data[*f_faces_it]);
|
||||
|
||||
@ -241,7 +241,7 @@ ComputeVertexNormal(
|
||||
|
||||
// average the face normals surrounding this
|
||||
// vertex and normalize
|
||||
vector<LOD_Vertex> &verts = m_mesh.VertexSet();
|
||||
// vector<LOD_Vertex> &verts = m_mesh.VertexSet(); /*unused*/
|
||||
const vector<MT_Vector3> & face_normals = m_normals.Ref();
|
||||
|
||||
vector<LOD_FaceInd> vertex_faces;
|
||||
|
||||
@ -273,7 +273,7 @@ BuildHeap(
|
||||
|
||||
std::vector<int> & heap_vector = m_heap->HeapVector();
|
||||
|
||||
for (int i = 0; i < edge_set.size(); ++i) {
|
||||
for (unsigned int i = 0; i < edge_set.size(); ++i) {
|
||||
edge_set[i].HeapPos() = i;
|
||||
heap_vector.push_back(i);
|
||||
}
|
||||
|
||||
@ -83,7 +83,11 @@ typedef enum {
|
||||
GHOST_kWindowStateNormal = 0,
|
||||
GHOST_kWindowStateMaximized,
|
||||
GHOST_kWindowStateMinimized,
|
||||
GHOST_kWindowStateFullScreen
|
||||
GHOST_kWindowStateFullScreen,
|
||||
GHOST_kWindowState8Normal = 8,
|
||||
GHOST_kWindowState8Maximized,
|
||||
GHOST_kWindowState8Minimized,
|
||||
GHOST_kWindowState8FullScreen,
|
||||
} GHOST_TWindowState;
|
||||
|
||||
|
||||
|
||||
@ -90,8 +90,8 @@ GHOST_TSuccess GHOST_DisplayManagerCarbon::getDisplaySetting(GHOST_TUns8 display
|
||||
CFArrayRef displayModes;
|
||||
CGDirectDisplayID d = m_displayIDs[display];
|
||||
displayModes = ::CGDisplayAvailableModes(d);
|
||||
CFIndex numModes = ::CFArrayGetCount(displayModes);
|
||||
GHOST_TInt32 numSettings = (GHOST_TInt32)numModes;
|
||||
//CFIndex numModes = ::CFArrayGetCount(displayModes);/*unused*/
|
||||
//GHOST_TInt32 numSettings = (GHOST_TInt32)numModes; /*unused*/
|
||||
CFDictionaryRef displayModeValues = (CFDictionaryRef)::CFArrayGetValueAtIndex(displayModes, index);
|
||||
|
||||
setting.xPixels = getValue(displayModeValues, kCGDisplayWidth);
|
||||
|
||||
@ -902,7 +902,7 @@ bool GHOST_SystemCarbon::handleMouseDown(EventRef event)
|
||||
::ZoomWindow(window, part, true);
|
||||
ghostWindow->setMac_windowState(1);
|
||||
} else { // need to force size again
|
||||
GHOST_TUns32 scr_x,scr_y;
|
||||
// GHOST_TUns32 scr_x,scr_y; /*unused*/
|
||||
Rect outAvailableRect;
|
||||
|
||||
ghostWindow->setMac_windowState(2);
|
||||
|
||||
@ -123,7 +123,7 @@ GHOST_WindowCarbon::GHOST_WindowCarbon(
|
||||
|
||||
if (state != GHOST_kWindowStateFullScreen) {
|
||||
Rect bnds = { top, left, top+height, left+width };
|
||||
Boolean visible = (state == GHOST_kWindowStateNormal) || (state == GHOST_kWindowStateMaximized);
|
||||
// Boolean visible = (state == GHOST_kWindowStateNormal) || (state == GHOST_kWindowStateMaximized); /*unused*/
|
||||
gen2mac(title, title255);
|
||||
|
||||
err = ::CreateNewWindow( kDocumentWindowClass,
|
||||
@ -648,6 +648,7 @@ GHOST_TSuccess GHOST_WindowCarbon::setWindowCursorShape(GHOST_TStandardCursor sh
|
||||
return GHOST_kSuccess;
|
||||
}
|
||||
|
||||
#if 0
|
||||
/** Reverse the bits in a GHOST_TUns8 */
|
||||
static GHOST_TUns8 uns8ReverseBits(GHOST_TUns8 ch)
|
||||
{
|
||||
@ -656,6 +657,8 @@ static GHOST_TUns8 uns8ReverseBits(GHOST_TUns8 ch)
|
||||
ch= ((ch>>4)&0x0F) | ((ch<<4)&0xF0);
|
||||
return ch;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
/** Reverse the bits in a GHOST_TUns16 */
|
||||
static GHOST_TUns16 uns16ReverseBits(GHOST_TUns16 shrt)
|
||||
@ -698,7 +701,7 @@ GHOST_TSuccess GHOST_WindowCarbon::setWindowCustomCursorShape(GHOST_TUns8 *bitma
|
||||
GHOST_TSuccess GHOST_WindowCarbon::setWindowCustomCursorShape(GHOST_TUns8 bitmap[16][2],
|
||||
GHOST_TUns8 mask[16][2], int hotX, int hotY)
|
||||
{
|
||||
setWindowCustomCursorShape((GHOST_TUns8*)bitmap, (GHOST_TUns8*) mask, 16, 16, hotX, hotY, 0, 1);
|
||||
return setWindowCustomCursorShape((GHOST_TUns8*)bitmap, (GHOST_TUns8*) mask, 16, 16, hotX, hotY, 0, 1);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -253,7 +253,7 @@ UpdateChain(
|
||||
|
||||
vector<IK_QSegment> &segs = chain.Segments();
|
||||
|
||||
int seg_ind = 0;
|
||||
unsigned int seg_ind = 0;
|
||||
for (seg_ind = 0;seg_ind < segs.size(); seg_ind++) {
|
||||
|
||||
MT_Vector3 dq;
|
||||
|
||||
@ -80,7 +80,7 @@ IK_LoadChain(
|
||||
if (intern_cpp == NULL) return 0;
|
||||
|
||||
std::vector<IK_QSegment> & segs = intern_cpp->Chain().Segments();
|
||||
if (segs.size() != num_segs) {
|
||||
if (segs.size() != (unsigned int) num_segs) {
|
||||
segs = std::vector<IK_QSegment>(num_segs);
|
||||
}
|
||||
|
||||
|
||||
6
intern/opennl/extern/ONL_opennl.h
vendored
6
intern/opennl/extern/ONL_opennl.h
vendored
@ -109,10 +109,10 @@ typedef void* NLContext ;
|
||||
/*
|
||||
* Contexts
|
||||
*/
|
||||
NLContext nlNewContext() ;
|
||||
NLContext nlNewContext(void) ;
|
||||
void nlDeleteContext(NLContext context) ;
|
||||
void nlMakeCurrent(NLContext context) ;
|
||||
NLContext nlGetCurrent() ;
|
||||
NLContext nlGetCurrent(void) ;
|
||||
|
||||
/*
|
||||
* State set/get
|
||||
@ -153,7 +153,7 @@ typedef void* NLContext ;
|
||||
* Solve
|
||||
*/
|
||||
|
||||
NLboolean nlSolve() ;
|
||||
NLboolean nlSolve(void) ;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@ -416,7 +416,7 @@ static void __nlSparseMatrix_mult_cols(
|
||||
/************************************************************************************/
|
||||
/* SparseMatrix x Vector routines, main driver routine */
|
||||
|
||||
void __nlSparseMatrixMult(__NLSparseMatrix* A, NLfloat* x, NLfloat* y) {
|
||||
static void __nlSparseMatrixMult(__NLSparseMatrix* A, NLfloat* x, NLfloat* y) {
|
||||
if(A->storage & __NL_ROWS) {
|
||||
if(A->storage & __NL_SYMMETRIC) {
|
||||
__nlSparseMatrix_mult_rows_symmetric(A, x, y) ;
|
||||
@ -481,12 +481,12 @@ typedef struct {
|
||||
|
||||
static __NLContext* __nlCurrentContext = NULL ;
|
||||
|
||||
void __nlMatrixVectorProd_default(NLfloat* x, NLfloat* y) {
|
||||
static void __nlMatrixVectorProd_default(NLfloat* x, NLfloat* y) {
|
||||
__nlSparseMatrixMult(&(__nlCurrentContext->M), x, y) ;
|
||||
}
|
||||
|
||||
|
||||
NLContext nlNewContext() {
|
||||
NLContext nlNewContext(void) {
|
||||
__NLContext* result = __NL_NEW(__NLContext) ;
|
||||
result->state = __NL_STATE_INITIAL ;
|
||||
result->row_scaling = 1.0 ;
|
||||
@ -533,15 +533,15 @@ void nlMakeCurrent(NLContext context) {
|
||||
__nlCurrentContext = (__NLContext*)(context) ;
|
||||
}
|
||||
|
||||
NLContext nlGetCurrent() {
|
||||
NLContext nlGetCurrent(void) {
|
||||
return __nlCurrentContext ;
|
||||
}
|
||||
|
||||
void __nlCheckState(NLenum state) {
|
||||
static void __nlCheckState(NLenum state) {
|
||||
__nl_assert(__nlCurrentContext->state == state) ;
|
||||
}
|
||||
|
||||
void __nlTransition(NLenum from_state, NLenum to_state) {
|
||||
static void __nlTransition(NLenum from_state, NLenum to_state) {
|
||||
__nlCheckState(from_state) ;
|
||||
__nlCurrentContext->state = to_state ;
|
||||
}
|
||||
@ -737,7 +737,7 @@ NLboolean nlVariableIsLocked(NLuint index) {
|
||||
/************************************************************************************/
|
||||
/* System construction */
|
||||
|
||||
void __nlVariablesToVector() {
|
||||
static void __nlVariablesToVector() {
|
||||
NLuint i ;
|
||||
__nl_assert(__nlCurrentContext->alloc_x) ;
|
||||
__nl_assert(__nlCurrentContext->alloc_variable) ;
|
||||
@ -750,7 +750,7 @@ void __nlVariablesToVector() {
|
||||
}
|
||||
}
|
||||
|
||||
void __nlVectorToVariables() {
|
||||
static void __nlVectorToVariables() {
|
||||
NLuint i ;
|
||||
__nl_assert(__nlCurrentContext->alloc_x) ;
|
||||
__nl_assert(__nlCurrentContext->alloc_variable) ;
|
||||
@ -764,7 +764,7 @@ void __nlVectorToVariables() {
|
||||
}
|
||||
|
||||
|
||||
void __nlBeginSystem() {
|
||||
static void __nlBeginSystem() {
|
||||
__nlTransition(__NL_STATE_INITIAL, __NL_STATE_SYSTEM) ;
|
||||
__nl_assert(__nlCurrentContext->nb_variables > 0) ;
|
||||
__nlCurrentContext->variable = __NL_NEW_ARRAY(
|
||||
@ -773,11 +773,11 @@ void __nlBeginSystem() {
|
||||
__nlCurrentContext->alloc_variable = NL_TRUE ;
|
||||
}
|
||||
|
||||
void __nlEndSystem() {
|
||||
static void __nlEndSystem() {
|
||||
__nlTransition(__NL_STATE_MATRIX_CONSTRUCTED, __NL_STATE_SYSTEM_CONSTRUCTED) ;
|
||||
}
|
||||
|
||||
void __nlBeginMatrix() {
|
||||
static void __nlBeginMatrix() {
|
||||
NLuint i ;
|
||||
NLuint n = 0 ;
|
||||
NLenum storage = __NL_ROWS ;
|
||||
@ -828,7 +828,7 @@ void __nlBeginMatrix() {
|
||||
__nlCurrentContext->current_row = 0 ;
|
||||
}
|
||||
|
||||
void __nlEndMatrix() {
|
||||
static void __nlEndMatrix() {
|
||||
__nlTransition(__NL_STATE_MATRIX, __NL_STATE_MATRIX_CONSTRUCTED) ;
|
||||
|
||||
__nlRowColumnDestroy(&__nlCurrentContext->af) ;
|
||||
@ -846,14 +846,14 @@ void __nlEndMatrix() {
|
||||
}
|
||||
}
|
||||
|
||||
void __nlBeginRow() {
|
||||
static void __nlBeginRow() {
|
||||
__nlTransition(__NL_STATE_MATRIX, __NL_STATE_ROW) ;
|
||||
__nlRowColumnZero(&__nlCurrentContext->af) ;
|
||||
__nlRowColumnZero(&__nlCurrentContext->al) ;
|
||||
__nlRowColumnZero(&__nlCurrentContext->xl) ;
|
||||
}
|
||||
|
||||
void __nlScaleRow(NLfloat s) {
|
||||
static void __nlScaleRow(NLfloat s) {
|
||||
__NLRowColumn* af = &__nlCurrentContext->af ;
|
||||
__NLRowColumn* al = &__nlCurrentContext->al ;
|
||||
NLuint nf = af->size ;
|
||||
@ -868,7 +868,7 @@ void __nlScaleRow(NLfloat s) {
|
||||
__nlCurrentContext->right_hand_side *= s ;
|
||||
}
|
||||
|
||||
void __nlNormalizeRow(NLfloat weight) {
|
||||
static void __nlNormalizeRow(NLfloat weight) {
|
||||
__NLRowColumn* af = &__nlCurrentContext->af ;
|
||||
__NLRowColumn* al = &__nlCurrentContext->al ;
|
||||
NLuint nf = af->size ;
|
||||
@ -885,7 +885,7 @@ void __nlNormalizeRow(NLfloat weight) {
|
||||
__nlScaleRow(weight / norm) ;
|
||||
}
|
||||
|
||||
void __nlEndRow() {
|
||||
static void __nlEndRow() {
|
||||
__NLRowColumn* af = &__nlCurrentContext->af ;
|
||||
__NLRowColumn* al = &__nlCurrentContext->al ;
|
||||
__NLRowColumn* xl = &__nlCurrentContext->xl ;
|
||||
@ -1137,7 +1137,7 @@ static NLboolean __nlSolve_SUPERLU( NLboolean do_perm) {
|
||||
/************************************************************************/
|
||||
/* nlSolve() driver routine */
|
||||
|
||||
NLboolean nlSolve() {
|
||||
NLboolean nlSolve(void) {
|
||||
NLboolean result = NL_TRUE ;
|
||||
|
||||
__nlCheckState(__NL_STATE_SYSTEM_CONSTRUCTED) ;
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
extern int genmmd_(int *, int *, int *, int *, int *, int *, int *,
|
||||
int *, int *, int *, int *, int *);
|
||||
|
||||
void
|
||||
static void
|
||||
get_colamd(
|
||||
const int m, /* number of rows in matrix A. */
|
||||
const int n, /* number of columns in matrix A. */
|
||||
@ -47,7 +47,7 @@ get_colamd(
|
||||
SUPERLU_FREE(p);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
getata(
|
||||
const int m, /* number of rows in matrix A. */
|
||||
const int n, /* number of columns in matrix A. */
|
||||
@ -189,7 +189,7 @@ getata(
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
static void
|
||||
at_plus_a(
|
||||
const int n, /* number of columns in matrix A. */
|
||||
const int nz, /* number of nonzeros in matrix A */
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
int lsame_(char *, char *);
|
||||
|
||||
|
||||
int lsame_(char *ca, char *cb)
|
||||
{
|
||||
/* -- LAPACK auxiliary routine (version 2.0) --
|
||||
|
||||
@ -10,6 +10,10 @@
|
||||
|
||||
#include "ssp_defs.h"
|
||||
|
||||
/* prototypes --------------------------------- */
|
||||
void copy_mem_int(int, void *, void *);
|
||||
void user_bcopy(char *, char *, int);
|
||||
|
||||
|
||||
#if ( DEBUGlevel>=1 ) /* Debug malloc/free. */
|
||||
int superlu_malloc_total = 0;
|
||||
|
||||
@ -1,6 +1,12 @@
|
||||
|
||||
typedef int shortint;
|
||||
|
||||
|
||||
/* prototypes -------------------- */
|
||||
int genmmd_(int *, int *, int *, int *, int *, int *, int *,
|
||||
int *, int *, int *, int *, int *);
|
||||
|
||||
|
||||
/* *************************************************************** */
|
||||
/* *************************************************************** */
|
||||
/* **** GENMMD ..... MULTIPLE MINIMUM EXTERNAL DEGREE **** */
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
#include "ssp_defs.h"
|
||||
|
||||
int check_perm(char *, int , int *);
|
||||
|
||||
|
||||
void
|
||||
sp_preorder(superlu_options_t *options, SuperMatrix *A, int *perm_c,
|
||||
int *etree, SuperMatrix *AC)
|
||||
|
||||
@ -225,7 +225,10 @@ extern void sPrint_SuperNode_Matrix(char *, SuperMatrix *);
|
||||
extern void sPrint_Dense_Matrix(char *, SuperMatrix *);
|
||||
extern void print_lu_col(char *, int, int, int *, GlobalLU_t *);
|
||||
extern void check_tempv(int, float *);
|
||||
extern int print_int_vec(char *what, int n, int *vec);
|
||||
|
||||
extern int sp_symetree(int *acolst, int *acolend, int *arow, int n, int *parent);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -11,6 +11,8 @@
|
||||
/* We want this flag, safer than putting in build system */
|
||||
#define NO_TIMER
|
||||
|
||||
double SuperLU_timer_ ();
|
||||
|
||||
#ifdef SUN
|
||||
/*
|
||||
* It uses the system call gethrtime(3C), which is accurate to
|
||||
|
||||
@ -22,6 +22,14 @@
|
||||
#include <math.h>
|
||||
#include "ssp_defs.h"
|
||||
|
||||
/* prototypes */
|
||||
void sprint_lu_col(char *msg, int jcol, int pivrow, int *xprune, GlobalLU_t *Glu);
|
||||
void scheck_tempv(int n, float *tempv);
|
||||
void sPrintPerf(SuperMatrix *, SuperMatrix *, mem_usage_t *,float , float ,
|
||||
float *, float *, char *, SuperLUStat_t *);
|
||||
int print_float_vec(char *what, int n, float *vec);
|
||||
/* ********** */
|
||||
|
||||
void
|
||||
sCreate_CompCol_Matrix(SuperMatrix *A, int m, int n, int nnz,
|
||||
float *nzval, int *rowind, int *colptr,
|
||||
|
||||
@ -22,6 +22,12 @@
|
||||
#include "ssp_defs.h"
|
||||
#include "util.h"
|
||||
|
||||
/* prototypes */
|
||||
flops_t LUFactFlops(SuperLUStat_t *stat);
|
||||
flops_t LUSolveFlops(SuperLUStat_t *stat);
|
||||
float SpaSize(int n, int np, float sum_npw);
|
||||
float DenseSize(int n, float sum_nw);
|
||||
|
||||
/*
|
||||
* Global statistics variale
|
||||
*/
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
|
||||
#include <stdio.h>
|
||||
int xerbla_(char *, int *);
|
||||
|
||||
/* Subroutine */ int xerbla_(char *srname, int *info)
|
||||
{
|
||||
|
||||
@ -146,8 +146,9 @@ static void std_huff_tables (j_decompress_ptr dinfo) {
|
||||
bits_ac_chrominance, val_ac_chrominance);
|
||||
}
|
||||
|
||||
static int Decode_JPEG(unsigned char *inBuffer, unsigned char *outBuffer, int width, int height, int bufsize) {
|
||||
int rowstride, y;
|
||||
static int Decode_JPEG(unsigned char *inBuffer, unsigned char *outBuffer, unsigned int width, unsigned int height, int bufsize) {
|
||||
int rowstride;
|
||||
unsigned int y;
|
||||
struct jpeg_decompress_struct dinfo;
|
||||
struct jpeg_error_mgr jerr;
|
||||
|
||||
@ -196,7 +197,8 @@ static int Decode_JPEG(unsigned char *inBuffer, unsigned char *outBuffer, int wi
|
||||
}
|
||||
|
||||
static void Compress_JPEG(int quality, unsigned char *outbuffer, unsigned char *inBuffer, int width, int height, int bufsize) {
|
||||
int i, y, rowstride;
|
||||
int i, rowstride;
|
||||
unsigned int y;
|
||||
struct jpeg_compress_struct cinfo;
|
||||
struct jpeg_error_mgr jerr;
|
||||
unsigned char marker[60];
|
||||
|
||||
@ -88,6 +88,7 @@ void txt_find_panel (struct SpaceText *st, int again);
|
||||
void run_python_script (struct SpaceText *st);
|
||||
int jumptoline_interactive (struct SpaceText *st);
|
||||
void txt_export_to_object (struct Text *text);
|
||||
void txt_export_to_objects(struct Text *text);
|
||||
void indent_paste (struct Text *text);
|
||||
void unindent (struct Text *text);
|
||||
void comment (struct Text *text);
|
||||
@ -98,7 +99,7 @@ void comment_paste (struct Text *text, char *in_buffer);
|
||||
void uncomment_paste (struct Text *text, char *in_buffer);
|
||||
void uncomment (struct Text *text);
|
||||
|
||||
//void set_tabs (struct Text *text);
|
||||
void set_tabs (struct Text *text);
|
||||
|
||||
/* Undo opcodes */
|
||||
|
||||
|
||||
@ -67,8 +67,11 @@
|
||||
#ifndef M_PI
|
||||
#define M_PI 3.14159265358979323846
|
||||
#endif
|
||||
|
||||
/* used by object.c */
|
||||
void Mat4BlendMat4(float [][4], float [][4], float [][4], float );
|
||||
|
||||
/* Local function prototypes */
|
||||
static void constraint_target_to_mat4 (Object *ob, const char *substring, float mat[][4], float size[3], float ctime);
|
||||
|
||||
/* Functions */
|
||||
|
||||
|
||||
@ -967,7 +967,7 @@ static void read_videoscape_nurbs(char *str)
|
||||
Mat3ToEul(omat, ob->rot);
|
||||
EulToMat3(ob->rot, mat);
|
||||
Mat3Inv(imat, mat);
|
||||
Mat3MulMat3(tmat, imat, omat);
|
||||
Mat3MulMat3((float ( * )[3])tmat, imat, omat);
|
||||
|
||||
while(tot--) {
|
||||
nu= (Nurb*)MEM_callocN(sizeof(Nurb),"nu from exotic");
|
||||
|
||||
@ -297,7 +297,7 @@ void load_image(Image * ima, int flags, char *relabase, int framenum)
|
||||
}
|
||||
|
||||
|
||||
void de_interlace_ng(struct ImBuf *ibuf) /* neogeo fields */
|
||||
static void de_interlace_ng(struct ImBuf *ibuf) /* neogeo fields */
|
||||
{
|
||||
struct ImBuf * tbuf1, * tbuf2;
|
||||
|
||||
@ -325,7 +325,7 @@ void de_interlace_ng(struct ImBuf *ibuf) /* neogeo fields */
|
||||
ibuf->y /= 2;
|
||||
}
|
||||
|
||||
void de_interlace_st(struct ImBuf *ibuf) /* standard fields */
|
||||
static void de_interlace_st(struct ImBuf *ibuf) /* standard fields */
|
||||
{
|
||||
struct ImBuf * tbuf1, * tbuf2;
|
||||
|
||||
|
||||
@ -878,7 +878,7 @@ float read_ipo_poin(void *poin, int type)
|
||||
return val;
|
||||
}
|
||||
|
||||
void *give_tex_poin(Tex *tex, int adrcode, int *type )
|
||||
static void *give_tex_poin(Tex *tex, int adrcode, int *type )
|
||||
{
|
||||
void *poin=0;
|
||||
|
||||
|
||||
@ -395,7 +395,7 @@ Object *find_basis_mball(Object *basis)
|
||||
void calc_mballco(MetaElem *ml, float *vec)
|
||||
{
|
||||
if(ml->mat) {
|
||||
Mat4MulVecfl(ml->mat, vec);
|
||||
Mat4MulVecfl((float ( * )[4])ml->mat, vec);
|
||||
}
|
||||
}
|
||||
|
||||
@ -407,7 +407,7 @@ float densfunc(MetaElem *ball, float x, float y, float z)
|
||||
vec[0]= x;
|
||||
vec[1]= y;
|
||||
vec[2]= z;
|
||||
Mat4MulVecfl(ball->imat, vec);
|
||||
Mat4MulVecfl((float ( * )[4])ball->imat, vec);
|
||||
dx= vec[0];
|
||||
dy= vec[1];
|
||||
dz= vec[2];
|
||||
|
||||
@ -40,6 +40,8 @@
|
||||
#include "BKE_bad_level_calls.h"
|
||||
#include "BLI_blenlib.h"
|
||||
|
||||
#include "BKE_screen.h"
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
@ -95,6 +95,9 @@ float rescale_friction_to_framerate = 1.0f; // since unit of drag is [kg/sec] we
|
||||
|
||||
short SB_ENABLE = 0; // quick hack to switch sb integration in 3d header
|
||||
|
||||
/* local prototypes */
|
||||
void softbody_scale_time(float steptime);
|
||||
int get_scalar_from_named_vertexgroup(Object *ob, char *name, int vertID, float *target);
|
||||
|
||||
void softbody_scale_time(float steptime)
|
||||
{
|
||||
@ -243,7 +246,7 @@ void free_softbody(SoftBody *sb)
|
||||
/* ************ dynamics ********** */
|
||||
|
||||
/* aye this belongs to arith.c */
|
||||
void Vec3PlusStVec(float *v, float s, float *v1)
|
||||
static void Vec3PlusStVec(float *v, float s, float *v1)
|
||||
{
|
||||
v[0] += s*v1[0];
|
||||
v[1] += s*v1[1];
|
||||
@ -494,6 +497,7 @@ static void softbody_restore_prev_step(Object *ob)
|
||||
|
||||
|
||||
/* unused */
|
||||
#if 0
|
||||
static void softbody_apply_goal(Object *ob, float dtime)
|
||||
{
|
||||
|
||||
@ -518,6 +522,7 @@ static void softbody_apply_goal(Object *ob, float dtime)
|
||||
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static void softbody_apply_goalsnap(Object *ob)
|
||||
{
|
||||
@ -588,7 +593,7 @@ static void mesh_update_softbody(Object *ob)
|
||||
{
|
||||
Mesh *me= ob->data;
|
||||
MVert *mvert= me->mvert;
|
||||
MEdge *medge= me->medge;
|
||||
/* MEdge *medge= me->medge; */ /*unused*/
|
||||
BodyPoint *bp;
|
||||
int a;
|
||||
if(ob->soft) {
|
||||
@ -652,7 +657,7 @@ static void mesh_to_softbody(Object *ob)
|
||||
Mesh *me= ob->data;
|
||||
MVert *mvert= me->mvert;
|
||||
MEdge *medge= me->medge;
|
||||
MFace *mface= me->mface;
|
||||
/* MFace *mface= me->mface; */ /*unused*/
|
||||
BodyPoint *bp;
|
||||
BodySpring *bs;
|
||||
int a;
|
||||
|
||||
@ -58,6 +58,8 @@
|
||||
#include "DNA_scene_types.h"
|
||||
/* RPW - End */
|
||||
|
||||
#include "BKE_writeavi.h"
|
||||
|
||||
static AviMovie *avi=NULL;
|
||||
static int sframe;
|
||||
|
||||
|
||||
@ -85,7 +85,7 @@ void BLI_gsqueue_push (GSQueue *gq, void *item);
|
||||
* @param item A pointer to an appropriatly
|
||||
* sized structure (the size passed to BLI_gsqueue_new).
|
||||
*/
|
||||
void BLI_qsueue_pushback (GSQueue *gq, void *item);
|
||||
void BLI_gsqueue_pushback (GSQueue *gq, void *item);
|
||||
|
||||
/**
|
||||
* Free the queue
|
||||
|
||||
@ -228,7 +228,7 @@ unsigned int BLI_ghashutil_strhash(void *ptr) {
|
||||
unsigned int i= 0;
|
||||
unsigned char c;
|
||||
|
||||
while (c= *s++)
|
||||
while ( (c= *s++) )
|
||||
i= i*37 + c;
|
||||
|
||||
return i;
|
||||
|
||||
@ -1399,6 +1399,7 @@ void VecUpMat3(float *vec, float mat[][3], short axis)
|
||||
}
|
||||
|
||||
/* A & M Watt, Advanced animation and rendering techniques, 1992 ACM press */
|
||||
void QuatInterpolW(float *, float *, float *, float );
|
||||
|
||||
void QuatInterpolW(float *result, float *quat1, float *quat2, float t)
|
||||
{
|
||||
|
||||
@ -31,7 +31,11 @@
|
||||
*
|
||||
* ***** END GPL/BL DUAL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "../PIL_dynlib.h"
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -117,7 +121,7 @@ struct PILdynlib {
|
||||
void *handle;
|
||||
};
|
||||
|
||||
char *osxerror(int setget, const char *str, ...)
|
||||
static char *osxerror(int setget, const char *str, ...)
|
||||
{
|
||||
static char errstr[ERR_STR_LEN];
|
||||
static int err_filled = 0;
|
||||
@ -154,7 +158,7 @@ char *osxerror(int setget, const char *str, ...)
|
||||
return retval;
|
||||
}
|
||||
|
||||
void *osxdlopen(const char *path, int mode)
|
||||
static void *osxdlopen(const char *path, int mode)
|
||||
{
|
||||
void *module = 0;
|
||||
NSObjectFileImage ofi = 0;
|
||||
|
||||
@ -38,6 +38,7 @@
|
||||
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
|
||||
@ -210,7 +210,7 @@ float hashvectf[768]= {
|
||||
#define lerp(t, a, b) ((a)+(t)*((b)-(a)))
|
||||
#define npfade(t) ((t)*(t)*(t)*((t)*((t)*6-15)+10))
|
||||
|
||||
float grad(int hash, float x, float y, float z)
|
||||
static float grad(int hash, float x, float y, float z)
|
||||
{
|
||||
int h = hash & 15; // CONVERT LO 4 BITS OF HASH CODE
|
||||
float u = h<8 ? x : y, // INTO 12 GRADIENT DIRECTIONS.
|
||||
@ -219,7 +219,7 @@ float grad(int hash, float x, float y, float z)
|
||||
}
|
||||
|
||||
/* instead of adding another permutation array, just use hash table defined above */
|
||||
float newPerlin(float x, float y, float z)
|
||||
static float newPerlin(float x, float y, float z)
|
||||
{
|
||||
int A, AA, AB, B, BA, BB;
|
||||
float u=floor(x), v=floor(y), w=floor(z);
|
||||
@ -243,7 +243,7 @@ float newPerlin(float x, float y, float z)
|
||||
}
|
||||
|
||||
/* for use with BLI_gNoise()/BLI_gTurbulence(), returns unsigned improved perlin noise */
|
||||
float newPerlinU(float x, float y, float z)
|
||||
static float newPerlinU(float x, float y, float z)
|
||||
{
|
||||
return (0.5+0.5*newPerlin(x, y, z));
|
||||
}
|
||||
@ -254,7 +254,7 @@ float newPerlinU(float x, float y, float z)
|
||||
/**************************/
|
||||
|
||||
/* Was BLI_hnoise(), removed noisesize, so other functions can call it without scaling. */
|
||||
float orgBlenderNoise(float x, float y, float z)
|
||||
static float orgBlenderNoise(float x, float y, float z)
|
||||
{
|
||||
register float cn1, cn2, cn3, cn4, cn5, cn6, i, *h;
|
||||
float ox, oy, oz, jx, jy, jz;
|
||||
@ -324,7 +324,7 @@ float orgBlenderNoise(float x, float y, float z)
|
||||
}
|
||||
|
||||
/* as orgBlenderNoise(), returning signed noise */
|
||||
float orgBlenderNoiseS(float x, float y, float z)
|
||||
static float orgBlenderNoiseS(float x, float y, float z)
|
||||
{
|
||||
return (2.0*orgBlenderNoise(x, y, z)-1.0);
|
||||
}
|
||||
@ -532,7 +532,7 @@ float turbulence_perlin(float *point, float lofreq, float hifreq)
|
||||
}
|
||||
|
||||
/* for use with BLI_gNoise/gTurbulence, returns signed noise */
|
||||
float orgPerlinNoise(float x, float y, float z)
|
||||
static float orgPerlinNoise(float x, float y, float z)
|
||||
{
|
||||
float v[3];
|
||||
|
||||
@ -543,7 +543,7 @@ float orgPerlinNoise(float x, float y, float z)
|
||||
}
|
||||
|
||||
/* for use with BLI_gNoise/gTurbulence, returns unsigned noise */
|
||||
float orgPerlinNoiseU(float x, float y, float z)
|
||||
static float orgPerlinNoiseU(float x, float y, float z)
|
||||
{
|
||||
float v[3];
|
||||
|
||||
@ -585,13 +585,13 @@ float turbulencep(float noisesize, float x, float y, float z, int nr)
|
||||
/* Camberra omitted, didn't seem useful */
|
||||
|
||||
/* distance squared */
|
||||
float dist_Squared(float x, float y, float z, float e) { return (x*x + y*y + z*z); }
|
||||
static float dist_Squared(float x, float y, float z, float e) { return (x*x + y*y + z*z); }
|
||||
/* real distance */
|
||||
float dist_Real(float x, float y, float z, float e) { return sqrt(x*x + y*y + z*z); }
|
||||
static float dist_Real(float x, float y, float z, float e) { return sqrt(x*x + y*y + z*z); }
|
||||
/* manhattan/taxicab/cityblock distance */
|
||||
float dist_Manhattan(float x, float y, float z, float e) { return (fabs(x) + fabs(y) + fabs(z)); }
|
||||
static float dist_Manhattan(float x, float y, float z, float e) { return (fabs(x) + fabs(y) + fabs(z)); }
|
||||
/* Chebychev */
|
||||
float dist_Chebychev(float x, float y, float z, float e)
|
||||
static float dist_Chebychev(float x, float y, float z, float e)
|
||||
{
|
||||
float t;
|
||||
x = fabs(x);
|
||||
@ -602,14 +602,14 @@ float dist_Chebychev(float x, float y, float z, float e)
|
||||
}
|
||||
|
||||
/* minkovsky preset exponent 0.5 */
|
||||
float dist_MinkovskyH(float x, float y, float z, float e)
|
||||
static float dist_MinkovskyH(float x, float y, float z, float e)
|
||||
{
|
||||
float d = sqrt(fabs(x)) + sqrt(fabs(y)) + sqrt(fabs(z));
|
||||
return (d*d);
|
||||
}
|
||||
|
||||
/* minkovsky preset exponent 4 */
|
||||
float dist_Minkovsky4(float x, float y, float z, float e)
|
||||
static float dist_Minkovsky4(float x, float y, float z, float e)
|
||||
{
|
||||
x *= x;
|
||||
y *= y;
|
||||
@ -618,7 +618,7 @@ float dist_Minkovsky4(float x, float y, float z, float e)
|
||||
}
|
||||
|
||||
/* Minkovsky, general case, slow, maybe too slow to be useful */
|
||||
float dist_Minkovsky(float x, float y, float z, float e)
|
||||
static float dist_Minkovsky(float x, float y, float z, float e)
|
||||
{
|
||||
return pow(pow(fabs(x), e) + pow(fabs(y), e) + pow(fabs(z), e), 1.0/e);
|
||||
}
|
||||
@ -696,35 +696,35 @@ void voronoi(float x, float y, float z, float* da, float* pa, float me, int dtyp
|
||||
}
|
||||
|
||||
/* returns different feature points for use in BLI_gNoise() */
|
||||
float voronoi_F1(float x, float y, float z)
|
||||
static float voronoi_F1(float x, float y, float z)
|
||||
{
|
||||
float da[4], pa[12];
|
||||
voronoi(x, y, z, da, pa, 1, 0);
|
||||
return da[0];
|
||||
}
|
||||
|
||||
float voronoi_F2(float x, float y, float z)
|
||||
static float voronoi_F2(float x, float y, float z)
|
||||
{
|
||||
float da[4], pa[12];
|
||||
voronoi(x, y, z, da, pa, 1, 0);
|
||||
return da[1];
|
||||
}
|
||||
|
||||
float voronoi_F3(float x, float y, float z)
|
||||
static float voronoi_F3(float x, float y, float z)
|
||||
{
|
||||
float da[4], pa[12];
|
||||
voronoi(x, y, z, da, pa, 1, 0);
|
||||
return da[2];
|
||||
}
|
||||
|
||||
float voronoi_F4(float x, float y, float z)
|
||||
static float voronoi_F4(float x, float y, float z)
|
||||
{
|
||||
float da[4], pa[12];
|
||||
voronoi(x, y, z, da, pa, 1, 0);
|
||||
return da[3];
|
||||
}
|
||||
|
||||
float voronoi_F1F2(float x, float y, float z)
|
||||
static float voronoi_F1F2(float x, float y, float z)
|
||||
{
|
||||
float da[4], pa[12];
|
||||
voronoi(x, y, z, da, pa, 1, 0);
|
||||
@ -732,7 +732,7 @@ float voronoi_F1F2(float x, float y, float z)
|
||||
}
|
||||
|
||||
/* Crackle type pattern, just a scale/clamp of F2-F1 */
|
||||
float voronoi_Cr(float x, float y, float z)
|
||||
static float voronoi_Cr(float x, float y, float z)
|
||||
{
|
||||
float t = 10*voronoi_F1F2(x, y, z);
|
||||
if (t>1.f) return 1.f;
|
||||
@ -742,35 +742,35 @@ float voronoi_Cr(float x, float y, float z)
|
||||
|
||||
/* Signed version of all 6 of the above, just 2x-1, not really correct though (range is potentially (0, sqrt(6)).
|
||||
Used in the musgrave functions */
|
||||
float voronoi_F1S(float x, float y, float z)
|
||||
static float voronoi_F1S(float x, float y, float z)
|
||||
{
|
||||
float da[4], pa[12];
|
||||
voronoi(x, y, z, da, pa, 1, 0);
|
||||
return (2.0*da[0]-1.0);
|
||||
}
|
||||
|
||||
float voronoi_F2S(float x, float y, float z)
|
||||
static float voronoi_F2S(float x, float y, float z)
|
||||
{
|
||||
float da[4], pa[12];
|
||||
voronoi(x, y, z, da, pa, 1, 0);
|
||||
return (2.0*da[1]-1.0);
|
||||
}
|
||||
|
||||
float voronoi_F3S(float x, float y, float z)
|
||||
static float voronoi_F3S(float x, float y, float z)
|
||||
{
|
||||
float da[4], pa[12];
|
||||
voronoi(x, y, z, da, pa, 1, 0);
|
||||
return (2.0*da[2]-1.0);
|
||||
}
|
||||
|
||||
float voronoi_F4S(float x, float y, float z)
|
||||
static float voronoi_F4S(float x, float y, float z)
|
||||
{
|
||||
float da[4], pa[12];
|
||||
voronoi(x, y, z, da, pa, 1, 0);
|
||||
return (2.0*da[3]-1.0);
|
||||
}
|
||||
|
||||
float voronoi_F1F2S(float x, float y, float z)
|
||||
static float voronoi_F1F2S(float x, float y, float z)
|
||||
{
|
||||
float da[4], pa[12];
|
||||
voronoi(x, y, z, da, pa, 1, 0);
|
||||
@ -778,7 +778,7 @@ float voronoi_F1F2S(float x, float y, float z)
|
||||
}
|
||||
|
||||
/* Crackle type pattern, just a scale/clamp of F2-F1 */
|
||||
float voronoi_CrS(float x, float y, float z)
|
||||
static float voronoi_CrS(float x, float y, float z)
|
||||
{
|
||||
float t = 10*voronoi_F1F2(x, y, z);
|
||||
if (t>1.f) return 1.f;
|
||||
@ -795,7 +795,7 @@ float voronoi_CrS(float x, float y, float z)
|
||||
/*************/
|
||||
|
||||
/* returns unsigned cellnoise */
|
||||
float cellNoiseU(float x, float y, float z)
|
||||
static float cellNoiseU(float x, float y, float z)
|
||||
{
|
||||
int xi = (int)(floor(x));
|
||||
int yi = (int)(floor(y));
|
||||
|
||||
@ -871,7 +871,7 @@ static int decodetype1(PackedFile * pf, char *outname)
|
||||
datbytes = pf->size - pf->seek;
|
||||
memcpy(bindat, ((char *) pf->data) + pf->seek, datbytes);
|
||||
|
||||
if ((bindat[2] << 8 + bindat[3]) == 0x800){
|
||||
if ((bindat[2] << (8 + bindat[3])) == 0x800){
|
||||
/* order data (remove 6 bytes headers) */
|
||||
i = datbytes;
|
||||
hptr = bptr = bindat + 4;
|
||||
|
||||
@ -236,7 +236,7 @@ void BLI_builddir(char *dirname, char *relname)
|
||||
return;
|
||||
}
|
||||
|
||||
if (dir = (DIR *)opendir(".")){
|
||||
if ( (dir = (DIR *)opendir(".")) ){
|
||||
while ((fname = (struct dirent*) readdir(dir)) != NULL) {
|
||||
|
||||
if(hide_dot && fname->d_name[0]=='.' && fname->d_name[1]!='.' && fname->d_name[1]!=0);
|
||||
|
||||
@ -208,7 +208,7 @@ int closedir (DIR *dp) {
|
||||
|
||||
#else
|
||||
|
||||
void BLI_WINSTUFF_C_IS_EMPTY_FOR_UNIX(void)
|
||||
static void BLI_WINSTUFF_C_IS_EMPTY_FOR_UNIX(void)
|
||||
{
|
||||
/*intentionally empty*/
|
||||
}
|
||||
|
||||
@ -115,6 +115,10 @@ static IDType idtypes[]= {
|
||||
};
|
||||
static int nidtypes= sizeof(idtypes)/sizeof(idtypes[0]);
|
||||
|
||||
/* local prototypes --------------------- */
|
||||
void BLO_blendhandle_print_sizes(BlendHandle *, void *);
|
||||
|
||||
|
||||
static IDType *idtype_from_name(char *str)
|
||||
{
|
||||
int i= nidtypes;
|
||||
@ -191,7 +195,7 @@ void BLO_blendhandle_print_sizes(BlendHandle *bh, void *fp)
|
||||
buf[2]= buf[2]?buf[2]:' ';
|
||||
buf[3]= buf[3]?buf[3]:' ';
|
||||
|
||||
fprintf(fp, "['%.4s', '%s', %d, %d], \n", buf, name, bhead->nr, bhead->len+sizeof(BHead));
|
||||
fprintf(fp, "['%.4s', '%s', %d, %ld ], \n", buf, name, bhead->nr, bhead->len+sizeof(BHead));
|
||||
}
|
||||
}
|
||||
fprintf(fp, "]\n");
|
||||
|
||||
@ -227,6 +227,12 @@ typedef struct OldNewMap {
|
||||
int lasthit;
|
||||
} OldNewMap;
|
||||
|
||||
|
||||
/* local prototypes */
|
||||
void lib_link_screen_restore(Main *, char , Scene *);
|
||||
extern short freeN(void *vmemh); /* defined in util.h */
|
||||
|
||||
|
||||
static OldNewMap *oldnewmap_new(void) {
|
||||
OldNewMap *onm= MEM_mallocN(sizeof(*onm), "OldNewMap");
|
||||
onm->lasthit= 0;
|
||||
@ -2544,7 +2550,7 @@ static void direct_link_scene(FileData *fd, Scene *sce)
|
||||
Sequence temp;
|
||||
char *poin;
|
||||
long offset;
|
||||
int seted=0;
|
||||
/*int seted=0;*/ /*unused*/
|
||||
|
||||
offset= ((long)&(temp.seqbase)) - ((long)&temp);
|
||||
|
||||
|
||||
@ -66,7 +66,7 @@ void BLO_free_memfile(MemFile *memfile)
|
||||
{
|
||||
MemFileChunk *chunk;
|
||||
|
||||
while(chunk = (memfile->chunks.first) ) {
|
||||
while( (chunk = (memfile->chunks.first) ) ) {
|
||||
if(chunk->ident==0) MEM_freeN(chunk->buf);
|
||||
BLI_remlink(&memfile->chunks, chunk);
|
||||
MEM_freeN(chunk);
|
||||
|
||||
@ -1514,7 +1514,7 @@ static int write_file_handle(int handle, MemFile *compare, MemFile *current, int
|
||||
ListBase mainlist;
|
||||
char buf[13];
|
||||
WriteData *wd;
|
||||
int data;
|
||||
/* int data; */ /*unused*/
|
||||
|
||||
mainlist.first= mainlist.last= G.main;
|
||||
G.main->next= NULL;
|
||||
|
||||
@ -49,9 +49,8 @@ CPPFLAGS += $(LEVEL_2_CPP_WARNINGS)
|
||||
# path to our own external headerfiles. On win2k this needs to be
|
||||
# longer, to avoid the util.h include problem
|
||||
CPPFLAGS += -I..
|
||||
ifeq ($(OS),windows)
|
||||
CPPFLAGS += -I../..
|
||||
endif
|
||||
CPPFLAGS += -I../..
|
||||
|
||||
# also do dna
|
||||
CPPFLAGS += -I../../makesdna
|
||||
# path to blenlib
|
||||
|
||||
@ -48,7 +48,7 @@
|
||||
#ifdef WIN32
|
||||
#include "blenpluginapi\util.h"
|
||||
#else
|
||||
#include "util.h"
|
||||
#include "blenpluginapi/util.h"
|
||||
#endif
|
||||
#include "iff.h"
|
||||
#include "plugin.h"
|
||||
@ -316,6 +316,8 @@ float turbulence1(float noisesize,
|
||||
* Otherwise they will not be imported from the archive
|
||||
* library on Unix. -zr
|
||||
*/
|
||||
int pluginapi_force_ref(void);
|
||||
|
||||
int pluginapi_force_ref(void)
|
||||
{
|
||||
return (int) mallocN +
|
||||
|
||||
@ -240,6 +240,7 @@ int FTF_TTFont::SetFont(const unsigned char* str, int datasize, int fontsize)
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void FTF_TTFont::SetLanguage(char* str)
|
||||
@ -372,6 +373,7 @@ float FTF_TTFont::GetStringWidth(char* str, unsigned int flag)
|
||||
} else if(mode == FTF_TEXTUREFONT) {
|
||||
return font->Advance(wstr);// * fsize;
|
||||
}
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -125,7 +125,7 @@ short addzbufImBuf(struct ImBuf * ibuf)
|
||||
IMB_freezbufImBuf(ibuf);
|
||||
|
||||
size = ibuf->x * ibuf->y * sizeof(unsigned int);
|
||||
if (ibuf->zbuf = MEM_mallocN(size, "addzbufImBuf")){
|
||||
if ( (ibuf->zbuf = MEM_mallocN(size, "addzbufImBuf")) ){
|
||||
ibuf->mall |= IB_zbuf;
|
||||
return (TRUE);
|
||||
}
|
||||
@ -145,7 +145,7 @@ short imb_addencodedbufferImBuf(struct ImBuf * ibuf)
|
||||
|
||||
ibuf->encodedsize = 0;
|
||||
|
||||
if (ibuf->encodedbuffer = MEM_mallocN(ibuf->encodedbuffersize, "addencodedbufferImBuf")){
|
||||
if ( (ibuf->encodedbuffer = MEM_mallocN(ibuf->encodedbuffersize, "addencodedbufferImBuf") )){
|
||||
ibuf->mall |= IB_mem;
|
||||
return (TRUE);
|
||||
}
|
||||
@ -199,7 +199,7 @@ short imb_addrectImBuf(struct ImBuf * ibuf)
|
||||
imb_freerectImBuf(ibuf);
|
||||
|
||||
size = ibuf->x * ibuf->y * sizeof(unsigned int);
|
||||
if (ibuf->rect = MEM_mallocN(size, "imb_addrectImBuf")){
|
||||
if ( (ibuf->rect = MEM_mallocN(size, "imb_addrectImBuf")) ){
|
||||
ibuf->mall |= IB_rect;
|
||||
if (ibuf->depth > 32) return (addzbufImBuf(ibuf));
|
||||
else return (TRUE);
|
||||
@ -219,7 +219,7 @@ short imb_addcmapImBuf(struct ImBuf *ibuf)
|
||||
imb_checkncols(ibuf);
|
||||
if (ibuf->maxcol == 0) return (TRUE);
|
||||
|
||||
if (ibuf->cmap = MEM_callocN(sizeof(unsigned int) * ibuf->maxcol, "imb_addcmapImBuf")){
|
||||
if ( (ibuf->cmap = MEM_callocN(sizeof(unsigned int) * ibuf->maxcol, "imb_addcmapImBuf") ) ){
|
||||
min = ibuf->maxcol * sizeof(unsigned int);
|
||||
if (min > sizeof(dfltcmap)) min = sizeof(dfltcmap);
|
||||
memcpy(ibuf->cmap, dfltcmap, min);
|
||||
|
||||
@ -388,7 +388,7 @@ static uchar *readbody(struct ImBuf *ibuf, uchar *body)
|
||||
|
||||
struct ImBuf *imb_loadamiga(int *iffmem,int flags)
|
||||
{
|
||||
int chunk,totlen,len,*cmap=0,cmaplen,*mem,ftype=0;
|
||||
int chunk,totlen,len,*cmap=0,cmaplen =0,*mem,ftype=0;
|
||||
uchar *body=0;
|
||||
struct BitMapHeader bmhd;
|
||||
struct ImBuf *ibuf=0;
|
||||
|
||||
@ -47,6 +47,7 @@
|
||||
|
||||
#include "IMB_anim.h"
|
||||
|
||||
#include "IMB_anim5.h"
|
||||
|
||||
typedef struct Anhd{
|
||||
unsigned char type, mask;
|
||||
@ -235,7 +236,7 @@ static void anim5decode(struct ImBuf * ibuf, uchar * dlta) {
|
||||
do{
|
||||
uchar noop;
|
||||
|
||||
if (noop = *(point++)){
|
||||
if ( (noop = *(point++)) ){
|
||||
uchar *plane;
|
||||
uchar code;
|
||||
|
||||
@ -308,7 +309,7 @@ static void anim5xordecode(struct ImBuf * ibuf, uchar * dlta) {
|
||||
do{
|
||||
uchar noop;
|
||||
|
||||
if (noop = *(point++)){
|
||||
if ( (noop = *(point++)) ){
|
||||
uchar *plane;
|
||||
uchar code;
|
||||
|
||||
|
||||
@ -182,14 +182,14 @@ struct ImBuf *imb_bmp_decode(unsigned char *mem, int size, int flags)
|
||||
}
|
||||
|
||||
/* Couple of helper functions for writing our data */
|
||||
int putIntLSB(unsigned int ui,FILE *ofile) {
|
||||
static int putIntLSB(unsigned int ui,FILE *ofile) {
|
||||
putc((ui>>0)&0xFF,ofile);
|
||||
putc((ui>>8)&0xFF,ofile);
|
||||
putc((ui>>16)&0xFF,ofile);
|
||||
return putc((ui>>24)&0xFF,ofile);
|
||||
}
|
||||
|
||||
int putShortLSB(unsigned short us,FILE *ofile) {
|
||||
static int putShortLSB(unsigned short us,FILE *ofile) {
|
||||
putc((us>>0)&0xFF,ofile);
|
||||
return putc((us>>8)&0xFF,ofile);
|
||||
}
|
||||
|
||||
@ -37,6 +37,8 @@
|
||||
#include "imbuf_patch.h"
|
||||
#include "IMB_imbuf_types.h"
|
||||
|
||||
void IMB_cspace(struct ImBuf *ibuf, float mat[][4]);
|
||||
|
||||
/************************************************************************/
|
||||
/* COLORSPACE */
|
||||
/************************************************************************/
|
||||
|
||||
@ -157,8 +157,10 @@ void IMB_gamwarp(struct ImBuf *ibuf, double gamma)
|
||||
rect = (uchar *) ibuf->rect;
|
||||
for (i = ibuf->x * ibuf->y ; i>0 ; i--){
|
||||
rect ++;
|
||||
*rect ++ = gam[*rect];
|
||||
*rect ++ = gam[*rect];
|
||||
*rect ++ = gam[*rect];
|
||||
/* put a warning in gcc : operation may be undefined : */
|
||||
/* it is true it's rather convoluted even by C standards ;) */
|
||||
*rect ++ = gam[*rect]; /*FIXME*/
|
||||
*rect ++ = gam[*rect]; /*FIXME*/
|
||||
*rect ++ = gam[*rect]; /*FIXME*/
|
||||
}
|
||||
}
|
||||
|
||||
@ -332,7 +332,7 @@ static short dec_hamx(struct ImBuf * ibuf, unsigned char *body, int cmap[])
|
||||
struct ImBuf *imb_loadanim(int *iffmem, int flags)
|
||||
{
|
||||
int chunk, totlen, len, *mem, cmaplen = 0;
|
||||
unsigned int *cmap;
|
||||
unsigned int *cmap = NULL;
|
||||
uchar *body = 0;
|
||||
struct Adat adat;
|
||||
struct ImBuf *ibuf=0;
|
||||
|
||||
@ -235,11 +235,11 @@ static void test_endian_zbuf(struct ImBuf *ibuf)
|
||||
|
||||
struct ImBuf *imb_loadiris(unsigned char *mem, int flags)
|
||||
{
|
||||
unsigned int *base, *lptr;
|
||||
unsigned int *base, *lptr = NULL;
|
||||
unsigned int *zbase, *zptr;
|
||||
unsigned char *rledat;
|
||||
int *starttab, *lengthtab;
|
||||
FILE *inf;
|
||||
FILE *inf = NULL;
|
||||
IMAGE image;
|
||||
int x, y, z, tablen;
|
||||
int xsize, ysize, zsize;
|
||||
|
||||
@ -67,7 +67,7 @@
|
||||
/* this one is only def-ed once, strangely... */
|
||||
#define GSS(x) (((uchar *)(x))[1] << 8 | ((uchar *)(x))[0])
|
||||
|
||||
int IMB_ispic_name(char *name)
|
||||
static int IMB_ispic_name(char *name)
|
||||
{
|
||||
struct stat st;
|
||||
int fp, buf[10];
|
||||
|
||||
@ -67,7 +67,7 @@ int get_linear_mipmap(void);
|
||||
/**
|
||||
* Resets the realtime image cache variables.
|
||||
*/
|
||||
void clear_realtime_image_cache();
|
||||
void clear_realtime_image_cache(void);
|
||||
|
||||
void free_realtime_image(struct Image *ima);
|
||||
void free_all_realtime_images(void);
|
||||
|
||||
@ -33,9 +33,9 @@
|
||||
#ifndef BDR_UNWRAPPER_H
|
||||
#define BDR_UNWRAPPER_H
|
||||
|
||||
void set_seamtface(); /* set TF_SEAM flags in tfaces */
|
||||
void unwrap_lscm(); /* unwrap selected tfaces */
|
||||
void select_linked_tfaces_with_seams();
|
||||
void set_seamtface(void); /* set TF_SEAM flags in tfaces */
|
||||
void unwrap_lscm(void); /* unwrap selected tfaces */
|
||||
void select_linked_tfaces_with_seams(void);
|
||||
|
||||
#endif /* BDR_UNWRAPPER_H */
|
||||
|
||||
|
||||
@ -42,6 +42,7 @@ void remake_editText(void);
|
||||
void free_editText(void);
|
||||
void paste_editText(void);
|
||||
void txt_export_to_object(struct Text *text);
|
||||
void txt_export_to_objects(struct Text *text);
|
||||
void undo_push_font(char *);
|
||||
|
||||
/**
|
||||
|
||||
@ -41,7 +41,7 @@ void borderselect(void);
|
||||
void circle_select(void);
|
||||
void deselectall(void);
|
||||
void selectall_type(short obtype);
|
||||
void selectall_layer(int layernum);
|
||||
void selectall_layer(unsigned int layernum);
|
||||
void draw_sel_circle(short *mval, short *mvalo, float rad, float rado, int selecting);
|
||||
void fly(void);
|
||||
int gesture(void);
|
||||
|
||||
@ -40,7 +40,7 @@ int fsmenu_get_nentries (void);
|
||||
/** Returns true if the fsmenu entry at @a index exists and
|
||||
* is a seperator.
|
||||
*/
|
||||
char* fsmenu_is_entry_a_seperator (int index);
|
||||
int fsmenu_is_entry_a_seperator (int index);
|
||||
|
||||
/** Returns the fsmenu entry at @a index (or NULL if a bad index)
|
||||
* or a seperator.
|
||||
|
||||
@ -85,6 +85,7 @@ void bwin_load_winmatrix(int winid, float mat[][4]);
|
||||
void bwin_get_viewmatrix(int winid, float mat[][4]);
|
||||
void bwin_get_winmatrix(int winid, float mat[][4]);
|
||||
|
||||
void bwin_multmatrix(int winid, float mat[][4]);
|
||||
void bwin_scalematrix(int winid, float x, float y, float z);
|
||||
|
||||
void bwin_ortho(int winid, float x1, float x2, float y1, float y2, float n, float f);
|
||||
|
||||
@ -41,12 +41,14 @@ struct Material;
|
||||
struct Mesh;
|
||||
struct MetaBall;
|
||||
struct Object;
|
||||
struct Lamp;
|
||||
void add_curve_oopslinks(struct Curve *cu, struct Oops *oops, short flag);
|
||||
void add_from_link(struct Oops *from, struct Oops *oops);
|
||||
void add_material_oopslinks(struct Material *ma, struct Oops *oops, short flag);
|
||||
void add_mball_oopslinks(struct MetaBall *mb, struct Oops *oops, short flag);
|
||||
void add_mesh_oopslinks(struct Mesh *me, struct Oops *oops, short flag);
|
||||
void add_object_oopslinks(struct Object *ob, struct Oops *oops, short flag);
|
||||
void add_lamp_oopslinks(struct Lamp *la, struct Oops *oops, short flag);
|
||||
struct Oops *add_oops(void *id);
|
||||
struct OopsLink *add_oopslink(char *name, struct Oops *oops, short type, void *from, float xof, float yof);
|
||||
struct Oops *add_test_oops(void *id); /* incl links */
|
||||
|
||||
@ -65,10 +65,10 @@ void Transform(int mode);
|
||||
|
||||
struct TransInfo;
|
||||
|
||||
struct TransInfo * BIF_GetTransInfo();
|
||||
struct TransInfo * BIF_GetTransInfo(void);
|
||||
void BIF_setSingleAxisConstraint(float vec[3]);
|
||||
void BIF_drawConstraint();
|
||||
void BIF_drawPropCircle();
|
||||
void BIF_drawConstraint(void);
|
||||
void BIF_drawPropCircle(void);
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -65,5 +65,8 @@ void end_anim_sumo(void);
|
||||
void inner_play_anim_loop(int init, int mode);
|
||||
int play_anim(int mode);
|
||||
|
||||
|
||||
void make_axis_color(char *col, char *col2, char axis);
|
||||
|
||||
#endif /* BSE_DRAWVIEW_H */
|
||||
|
||||
|
||||
@ -66,8 +66,8 @@ struct Scene *copy_scene(struct Scene *sce, int level);
|
||||
|
||||
void buttons_active_id(struct ID **id, struct ID **idfrom);
|
||||
|
||||
int start_progress_bar();
|
||||
void end_progress_bar();
|
||||
int start_progress_bar(void);
|
||||
void end_progress_bar(void);
|
||||
int progress_bar(float done, char *busy_info);
|
||||
|
||||
void update_for_newframe(void);
|
||||
|
||||
@ -113,6 +113,10 @@ PyObject *importText( char *name );
|
||||
void init_ourImport( void );
|
||||
PyObject *blender_import( PyObject * self, PyObject * args );
|
||||
|
||||
int BPY_txt_do_python_Text( struct Text *text );
|
||||
void BPY_Err_Handle( char *script_name );
|
||||
PyObject *traceback_getFilename( PyObject * tb );
|
||||
|
||||
/****************************************************************************
|
||||
* Description: This function will initialise Python and all the implemented
|
||||
* api variations.
|
||||
@ -848,7 +852,7 @@ void BPY_free_finished_script( Script * script )
|
||||
return;
|
||||
}
|
||||
|
||||
void unlink_script( Script * script )
|
||||
static void unlink_script( Script * script )
|
||||
{ /* copied from unlink_text in drawtext.c */
|
||||
bScreen *scr;
|
||||
ScrArea *area;
|
||||
@ -1095,7 +1099,7 @@ void BPY_free_scriptlink( struct ScriptLink *slink )
|
||||
return;
|
||||
}
|
||||
|
||||
int CheckAllScriptsFromList( ListBase * list, Text * text )
|
||||
static int CheckAllScriptsFromList( ListBase * list, Text * text )
|
||||
{
|
||||
ID *id;
|
||||
ScriptLink *scriptlink;
|
||||
|
||||
@ -79,6 +79,9 @@ static PyObject *Blender_Load( PyObject * self, PyObject * args );
|
||||
static PyObject *Blender_Save( PyObject * self, PyObject * args );
|
||||
static PyObject *Blender_UpdateMenus( PyObject * self);
|
||||
|
||||
extern PyObject *Text3d_Init( void ); /* missing in some include */
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* The following string definitions are used for documentation strings. */
|
||||
/* In Python these will be written to the console when doing a */
|
||||
|
||||
@ -233,7 +233,7 @@ PyObject *Bone_Init( void )
|
||||
//--------------- Bone module internal callbacks-----------------
|
||||
|
||||
//--------------- updatePyBone------------------------------------
|
||||
int updatePyBone( BPy_Bone * self )
|
||||
static int updatePyBone( BPy_Bone * self )
|
||||
{
|
||||
int x, y;
|
||||
char *parent_str = "";
|
||||
@ -1691,7 +1691,7 @@ static PyObject *Bone_getRestMatrix( BPy_Bone * self, PyObject * args )
|
||||
//use python vars
|
||||
if( BLI_streq( local, worldspace ) ) {
|
||||
VecSubf( delta, self->tail->vec, self->head->vec );
|
||||
make_boneMatrixvr( *( ( MatrixObject * ) matrix )->
|
||||
make_boneMatrixvr( (float ( * )[4]) *( ( MatrixObject * ) matrix )->
|
||||
matrix, delta, self->roll );
|
||||
} else if( BLI_streq( local, bonespace ) ) {
|
||||
return ( EXPP_ReturnPyObjError( PyExc_AttributeError,
|
||||
@ -1701,12 +1701,12 @@ static PyObject *Bone_getRestMatrix( BPy_Bone * self, PyObject * args )
|
||||
//use bone datastruct
|
||||
if( BLI_streq( local, worldspace ) ) {
|
||||
get_objectspace_bone_matrix( self->bone,
|
||||
*( ( MatrixObject * )
|
||||
( float ( * )[4] ) *( ( MatrixObject * )
|
||||
matrix )->matrix, 1,
|
||||
1 );
|
||||
} else if( BLI_streq( local, bonespace ) ) {
|
||||
VecSubf( delta, self->bone->tail, self->bone->head );
|
||||
make_boneMatrixvr( *( ( MatrixObject * ) matrix )->
|
||||
make_boneMatrixvr( (float ( * )[4]) *( ( MatrixObject * ) matrix )->
|
||||
matrix, delta, self->bone->roll );
|
||||
if( self->bone->parent ) {
|
||||
get_bone_root_pos( self->bone, root, 1 );
|
||||
|
||||
@ -43,6 +43,9 @@
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
/* prototypes */
|
||||
PyObject *Build_Init( void );
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Python BPy_Build methods table: */
|
||||
/*****************************************************************************/
|
||||
|
||||
@ -120,6 +120,9 @@ static PyObject *Camera_getScriptLinks( BPy_Camera * self, PyObject * args );
|
||||
static PyObject *Camera_addScriptLink( BPy_Camera * self, PyObject * args );
|
||||
static PyObject *Camera_clearScriptLinks( BPy_Camera * self );
|
||||
|
||||
Camera *GetCameraByName( char *name );
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Python BPy_Camera methods table: */
|
||||
/*****************************************************************************/
|
||||
|
||||
@ -456,7 +456,7 @@ static PyObject *Ipo_getNcurves( BPy_Ipo * self )
|
||||
stiv 6-jan-2004
|
||||
*/
|
||||
|
||||
int Ipo_laIcuName( char *s, int *param )
|
||||
static int Ipo_laIcuName( char *s, int *param )
|
||||
{
|
||||
int ok = 0;
|
||||
if( !strcmp( s, "Energy" ) ) {
|
||||
@ -502,7 +502,7 @@ int Ipo_laIcuName( char *s, int *param )
|
||||
return ok;
|
||||
}
|
||||
|
||||
int Ipo_woIcuName( char *s, int *param )
|
||||
static int Ipo_woIcuName( char *s, int *param )
|
||||
{
|
||||
int ok = 0;
|
||||
if( !strcmp( s, "HorR" ) ) {
|
||||
@ -572,7 +572,7 @@ int Ipo_woIcuName( char *s, int *param )
|
||||
return ok;
|
||||
}
|
||||
|
||||
int Ipo_maIcuName( char *s, int *param )
|
||||
static int Ipo_maIcuName( char *s, int *param )
|
||||
{
|
||||
int ok = 0;
|
||||
if( !strcmp( s, "R" ) ) {
|
||||
@ -682,7 +682,7 @@ int Ipo_maIcuName( char *s, int *param )
|
||||
return ok;
|
||||
}
|
||||
|
||||
int Ipo_keIcuName( char *s, int *param )
|
||||
static int Ipo_keIcuName( char *s, int *param )
|
||||
{
|
||||
char key[10];
|
||||
int ok = 0;
|
||||
@ -703,7 +703,7 @@ int Ipo_keIcuName( char *s, int *param )
|
||||
return ok;
|
||||
}
|
||||
|
||||
int Ipo_seqIcuName( char *s, int *param )
|
||||
static int Ipo_seqIcuName( char *s, int *param )
|
||||
{
|
||||
int ok = 0;
|
||||
if( !strcmp( s, "Fac" ) ) {
|
||||
@ -714,7 +714,7 @@ int Ipo_seqIcuName( char *s, int *param )
|
||||
return ok;
|
||||
}
|
||||
|
||||
int Ipo_cuIcuName( char *s, int *param )
|
||||
static int Ipo_cuIcuName( char *s, int *param )
|
||||
{
|
||||
int ok = 0;
|
||||
if( !strcmp( s, "Speed" ) ) {
|
||||
@ -725,7 +725,7 @@ int Ipo_cuIcuName( char *s, int *param )
|
||||
return ok;
|
||||
}
|
||||
|
||||
int Ipo_coIcuName( char *s, int *param )
|
||||
static int Ipo_coIcuName( char *s, int *param )
|
||||
{
|
||||
int ok = 0;
|
||||
if( !strcmp( s, "Inf" ) ) {
|
||||
@ -736,7 +736,7 @@ int Ipo_coIcuName( char *s, int *param )
|
||||
return ok;
|
||||
}
|
||||
|
||||
int Ipo_acIcuName( char *s, int *param )
|
||||
static int Ipo_acIcuName( char *s, int *param )
|
||||
{
|
||||
int ok = 0;
|
||||
if( !strcmp( s, "LocX" ) ) {
|
||||
@ -782,7 +782,7 @@ int Ipo_acIcuName( char *s, int *param )
|
||||
return ok;
|
||||
}
|
||||
|
||||
int Ipo_caIcuName( char *s, int *param )
|
||||
static int Ipo_caIcuName( char *s, int *param )
|
||||
{
|
||||
int ok = 0;
|
||||
if( !strcmp( s, "Lens" ) ) {
|
||||
@ -800,7 +800,7 @@ int Ipo_caIcuName( char *s, int *param )
|
||||
return ok;
|
||||
}
|
||||
|
||||
int Ipo_texIcuName( char *s, int *param )
|
||||
static int Ipo_texIcuName( char *s, int *param )
|
||||
{
|
||||
int ok = 0;
|
||||
if( !strcmp( s, "NSize" ) ) {
|
||||
@ -891,7 +891,7 @@ int Ipo_texIcuName( char *s, int *param )
|
||||
return ok;
|
||||
}
|
||||
|
||||
int Ipo_obIcuName( char *s, int *param )
|
||||
static int Ipo_obIcuName( char *s, int *param )
|
||||
{
|
||||
int ok = 0;
|
||||
if( !strcmp( s, "LocX" ) ) {
|
||||
|
||||
@ -65,6 +65,10 @@ static PyObject *M_Library_Datablocks( PyObject * self, PyObject * args );
|
||||
static PyObject *M_Library_Load( PyObject * self, PyObject * args );
|
||||
static PyObject *M_Library_LinkableGroups( PyObject * self );
|
||||
|
||||
PyObject *Library_Init( void );
|
||||
void EXPP_Library_Close( void );
|
||||
|
||||
|
||||
/**
|
||||
* Module doc strings.
|
||||
*/
|
||||
|
||||
@ -161,6 +161,10 @@ static PyObject *M_Material_New( PyObject * self, PyObject * args,
|
||||
PyObject * keywords );
|
||||
static PyObject *M_Material_Get( PyObject * self, PyObject * args );
|
||||
|
||||
/* Not exposed nor used */
|
||||
Material *GetMaterialByName( char *name );
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* The following string definitions are used for documentation strings. */
|
||||
/* In Python these will be written to the console when doing a */
|
||||
|
||||
@ -377,7 +377,7 @@ static int NMCol_setattr( PyObject * self, char *name, PyObject * v )
|
||||
return 0;
|
||||
}
|
||||
|
||||
PyObject *NMCol_repr( BPy_NMCol * self )
|
||||
static PyObject *NMCol_repr( BPy_NMCol * self )
|
||||
{
|
||||
static char s[256];
|
||||
sprintf( s, "[NMCol - <%d, %d, %d, %d>]", self->r, self->g, self->b,
|
||||
@ -2362,7 +2362,7 @@ static int check_validFaceUV( BPy_NMesh * nmesh )
|
||||
}
|
||||
|
||||
/* this is a copy of unlink_mesh in mesh.c, because ... */
|
||||
void EXPP_unlink_mesh( Mesh * me )
|
||||
static void EXPP_unlink_mesh( Mesh * me )
|
||||
{
|
||||
int a;
|
||||
|
||||
|
||||
@ -64,10 +64,10 @@ struct BPy_Object;
|
||||
/* These are from blender/src/editdeform.c, should be declared elsewhere,
|
||||
* maybe in BIF_editdeform.h, after proper testing of vgrouping methods XXX */
|
||||
|
||||
void create_dverts( Mesh * me );
|
||||
void add_vert_defnr( Object * ob, int def_nr, int vertnum, float weight,
|
||||
extern void create_dverts( Mesh * me );
|
||||
extern void add_vert_defnr( Object * ob, int def_nr, int vertnum, float weight,
|
||||
int assignmode );
|
||||
void remove_vert_def_nr( Object * ob, int def_nr, int vertnum );
|
||||
extern void remove_vert_def_nr( Object * ob, int def_nr, int vertnum );
|
||||
|
||||
|
||||
|
||||
|
||||
@ -59,6 +59,8 @@ static int left = 1;
|
||||
static int initf = 0;
|
||||
static unsigned long *next;
|
||||
|
||||
PyObject *Noise_Init(void);
|
||||
|
||||
/* initializes state[N] with a seed */
|
||||
static void init_genrand( unsigned long s )
|
||||
{
|
||||
@ -603,7 +605,7 @@ static PyMethodDef NoiseMethods[] = {
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
PyObject *Noise_Init( )
|
||||
PyObject *Noise_Init(void)
|
||||
{
|
||||
PyObject *NoiseTypes, *DistanceMetrics,
|
||||
*md =
|
||||
|
||||
@ -63,6 +63,10 @@ static PyObject *M_Object_New( PyObject * self, PyObject * args );
|
||||
PyObject *M_Object_Get( PyObject * self, PyObject * args );
|
||||
static PyObject *M_Object_GetSelected( PyObject * self, PyObject * args );
|
||||
|
||||
extern int Text3d_CheckPyObject( PyObject * py_obj );
|
||||
extern struct Text3d *Text3d_FromPyObject( PyObject * py_obj );
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* The following string definitions are used for documentation strings. */
|
||||
/* In Python these will be written to the console when doing a */
|
||||
@ -908,7 +912,7 @@ static PyObject *Object_getInverseMatrix( BPy_Object * self )
|
||||
{
|
||||
MatrixObject *inverse =
|
||||
( MatrixObject * ) newMatrixObject( NULL, 4, 4 );
|
||||
Mat4Invert( *inverse->matrix, self->object->obmat );
|
||||
Mat4Invert( (float ( * )[4])*inverse->matrix, self->object->obmat );
|
||||
|
||||
return ( ( PyObject * ) inverse );
|
||||
}
|
||||
@ -968,14 +972,14 @@ static PyObject *Object_getMatrix( BPy_Object * self, PyObject * args )
|
||||
disable_where_script( 1 );
|
||||
where_is_object( self->object );
|
||||
disable_where_script( 0 );
|
||||
Mat4CpyMat4( *( ( MatrixObject * ) matrix )->matrix,
|
||||
Mat4CpyMat4((float ( * )[4]) *( ( MatrixObject * ) matrix )->matrix,
|
||||
self->object->obmat );
|
||||
} else if( BLI_streq( space, "localspace" ) ) { /* Localspace matrix */
|
||||
object_to_mat4( self->object,
|
||||
*( ( MatrixObject * ) matrix )->matrix );
|
||||
( float ( * )[4] ) *( ( MatrixObject * ) matrix )->matrix );
|
||||
/* old behavior, prior to 2.34, check this method's doc string: */
|
||||
} else if( BLI_streq( space, "old_worldspace" ) ) {
|
||||
Mat4CpyMat4( *( ( MatrixObject * ) matrix )->matrix,
|
||||
Mat4CpyMat4( (float ( * )[4]) *( ( MatrixObject * ) matrix )->matrix,
|
||||
self->object->obmat );
|
||||
} else {
|
||||
return ( EXPP_ReturnPyObjError( PyExc_RuntimeError,
|
||||
|
||||
@ -124,6 +124,9 @@ static PyMethodDef BPy_Particle_methods[] = {
|
||||
{NULL, NULL, 0, NULL}
|
||||
};
|
||||
|
||||
/**************** prototypes ********************/
|
||||
PyObject *Particle_Init( void );
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Python Particle_Type structure definition: */
|
||||
|
||||
@ -153,9 +153,12 @@ static PyMethodDef BPy_Sound_methods[] = {
|
||||
"() - play this sound"},
|
||||
{"setCurrent", ( PyCFunction ) Sound_setCurrent, METH_NOARGS,
|
||||
"() - make this the active sound in the sound buttons win (also redraws)"},
|
||||
//{"reload", ( PyCFunction ) Sound_setCurrent, METH_NOARGS,
|
||||
//"() - reload this Sound object's sample.\n\
|
||||
//This is only useful if the original sound file has changed."},
|
||||
|
||||
/*
|
||||
{"reload", ( PyCFunction ) Sound_setCurrent, METH_NOARGS,
|
||||
"() - reload this Sound object's sample.\n\
|
||||
This is only useful if the original sound file has changed."},
|
||||
*/
|
||||
SOUND_FLOAT_METHOD_FUNCS( Volume )
|
||||
SOUND_FLOAT_METHOD_FUNCS( Attenuation )
|
||||
SOUND_FLOAT_METHOD_FUNCS( Pitch )
|
||||
|
||||
@ -37,6 +37,7 @@
|
||||
#include <sys/stat.h>
|
||||
#include "gen_utils.h"
|
||||
|
||||
#include "Sys.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Python API function prototypes for the sys module. */
|
||||
|
||||
@ -34,6 +34,8 @@
|
||||
#include "DNA_view3d_types.h"
|
||||
#include "DNA_vfont_types.h"
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
||||
#include "BKE_object.h"
|
||||
#include "BDR_editobject.h"
|
||||
#include "BKE_displist.h"
|
||||
@ -140,8 +142,13 @@ struct PyMethodDef M_Text3d_methods[] = {
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Python BPy_Text3d methods declarations: */
|
||||
/* extern prototypes */
|
||||
/*****************************************************************************/
|
||||
static PyObject *Text2Text3d( BPy_Text3d * self, PyObject * args );
|
||||
/*static PyObject *Text2Text3d( BPy_Text3d * self, PyObject * args );*/ /*unused nor defined*/
|
||||
extern void freedisplist(struct ListBase *lb);
|
||||
extern VFont *get_builtin_font(void);
|
||||
int Text3d_CheckPyObject( PyObject * py_obj );
|
||||
struct Text3d *Text3d_FromPyObject( PyObject * py_obj );
|
||||
|
||||
|
||||
/*
|
||||
@ -326,7 +333,7 @@ struct Text3d *Text3d_FromPyObject( PyObject * py_obj )
|
||||
BPy_Text3d *blen_obj;
|
||||
|
||||
blen_obj = ( BPy_Text3d * ) py_obj;
|
||||
return ((Text3d*) blen_obj->curve );
|
||||
return ((struct Text3d*) blen_obj->curve );
|
||||
}
|
||||
|
||||
static PyObject *Text3d_getName( BPy_Text3d * self )
|
||||
|
||||
@ -33,6 +33,8 @@
|
||||
#include "Wave.h"
|
||||
#include "Effect.h"
|
||||
|
||||
/******* prototypes **********/
|
||||
PyObject *Wave_Init( void );
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Python BPy_Wave methods table: */
|
||||
|
||||
@ -108,6 +108,8 @@ static PyObject *M_Window_GetScreens( PyObject * self );
|
||||
static PyObject *M_Window_SetScreen( PyObject * self, PyObject * args );
|
||||
static PyObject *M_Window_GetScreenInfo( PyObject * self, PyObject * args,
|
||||
PyObject * kwords );
|
||||
PyObject *Window_Init( void );
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* The following string definitions are used for documentation strings. */
|
||||
|
||||
@ -150,7 +150,7 @@ int updateProperyData( BPy_Property * self )
|
||||
}
|
||||
|
||||
//--------------- checkValidData_ptr--------------------------------
|
||||
int checkValidData_ptr( BPy_Property * self )
|
||||
static int checkValidData_ptr( BPy_Property * self )
|
||||
{
|
||||
int length;
|
||||
//test pointer to see if data was removed (oops)
|
||||
|
||||
@ -341,7 +341,7 @@ PyObject *Matrix_Invert( MatrixObject * self )
|
||||
self->matrix[2][0], self->matrix[2][1],
|
||||
self->matrix[2][2] );
|
||||
} else if( self->rowSize == 4 ) {
|
||||
det = Det4x4( *self->matrix );
|
||||
det = Det4x4( (float ( * )[4]) *self->matrix );
|
||||
} else {
|
||||
return EXPP_ReturnPyObjError( PyExc_StandardError,
|
||||
"error calculating determinant for inverse()\n" );
|
||||
@ -370,7 +370,7 @@ PyObject *Matrix_Invert( MatrixObject * self )
|
||||
( PyExc_MemoryError,
|
||||
"problem allocating mat\n\n" ) );
|
||||
}
|
||||
Mat3Adj( ( float ( * )[3] ) mat, *self->matrix );
|
||||
Mat3Adj( ( float ( * )[3] ) mat,( float ( * )[3] ) *self->matrix );
|
||||
} else if( self->rowSize == 4 ) {
|
||||
mat = PyMem_Malloc( self->rowSize * self->colSize *
|
||||
sizeof( float ) );
|
||||
@ -379,7 +379,7 @@ PyObject *Matrix_Invert( MatrixObject * self )
|
||||
( PyExc_MemoryError,
|
||||
"problem allocating mat\n\n" ) );
|
||||
}
|
||||
Mat4Adj( ( float ( * )[4] ) mat, *self->matrix );
|
||||
Mat4Adj( ( float ( * )[4] ) mat, ( float ( * )[4] ) *self->matrix );
|
||||
}
|
||||
//divide by determinate
|
||||
for( x = 0; x < ( self->rowSize * self->colSize ); x++ ) {
|
||||
@ -437,7 +437,7 @@ PyObject *Matrix_Determinant( MatrixObject * self )
|
||||
self->matrix[2][0], self->matrix[2][1],
|
||||
self->matrix[2][2] );
|
||||
} else if( self->rowSize == 4 ) {
|
||||
det = Det4x4( *self->matrix );
|
||||
det = Det4x4( (float ( * )[4]) *self->matrix );
|
||||
} else {
|
||||
return EXPP_ReturnPyObjError( PyExc_StandardError,
|
||||
"error in determinant()\n" );
|
||||
@ -458,9 +458,9 @@ PyObject *Matrix_Transpose( MatrixObject * self )
|
||||
self->matrix[1][0] = self->matrix[0][1];
|
||||
self->matrix[0][1] = t;
|
||||
} else if( self->rowSize == 3 ) {
|
||||
Mat3Transp( *self->matrix );
|
||||
Mat3Transp( (float ( * )[3])*self->matrix );
|
||||
} else if( self->rowSize == 4 ) {
|
||||
Mat4Transp( *self->matrix );
|
||||
Mat4Transp( (float ( * )[4])*self->matrix );
|
||||
} else
|
||||
return ( EXPP_ReturnPyObjError( PyExc_TypeError,
|
||||
"unable to transpose matrix\n" ) );
|
||||
@ -492,9 +492,9 @@ PyObject *Matrix_Identity( MatrixObject * self )
|
||||
self->matrix[1][0] = 0.0f;
|
||||
self->matrix[1][1] = 1.0f;
|
||||
} else if( self->rowSize == 3 ) {
|
||||
Mat3One( *self->matrix );
|
||||
Mat3One( ( float ( * )[3] ) *self->matrix );
|
||||
} else if( self->rowSize == 4 ) {
|
||||
Mat4One( *self->matrix );
|
||||
Mat4One( ( float ( * )[4] ) *self->matrix );
|
||||
} else
|
||||
return ( EXPP_ReturnPyObjError( PyExc_TypeError,
|
||||
"unable to create identity matrix\n" ) );
|
||||
@ -668,7 +668,7 @@ static int Matrix_len( MatrixObject * self )
|
||||
return ( self->colSize * self->rowSize );
|
||||
}
|
||||
|
||||
PyObject *Matrix_add( PyObject * m1, PyObject * m2 )
|
||||
static PyObject *Matrix_add( PyObject * m1, PyObject * m2 )
|
||||
{
|
||||
float *mat;
|
||||
int matSize, rowSize, colSize, x, y;
|
||||
@ -710,7 +710,7 @@ PyObject *Matrix_add( PyObject * m1, PyObject * m2 )
|
||||
return newMatrixObject( mat, rowSize, colSize );
|
||||
}
|
||||
|
||||
PyObject *Matrix_sub( PyObject * m1, PyObject * m2 )
|
||||
static PyObject *Matrix_sub( PyObject * m1, PyObject * m2 )
|
||||
{
|
||||
float *mat;
|
||||
int matSize, rowSize, colSize, x, y;
|
||||
@ -752,7 +752,7 @@ PyObject *Matrix_sub( PyObject * m1, PyObject * m2 )
|
||||
return newMatrixObject( mat, rowSize, colSize );
|
||||
}
|
||||
|
||||
PyObject *Matrix_mul( PyObject * m1, PyObject * m2 )
|
||||
static PyObject *Matrix_mul( PyObject * m1, PyObject * m2 )
|
||||
{
|
||||
PyObject *retval;
|
||||
int matSizeV, rowSizeV, colSizeV, rowSizeW, colSizeW, matSizeW, x, y,z;
|
||||
@ -830,7 +830,7 @@ PyObject *Matrix_mul( PyObject * m1, PyObject * m2 )
|
||||
}
|
||||
|
||||
//coercion of unknown types to type MatrixObject for numeric protocols
|
||||
int Matrix_coerce( PyObject ** m1, PyObject ** m2 )
|
||||
static int Matrix_coerce( PyObject ** m1, PyObject ** m2 )
|
||||
{
|
||||
long *tempI;
|
||||
double *tempF;
|
||||
|
||||
@ -64,6 +64,13 @@ struct PyMethodDef Quaternion_methods[] = {
|
||||
{NULL, NULL, 0, NULL}
|
||||
};
|
||||
|
||||
/* ****** prototypes ********** */
|
||||
PyObject *Quaternion_add( PyObject * q1, PyObject * q2 );
|
||||
PyObject *Quaternion_sub( PyObject * q1, PyObject * q2 );
|
||||
PyObject *Quaternion_mul( PyObject * q1, PyObject * q2 );
|
||||
int Quaternion_coerce( PyObject ** q1, PyObject ** q2 );
|
||||
|
||||
|
||||
/*****************************/
|
||||
// Quaternion Python Object
|
||||
/*****************************/
|
||||
|
||||
@ -893,7 +893,7 @@ PyObject *RenderData_Play( BPy_RenderData * self )
|
||||
if( self->renderContext->imtype == R_QUICKTIME ) {
|
||||
|
||||
strcpy( file, self->renderContext->pic );
|
||||
BLI_convertstringcode( file, self->scene,
|
||||
BLI_convertstringcode( file, (char *) self->scene,
|
||||
self->renderContext->cfra );
|
||||
RE_make_existing_file( file );
|
||||
if( strcasecmp( file + strlen( file ) - 4, ".mov" ) ) {
|
||||
|
||||
@ -55,6 +55,14 @@ struct PyMethodDef Vector_methods[] = {
|
||||
{NULL, NULL, 0, NULL}
|
||||
};
|
||||
|
||||
/******prototypes*************/
|
||||
PyObject *Vector_add( PyObject * v1, PyObject * v2 );
|
||||
PyObject *Vector_sub( PyObject * v1, PyObject * v2 );
|
||||
PyObject *Vector_mul( PyObject * v1, PyObject * v2 );
|
||||
PyObject *Vector_div( PyObject * v1, PyObject * v2 );
|
||||
int Vector_coerce( PyObject ** v1, PyObject ** v2 );
|
||||
|
||||
|
||||
/*****************************/
|
||||
// Vector Python Object
|
||||
/*****************************/
|
||||
|
||||
@ -112,13 +112,13 @@ static struct QuicktimeComponentData *qtdata;
|
||||
static int sframe;
|
||||
|
||||
|
||||
void CheckError(OSErr err, char *msg)
|
||||
static void CheckError(OSErr err, char *msg)
|
||||
{
|
||||
if(err != noErr) printf("%s: %d\n", msg, err);
|
||||
}
|
||||
|
||||
|
||||
OSErr QT_SaveCodecSettingsToScene(void)
|
||||
static OSErr QT_SaveCodecSettingsToScene(void)
|
||||
{
|
||||
QTAtomContainer myContainer = NULL;
|
||||
ComponentResult myErr = noErr;
|
||||
@ -179,7 +179,7 @@ bail:
|
||||
}
|
||||
|
||||
|
||||
OSErr QT_GetCodecSettingsFromScene(void)
|
||||
static OSErr QT_GetCodecSettingsFromScene(void)
|
||||
{
|
||||
Handle myHandle = NULL;
|
||||
ComponentResult myErr = noErr;
|
||||
@ -221,7 +221,7 @@ bail:
|
||||
}
|
||||
|
||||
|
||||
OSErr QT_AddUserDataTextToMovie (Movie theMovie, char *theText, OSType theType)
|
||||
static OSErr QT_AddUserDataTextToMovie (Movie theMovie, char *theText, OSType theType)
|
||||
{
|
||||
UserData myUserData = NULL;
|
||||
Handle myHandle = NULL;
|
||||
|
||||
@ -236,7 +236,7 @@ void free_anim_quicktime (struct anim *anim) {
|
||||
}
|
||||
|
||||
|
||||
OSErr QT_get_frameIndexes(struct anim *anim)
|
||||
static OSErr QT_get_frameIndexes(struct anim *anim)
|
||||
{
|
||||
int i;
|
||||
OSErr anErr = noErr;
|
||||
@ -348,7 +348,7 @@ ImBuf * qtime_fetchibuf (struct anim *anim, int position)
|
||||
|
||||
// following two functions only here to get movie pixeldepth
|
||||
|
||||
int GetFirstVideoMedia(struct anim *anim)
|
||||
static int GetFirstVideoMedia(struct anim *anim)
|
||||
{
|
||||
long numTracks;
|
||||
OSType mediaType;
|
||||
@ -370,10 +370,10 @@ int GetFirstVideoMedia(struct anim *anim)
|
||||
return 0; // went through all tracks and no video
|
||||
}
|
||||
|
||||
short GetFirstVideoTrackPixelDepth(struct anim *anim)
|
||||
static short GetFirstVideoTrackPixelDepth(struct anim *anim)
|
||||
{
|
||||
SampleDescriptionHandle imageDescH = (SampleDescriptionHandle)NewHandle(sizeof(Handle));
|
||||
long trackIndex = 0;
|
||||
// long trackIndex = 0; /*unused*/
|
||||
|
||||
if(!GetFirstVideoMedia(anim))
|
||||
return -1;
|
||||
@ -507,14 +507,16 @@ int imb_is_a_quicktime (char *name)
|
||||
GraphicsImportComponent theImporter = NULL;
|
||||
|
||||
FSSpec theFSSpec;
|
||||
Str255 dst;
|
||||
#ifdef _WIN32
|
||||
Str255 dst; /*unused*/
|
||||
#endif
|
||||
char theFullPath[255];
|
||||
|
||||
Boolean isMovieFile = false;
|
||||
AliasHandle myAlias = NULL;
|
||||
Component myImporter = NULL;
|
||||
// Boolean isMovieFile = false; /*unused*/
|
||||
// AliasHandle myAlias = NULL; /*unused*/
|
||||
// Component myImporter = NULL; /*unused*/
|
||||
#ifdef __APPLE__
|
||||
FInfo myFinderInfo;
|
||||
// FInfo myFinderInfo; /*unused*/
|
||||
FSRef myRef;
|
||||
#endif
|
||||
OSErr err = noErr;
|
||||
@ -564,7 +566,7 @@ ImBuf *imb_quicktime_decode(unsigned char *mem, int size, int flags)
|
||||
int x, y, depth;
|
||||
int have_gw = FALSE;
|
||||
ImBuf *ibuf = NULL;
|
||||
ImBuf *imbuf = NULL;
|
||||
// ImBuf *imbuf = NULL; /*unused*/
|
||||
GWorldPtr offGWorld;
|
||||
PixMapHandle myPixMap = NULL;
|
||||
|
||||
|
||||
@ -308,7 +308,7 @@ static void progressiverad_rr()
|
||||
|
||||
static RadFace *radfaces=NULL;
|
||||
|
||||
void initradfaces()
|
||||
static void initradfaces(void)
|
||||
{
|
||||
VlakRen *vlr= NULL;
|
||||
RadFace *rf;
|
||||
@ -399,8 +399,9 @@ static void vecaddfac(float *vec, float *v1, float *v2, float fac)
|
||||
|
||||
}
|
||||
|
||||
#if 0
|
||||
/* unused now, doesnt work... */
|
||||
void filter_rad_values()
|
||||
static void filter_rad_values(void)
|
||||
{
|
||||
VlakRen *vlr=NULL;
|
||||
VertRen *v1=NULL;
|
||||
@ -485,6 +486,7 @@ void filter_rad_values()
|
||||
}
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
static void make_vertex_rad_values()
|
||||
{
|
||||
|
||||
@ -366,7 +366,7 @@ static void env_layerflags(unsigned int notlay)
|
||||
}
|
||||
}
|
||||
|
||||
void env_hideobject(Object *ob)
|
||||
static void env_hideobject(Object *ob)
|
||||
{
|
||||
VlakRen *vlr = NULL;
|
||||
int a;
|
||||
|
||||
@ -831,7 +831,7 @@ static void add_to_blurbuf(int blur)
|
||||
|
||||
|
||||
/* yafray: main yafray render/export call */
|
||||
void yafrayRender()
|
||||
static void yafrayRender(void)
|
||||
{
|
||||
R.flag |= R_RENDERING; /* !!! */
|
||||
|
||||
|
||||
@ -116,6 +116,12 @@ static Octree g_oc; /* can be scene pointer or so later... */
|
||||
static int raycount, branchcount, nodecount;
|
||||
static int accepted, rejected, coherent_ray;
|
||||
|
||||
/* prototypes ------------------------ */
|
||||
void freeoctree(void);
|
||||
void makeoctree(void);
|
||||
float *test_jitter(int resol, int iter, float xsize, float ysize);
|
||||
int ray_trace_shadow_rad(ShadeInput *ship, ShadeResult *shr);
|
||||
|
||||
/* **************** ocval method ******************* */
|
||||
/* within one octree node, a set of 3x15 bits defines a 'boundbox' to OR with */
|
||||
|
||||
@ -447,7 +453,7 @@ void freeoctree(void)
|
||||
nodecount= 0;
|
||||
}
|
||||
|
||||
void makeoctree()
|
||||
void makeoctree(void)
|
||||
{
|
||||
VlakRen *vlr=NULL;
|
||||
VertRen *v1, *v2, *v3, *v4;
|
||||
@ -1848,7 +1854,7 @@ int ray_trace_shadow_rad(ShadeInput *ship, ShadeResult *shr)
|
||||
}
|
||||
|
||||
/* aolight: function to create random unit sphere vectors for total random sampling */
|
||||
void RandomSpherical(float *v)
|
||||
static void RandomSpherical(float *v)
|
||||
{
|
||||
float r;
|
||||
v[2] = 2.f*BLI_frand()-1.f;
|
||||
|
||||
@ -841,7 +841,7 @@ float Toon_Diff( float *n, float *l, float *v, float size, float smooth )
|
||||
|
||||
/* 'nl' is either dot product, or return value of area light */
|
||||
/* in latter case, only last multiplication uses 'nl' */
|
||||
float OrenNayar_Diff_i(float nl, float *n, float *l, float *v, float rough )
|
||||
static float OrenNayar_Diff_i(float nl, float *n, float *l, float *v, float rough )
|
||||
{
|
||||
float i, nh, nv, vh, realnl, h[3];
|
||||
float a, b, t, A, B;
|
||||
|
||||
@ -79,6 +79,8 @@
|
||||
#include "envmap.h"
|
||||
#include "texture.h"
|
||||
|
||||
/* prototypes */
|
||||
static int calcimanr(int cfra, Tex *tex);
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
|
||||
@ -1092,7 +1092,8 @@ static void renderZBufLine(int y, RE_COLBUFTYPE *colbuf1, RE_COLBUFTYPE *colbuf2
|
||||
static int zBufferAllFaces(void)
|
||||
{
|
||||
VlakRen *vlr=NULL;
|
||||
unsigned int zvlnr, faceCounter;
|
||||
unsigned int zvlnr;
|
||||
int faceCounter;
|
||||
int keepLooping = 1;
|
||||
float vec[3], hoco[4], mul, zval, fval;
|
||||
Material *ma=0;
|
||||
@ -1163,7 +1164,7 @@ static int zBufferAllFaces(void)
|
||||
static int zBufferAllHalos(void)
|
||||
{
|
||||
HaloRen *har = NULL;
|
||||
unsigned int haloCounter = 0;
|
||||
int haloCounter = 0;
|
||||
int dist = 0;
|
||||
int keepLooping = 1;
|
||||
short miny = 0, maxy = 0, minx = 0, maxx = 0;
|
||||
@ -1238,7 +1239,7 @@ static int fillZBufDistances()
|
||||
|
||||
|
||||
|
||||
|
||||
#if 0
|
||||
/* ------------------------------------------------------------------------- */
|
||||
/**
|
||||
* One more filler: fill in halo data in z buffer.
|
||||
@ -1248,7 +1249,7 @@ void zBufferFillHalo(void)
|
||||
{
|
||||
/* so far, intentionally empty */
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
/* Colour buffer related: */
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user