spaces -> tabs (whitespace only changes)

This commit is contained in:
Campbell Barton
2011-10-06 22:04:01 +00:00
parent f9ea19ac12
commit c27926896f
19 changed files with 113 additions and 114 deletions

View File

@@ -1939,7 +1939,7 @@ static void node_texture_buts_output(uiLayout *layout, bContext *UNUSED(C), Poin
/* only once called */ /* only once called */
static void node_texture_set_butfunc(bNodeType *ntype) static void node_texture_set_butfunc(bNodeType *ntype)
{ {
ntype->uifuncbut = NULL; ntype->uifuncbut = NULL;
if( ntype->type >= TEX_NODE_PROC && ntype->type < TEX_NODE_PROC_MAX ) { if( ntype->type >= TEX_NODE_PROC && ntype->type < TEX_NODE_PROC_MAX ) {
ntype->uifunc = node_texture_buts_proc; ntype->uifunc = node_texture_buts_proc;
} }

View File

@@ -438,39 +438,39 @@ static void draw_bonevert_solid(void)
} }
static float bone_octahedral_verts[6][3]= { static float bone_octahedral_verts[6][3]= {
{ 0.0f, 0.0f, 0.0f}, { 0.0f, 0.0f, 0.0f},
{ 0.1f, 0.1f, 0.1f}, { 0.1f, 0.1f, 0.1f},
{ 0.1f, 0.1f, -0.1f}, { 0.1f, 0.1f, -0.1f},
{-0.1f, 0.1f, -0.1f}, {-0.1f, 0.1f, -0.1f},
{-0.1f, 0.1f, 0.1f}, {-0.1f, 0.1f, 0.1f},
{ 0.0f, 1.0f, 0.0f} { 0.0f, 1.0f, 0.0f}
}; };
static unsigned int bone_octahedral_wire_sides[8]= {0, 1, 5, 3, 0, 4, 5, 2}; static unsigned int bone_octahedral_wire_sides[8]= {0, 1, 5, 3, 0, 4, 5, 2};
static unsigned int bone_octahedral_wire_square[8]= {1, 2, 3, 4, 1}; static unsigned int bone_octahedral_wire_square[8]= {1, 2, 3, 4, 1};
static unsigned int bone_octahedral_solid_tris[8][3]= { static unsigned int bone_octahedral_solid_tris[8][3]= {
{2, 1, 0}, /* bottom */ {2, 1, 0}, /* bottom */
{3, 2, 0}, {3, 2, 0},
{4, 3, 0}, {4, 3, 0},
{1, 4, 0}, {1, 4, 0},
{5, 1, 2}, /* top */ {5, 1, 2}, /* top */
{5, 2, 3}, {5, 2, 3},
{5, 3, 4}, {5, 3, 4},
{5, 4, 1} {5, 4, 1}
}; };
/* aligned with bone_octahedral_solid_tris */ /* aligned with bone_octahedral_solid_tris */
static float bone_octahedral_solid_normals[8][3]= { static float bone_octahedral_solid_normals[8][3]= {
{ 0.70710683f, -0.70710683f, 0.00000000f}, { 0.70710683f, -0.70710683f, 0.00000000f},
{-0.00000000f, -0.70710683f, -0.70710683f}, {-0.00000000f, -0.70710683f, -0.70710683f},
{-0.70710683f, -0.70710683f, 0.00000000f}, {-0.70710683f, -0.70710683f, 0.00000000f},
{ 0.00000000f, -0.70710683f, 0.70710683f}, { 0.00000000f, -0.70710683f, 0.70710683f},
{ 0.99388373f, 0.11043154f, -0.00000000f}, { 0.99388373f, 0.11043154f, -0.00000000f},
{ 0.00000000f, 0.11043154f, -0.99388373f}, { 0.00000000f, 0.11043154f, -0.99388373f},
{-0.99388373f, 0.11043154f, 0.00000000f}, {-0.99388373f, 0.11043154f, 0.00000000f},
{ 0.00000000f, 0.11043154f, 0.99388373f} { 0.00000000f, 0.11043154f, 0.99388373f}
}; };
static void draw_bone_octahedral(void) static void draw_bone_octahedral(void)

View File

@@ -98,7 +98,7 @@ class Mem_IStream: public IStream
public: public:
Mem_IStream (unsigned char *exrbuf, size_t exrsize): Mem_IStream (unsigned char *exrbuf, size_t exrsize):
IStream("dummy"), _exrpos (0), _exrsize(exrsize) { _exrbuf = exrbuf; } IStream("dummy"), _exrpos (0), _exrsize(exrsize) { _exrbuf = exrbuf; }
virtual bool read (char c[], int n); virtual bool read (char c[], int n);
virtual Int64 tellg (); virtual Int64 tellg ();
@@ -107,8 +107,8 @@ public:
//virtual ~Mem_IStream() {}; // unused //virtual ~Mem_IStream() {}; // unused
private: private:
Int64 _exrpos; Int64 _exrpos;
Int64 _exrsize; Int64 _exrsize;
unsigned char *_exrbuf; unsigned char *_exrbuf;
}; };
@@ -116,11 +116,11 @@ private:
bool Mem_IStream::read (char c[], int n) bool Mem_IStream::read (char c[], int n)
{ {
if (n + _exrpos <= _exrsize) if (n + _exrpos <= _exrsize)
{ {
memcpy(c, (void *)(&_exrbuf[_exrpos]), n); memcpy(c, (void *)(&_exrbuf[_exrpos]), n);
_exrpos += n; _exrpos += n;
return true; return true;
} }
else else
return false; return false;
} }
@@ -308,7 +308,7 @@ static int imb_save_openexr_half(struct ImBuf *ibuf, const char *name, int flags
delete [] pixels; delete [] pixels;
} }
catch (const std::exception &exc) catch (const std::exception &exc)
{ {
printf("OpenEXR-save: ERROR: %s\n", exc.what()); printf("OpenEXR-save: ERROR: %s\n", exc.what());
if (ibuf) IMB_freeImBuf(ibuf); if (ibuf) IMB_freeImBuf(ibuf);
@@ -365,7 +365,7 @@ static int imb_save_openexr_float(struct ImBuf *ibuf, const char *name, int flag
delete file; delete file;
} }
catch (const std::exception &exc) catch (const std::exception &exc)
{ {
printf("OpenEXR-save: ERROR: %s\n", exc.what()); printf("OpenEXR-save: ERROR: %s\n", exc.what());
if (ibuf) IMB_freeImBuf(ibuf); if (ibuf) IMB_freeImBuf(ibuf);

View File

@@ -40,7 +40,7 @@ void bpy_app_generic_callback(struct Main *main, struct ID *id, void *arg);
static PyTypeObject BlenderAppCbType; static PyTypeObject BlenderAppCbType;
static PyStructSequence_Field app_cb_info_fields[]= { static PyStructSequence_Field app_cb_info_fields[]= {
{(char *)"frame_change_pre", NULL}, {(char *)"frame_change_pre", NULL},
{(char *)"frame_change_post", NULL}, {(char *)"frame_change_post", NULL},
{(char *)"render_pre", NULL}, {(char *)"render_pre", NULL},
{(char *)"render_post", NULL}, {(char *)"render_post", NULL},

View File

@@ -56,13 +56,13 @@ extern BPy_StructRNA *bpy_context_module;
static EnumPropertyItem property_flag_items[]= { static EnumPropertyItem property_flag_items[]= {
{PROP_HIDDEN, "HIDDEN", 0, "Hidden", ""}, {PROP_HIDDEN, "HIDDEN", 0, "Hidden", ""},
{PROP_SKIP_SAVE, "SKIP_SAVE", 0, "Skip Save", ""}, {PROP_SKIP_SAVE, "SKIP_SAVE", 0, "Skip Save", ""},
{PROP_ANIMATABLE, "ANIMATABLE", 0, "Animateable", ""}, {PROP_ANIMATABLE, "ANIMATABLE", 0, "Animateable", ""},
{0, NULL, 0, NULL, NULL}}; {0, NULL, 0, NULL, NULL}};
static EnumPropertyItem property_flag_enum_items[]= { static EnumPropertyItem property_flag_enum_items[]= {
{PROP_HIDDEN, "HIDDEN", 0, "Hidden", ""}, {PROP_HIDDEN, "HIDDEN", 0, "Hidden", ""},
{PROP_SKIP_SAVE, "SKIP_SAVE", 0, "Skip Save", ""}, {PROP_SKIP_SAVE, "SKIP_SAVE", 0, "Skip Save", ""},
{PROP_ANIMATABLE, "ANIMATABLE", 0, "Animateable", ""}, {PROP_ANIMATABLE, "ANIMATABLE", 0, "Animateable", ""},
{PROP_ENUM_FLAG, "ENUM_FLAG", 0, "Enum Flag", ""}, {PROP_ENUM_FLAG, "ENUM_FLAG", 0, "Enum Flag", ""},
{0, NULL, 0, NULL, NULL}}; {0, NULL, 0, NULL, NULL}};
@@ -72,7 +72,7 @@ static EnumPropertyItem property_subtype_string_items[]= {
{PROP_FILEPATH, "FILE_PATH", 0, "File Path", ""}, {PROP_FILEPATH, "FILE_PATH", 0, "File Path", ""},
{PROP_DIRPATH, "DIR_PATH", 0, "Directory Path", ""}, {PROP_DIRPATH, "DIR_PATH", 0, "Directory Path", ""},
{PROP_FILENAME, "FILENAME", 0, "Filename", ""}, {PROP_FILENAME, "FILENAME", 0, "Filename", ""},
{PROP_TRANSLATE, "TRANSLATE", 0, "Translate", ""}, {PROP_TRANSLATE, "TRANSLATE", 0, "Translate", ""},
{PROP_NONE, "NONE", 0, "None", ""}, {PROP_NONE, "NONE", 0, "None", ""},
{0, NULL, 0, NULL, NULL}}; {0, NULL, 0, NULL, NULL}};

View File

@@ -54,22 +54,22 @@ public:
~BlenderWorldInfo(); ~BlenderWorldInfo();
bool hasWorld(); bool hasWorld();
bool hasMist(); bool hasMist();
float getBackColorRed(); float getBackColorRed();
float getBackColorGreen(); float getBackColorGreen();
float getBackColorBlue(); float getBackColorBlue();
float getAmbientColorRed(); float getAmbientColorRed();
float getAmbientColorGreen(); float getAmbientColorGreen();
float getAmbientColorBlue(); float getAmbientColorBlue();
float getMistStart(); float getMistStart();
float getMistDistance(); float getMistDistance();
float getMistColorRed(); float getMistColorRed();
float getMistColorGreen(); float getMistColorGreen();
float getMistColorBlue(); float getMistColorBlue();
void void
setBackColor( setBackColor(
float r, float r,
float g, float g,

View File

@@ -215,7 +215,7 @@ typedef struct PyObjectPlus_Proxy {
if(BGE_PROXY_REF(self)==NULL) { PyErr_SetString(PyExc_RuntimeError, #class_name "." #method_name "(...) - " BGE_PROXY_ERROR_MSG); return NULL; } \ if(BGE_PROXY_REF(self)==NULL) { PyErr_SetString(PyExc_RuntimeError, #class_name "." #method_name "(...) - " BGE_PROXY_ERROR_MSG); return NULL; } \
return ((class_name*)BGE_PROXY_REF(self))->Py##method_name(args, kwds); \ return ((class_name*)BGE_PROXY_REF(self))->Py##method_name(args, kwds); \
}; \ }; \
static const char method_name##_doc[]; \ static const char method_name##_doc[]; \
#define KX_PYMETHOD_DOC_VARARGS(class_name, method_name) \ #define KX_PYMETHOD_DOC_VARARGS(class_name, method_name) \
PyObject* Py##method_name(PyObject* args); \ PyObject* Py##method_name(PyObject* args); \
@@ -223,7 +223,7 @@ typedef struct PyObjectPlus_Proxy {
if(BGE_PROXY_REF(self)==NULL) { PyErr_SetString(PyExc_RuntimeError, #class_name "." #method_name "(...) - " BGE_PROXY_ERROR_MSG); return NULL; } \ if(BGE_PROXY_REF(self)==NULL) { PyErr_SetString(PyExc_RuntimeError, #class_name "." #method_name "(...) - " BGE_PROXY_ERROR_MSG); return NULL; } \
return ((class_name*)BGE_PROXY_REF(self))->Py##method_name(args); \ return ((class_name*)BGE_PROXY_REF(self))->Py##method_name(args); \
}; \ }; \
static const char method_name##_doc[]; \ static const char method_name##_doc[]; \
#define KX_PYMETHOD_DOC_O(class_name, method_name) \ #define KX_PYMETHOD_DOC_O(class_name, method_name) \
PyObject* Py##method_name(PyObject* value); \ PyObject* Py##method_name(PyObject* value); \
@@ -231,7 +231,7 @@ typedef struct PyObjectPlus_Proxy {
if(BGE_PROXY_REF(self)==NULL) { PyErr_SetString(PyExc_RuntimeError, #class_name "." #method_name "(value) - " BGE_PROXY_ERROR_MSG); return NULL; } \ if(BGE_PROXY_REF(self)==NULL) { PyErr_SetString(PyExc_RuntimeError, #class_name "." #method_name "(value) - " BGE_PROXY_ERROR_MSG); return NULL; } \
return ((class_name*)BGE_PROXY_REF(self))->Py##method_name(value); \ return ((class_name*)BGE_PROXY_REF(self))->Py##method_name(value); \
}; \ }; \
static const char method_name##_doc[]; \ static const char method_name##_doc[]; \
#define KX_PYMETHOD_DOC_NOARGS(class_name, method_name) \ #define KX_PYMETHOD_DOC_NOARGS(class_name, method_name) \
PyObject* Py##method_name(); \ PyObject* Py##method_name(); \
@@ -239,7 +239,7 @@ typedef struct PyObjectPlus_Proxy {
if(BGE_PROXY_REF(self)==NULL) { PyErr_SetString(PyExc_RuntimeError, #class_name "." #method_name "() - " BGE_PROXY_ERROR_MSG); return NULL; } \ if(BGE_PROXY_REF(self)==NULL) { PyErr_SetString(PyExc_RuntimeError, #class_name "." #method_name "() - " BGE_PROXY_ERROR_MSG); return NULL; } \
return ((class_name*)BGE_PROXY_REF(self))->Py##method_name(); \ return ((class_name*)BGE_PROXY_REF(self))->Py##method_name(); \
}; \ }; \
static const char method_name##_doc[]; \ static const char method_name##_doc[]; \
/* The line above should remain empty */ /* The line above should remain empty */

View File

@@ -134,7 +134,7 @@ PyTypeObject SCA_2DFilterActuator::Type = {
PyMethodDef SCA_2DFilterActuator::Methods[] = { PyMethodDef SCA_2DFilterActuator::Methods[] = {
/* add python functions to deal with m_msg... */ /* add python functions to deal with m_msg... */
{NULL,NULL} {NULL,NULL}
}; };
PyAttributeDef SCA_2DFilterActuator::Attributes[] = { PyAttributeDef SCA_2DFilterActuator::Attributes[] = {

View File

@@ -38,7 +38,7 @@
class SCA_2DFilterActuator : public SCA_IActuator class SCA_2DFilterActuator : public SCA_IActuator
{ {
Py_Header; Py_Header;
private: private:
vector<STR_String> m_propNames; vector<STR_String> m_propNames;

View File

@@ -57,22 +57,21 @@ class KX_Dome
{ {
public: public:
/// constructor /// constructor
KX_Dome ( KX_Dome (RAS_ICanvas* m_canvas,
RAS_ICanvas* m_canvas, /// rasterizer
/// rasterizer RAS_IRasterizer* m_rasterizer,
RAS_IRasterizer* m_rasterizer, /// render tools
/// render tools RAS_IRenderTools* m_rendertools,
RAS_IRenderTools* m_rendertools, /// engine
/// engine KX_KetsjiEngine* m_engine,
KX_KetsjiEngine* m_engine,
short res, short res,
short mode, short mode,
short angle, short angle,
float resbuf, float resbuf,
short tilt, short tilt,
struct Text* warptext struct Text* warptext
); );
/// destructor /// destructor
virtual ~KX_Dome (void); virtual ~KX_Dome (void);
@@ -180,14 +179,14 @@ protected:
/// rendered scene /// rendered scene
KX_Scene * m_scene; KX_Scene * m_scene;
/// canvas /// canvas
RAS_ICanvas* m_canvas; RAS_ICanvas* m_canvas;
/// rasterizer /// rasterizer
RAS_IRasterizer* m_rasterizer; RAS_IRasterizer* m_rasterizer;
/// render tools /// render tools
RAS_IRenderTools* m_rendertools; RAS_IRenderTools* m_rendertools;
/// engine /// engine
KX_KetsjiEngine* m_engine; KX_KetsjiEngine* m_engine;
#ifdef WITH_CXX_GUARDEDALLOC #ifdef WITH_CXX_GUARDEDALLOC

View File

@@ -41,12 +41,12 @@ class KX_IScalarInterpolator;
class KX_OrientationInterpolator : public KX_IInterpolator { class KX_OrientationInterpolator : public KX_IInterpolator {
public: public:
KX_OrientationInterpolator(MT_Matrix3x3& target, KX_OrientationInterpolator(MT_Matrix3x3& target,
KX_IScalarInterpolator **ipos) KX_IScalarInterpolator **ipos)
: m_target(target) : m_target(target)
{ {
m_ipos[0] = ipos[0]; m_ipos[0] = ipos[0];
m_ipos[1] = ipos[1]; m_ipos[1] = ipos[1];
m_ipos[2] = ipos[2]; m_ipos[2] = ipos[2];
} }

View File

@@ -66,7 +66,7 @@ protected:
btIDebugDraw* m_debugDrawer; btIDebugDraw* m_debugDrawer;
class btDefaultCollisionConfiguration* m_collisionConfiguration; class btDefaultCollisionConfiguration* m_collisionConfiguration;
class btBroadphaseInterface* m_broadphase; // broadphase for dynamic world class btBroadphaseInterface* m_broadphase; // broadphase for dynamic world
// for culling only // for culling only
btOverlappingPairCache* m_cullingCache; btOverlappingPairCache* m_cullingCache;
struct btDbvtBroadphase* m_cullingTree; // broadphase for culling struct btDbvtBroadphase* m_cullingTree; // broadphase for culling

View File

@@ -207,7 +207,7 @@ public:
* @return true if stereo mode is enabled. * @return true if stereo mode is enabled.
*/ */
virtual bool Stereo()=0; virtual bool Stereo()=0;
virtual StereoMode GetStereoMode()=0; virtual StereoMode GetStereoMode()=0;
virtual bool InterlacedStereo()=0; virtual bool InterlacedStereo()=0;
/** /**
* Sets which eye buffer subsequent primitives will be rendered to. * Sets which eye buffer subsequent primitives will be rendered to.

View File

@@ -39,7 +39,7 @@ void main(void)
{ {
vec4 texcolor = texture2D(bgl_RenderedTexture, gl_TexCoord[0].st); vec4 texcolor = texture2D(bgl_RenderedTexture, gl_TexCoord[0].st);
float gray = dot(texcolor.rgb, vec3(0.299, 0.587, 0.114)); float gray = dot(texcolor.rgb, vec3(0.299, 0.587, 0.114));
gl_FragColor = vec4(gray, gray, gray, texcolor.a); gl_FragColor = vec4(gray, gray, gray, texcolor.a);
} }
); );
#endif #endif

View File

@@ -37,9 +37,9 @@ uniform sampler2D bgl_RenderedTexture;
void main(void) void main(void)
{ {
vec4 texcolor = texture2D(bgl_RenderedTexture, gl_TexCoord[0].st); vec4 texcolor = texture2D(bgl_RenderedTexture, gl_TexCoord[0].st);
gl_FragColor.rgb = 1.0 - texcolor.rgb; gl_FragColor.rgb = 1.0 - texcolor.rgb;
gl_FragColor.a = texcolor.a; gl_FragColor.a = texcolor.a;
} }
); );
#endif #endif

View File

@@ -149,7 +149,7 @@ public:
virtual void SetRenderArea(); virtual void SetRenderArea();
virtual void SetStereoMode(const StereoMode stereomode); virtual void SetStereoMode(const StereoMode stereomode);
virtual RAS_IRasterizer::StereoMode GetStereoMode(); virtual RAS_IRasterizer::StereoMode GetStereoMode();
virtual bool Stereo(); virtual bool Stereo();
virtual bool InterlacedStereo(); virtual bool InterlacedStereo();
virtual void SetEye(const StereoEye eye); virtual void SetEye(const StereoEye eye);

View File

@@ -245,10 +245,10 @@ public:
} }
} }
virtual ~SG_DListHead() {} virtual ~SG_DListHead() {}
T* Remove() T* Remove()
{ {
return static_cast<T*>(SG_DList::Remove()); return static_cast<T*>(SG_DList::Remove());
} }
}; };

View File

@@ -52,42 +52,42 @@ public:
virtual ~ImageRender (void); virtual ~ImageRender (void);
/// get background color /// get background color
int getBackground (int idx) { return (idx < 0 || idx > 3) ? 0 : int(m_background[idx]*255.f); } int getBackground (int idx) { return (idx < 0 || idx > 3) ? 0 : int(m_background[idx]*255.f); }
/// set background color /// set background color
void setBackground (int red, int green, int blue, int alpha); void setBackground (int red, int green, int blue, int alpha);
/// clipping distance /// clipping distance
float getClip (void) { return m_clip; } float getClip (void) { return m_clip; }
/// set whole buffer use /// set whole buffer use
void setClip (float clip) { m_clip = clip; } void setClip (float clip) { m_clip = clip; }
protected: protected:
/// true if ready to render /// true if ready to render
bool m_render; bool m_render;
/// rendered scene /// rendered scene
KX_Scene * m_scene; KX_Scene * m_scene;
/// camera for render /// camera for render
KX_Camera * m_camera; KX_Camera * m_camera;
/// do we own the camera? /// do we own the camera?
bool m_owncamera; bool m_owncamera;
/// for mirror operation /// for mirror operation
KX_GameObject * m_observer; KX_GameObject * m_observer;
KX_GameObject * m_mirror; KX_GameObject * m_mirror;
float m_clip; // clipping distance float m_clip; // clipping distance
float m_mirrorHalfWidth; // mirror width in mirror space float m_mirrorHalfWidth; // mirror width in mirror space
float m_mirrorHalfHeight; // mirror height in mirror space float m_mirrorHalfHeight; // mirror height in mirror space
MT_Point3 m_mirrorPos; // mirror center position in local space MT_Point3 m_mirrorPos; // mirror center position in local space
MT_Vector3 m_mirrorZ; // mirror Z axis in local space MT_Vector3 m_mirrorZ; // mirror Z axis in local space
MT_Vector3 m_mirrorY; // mirror Y axis in local space MT_Vector3 m_mirrorY; // mirror Y axis in local space
MT_Vector3 m_mirrorX; // mirror X axis in local space MT_Vector3 m_mirrorX; // mirror X axis in local space
/// canvas /// canvas
RAS_ICanvas* m_canvas; RAS_ICanvas* m_canvas;
/// rasterizer /// rasterizer
RAS_IRasterizer* m_rasterizer; RAS_IRasterizer* m_rasterizer;
/// render tools /// render tools
RAS_IRenderTools* m_rendertools; RAS_IRenderTools* m_rendertools;
/// engine /// engine
KX_KetsjiEngine* m_engine; KX_KetsjiEngine* m_engine;
/// background color /// background color
float m_background[4]; float m_background[4];

View File

@@ -51,7 +51,7 @@ public:
/// is alpha channel used /// is alpha channel used
bool getAlpha (void) { return m_alpha; } bool getAlpha (void) { return m_alpha; }
/// set whole buffer use /// set whole buffer use
void setAlpha (bool alpha) { m_alpha = alpha; } void setAlpha (bool alpha) { m_alpha = alpha; }
/// get capture size in viewport /// get capture size in viewport
short * getCaptureSize (void) { return m_capSize; } short * getCaptureSize (void) { return m_capSize; }
@@ -71,8 +71,8 @@ protected:
short m_capSize[2]; short m_capSize[2];
/// use whole viewport /// use whole viewport
bool m_whole; bool m_whole;
/// use alpha channel /// use alpha channel
bool m_alpha; bool m_alpha;
/// position of capture rectangle in viewport /// position of capture rectangle in viewport
GLint m_position[2]; GLint m_position[2];