Commit 2b067aab authored by hybrid's avatar hybrid

Some more whitespace adjustment.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4502 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 9f7227b7
...@@ -131,7 +131,6 @@ namespace gui ...@@ -131,7 +131,6 @@ namespace gui
//! Sets whether to draw the background //! Sets whether to draw the background
virtual void setDrawBackground(bool draw); virtual void setDrawBackground(bool draw);
private: private:
struct ListItem struct ListItem
......
...@@ -53,7 +53,7 @@ public: ...@@ -53,7 +53,7 @@ public:
private: private:
#ifdef _IRR_COMPILE_WITH_LIBJPEG_ #ifdef _IRR_COMPILE_WITH_LIBJPEG_
// several methods used via function pointers by jpeglib // several methods used via function pointers by jpeglib
/* Receives control for a fatal error. Information sufficient to /* Receives control for a fatal error. Information sufficient to
......
...@@ -60,12 +60,11 @@ namespace video ...@@ -60,12 +60,11 @@ namespace video
typedef struct _RGBdata typedef struct _RGBdata
{ {
u8 *tmp, u8 *tmp;
*tmpR, u8 *tmpR;
*tmpG, u8 *tmpG;
*tmpB, u8 *tmpB;
*tmpA; u8 *tmpA;
u32 *StartTable; // compressed data table, holds file offsets u32 *StartTable; // compressed data table, holds file offsets
u32 *LengthTable; // length for the above data, hold lengths for above u32 *LengthTable; // length for the above data, hold lengths for above
......
...@@ -212,8 +212,8 @@ namespace irr ...@@ -212,8 +212,8 @@ namespace irr
core::position2d<s32> CursorPos; core::position2d<s32> CursorPos;
core::dimension2d<u32> WindowSize; core::dimension2d<u32> WindowSize;
core::dimension2d<f32> InvWindowSize; core::dimension2d<f32> InvWindowSize;
bool IsVisible, bool IsVisible;
UseReferenceRect; bool UseReferenceRect;
core::rect<s32> ReferenceRect; core::rect<s32> ReferenceRect;
}; };
......
...@@ -39,7 +39,6 @@ public: ...@@ -39,7 +39,6 @@ public:
virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype)
{ {
Driver->setTextureRenderStates(Driver->getCurrentMaterial(), false, true); Driver->setTextureRenderStates(Driver->getCurrentMaterial(), false, true);
return true; return true;
} }
......
...@@ -40,7 +40,8 @@ public: ...@@ -40,7 +40,8 @@ public:
virtual bool isALoadableFileFormat(io::IReadFile *file) const; virtual bool isALoadableFileFormat(io::IReadFile *file) const;
//! Loads the scene into the scene manager. //! Loads the scene into the scene manager.
virtual bool loadScene(io::IReadFile* file, ISceneUserDataSerializer* userDataSerializer=0, virtual bool loadScene(io::IReadFile* file,
ISceneUserDataSerializer* userDataSerializer=0,
ISceneNode* rootNode=0); ISceneNode* rootNode=0);
private: private:
......
...@@ -259,9 +259,7 @@ namespace scene ...@@ -259,9 +259,7 @@ namespace scene
core::array<f64> LODDistanceThreshold; core::array<f64> LODDistanceThreshold;
}; };
virtual void preRenderCalculationsIfNeeded(); virtual void preRenderCalculationsIfNeeded();
virtual void preRenderLODCalculations(); virtual void preRenderLODCalculations();
virtual void preRenderIndicesCalculations(); virtual void preRenderIndicesCalculations();
......
...@@ -82,8 +82,10 @@ namespace scene ...@@ -82,8 +82,10 @@ namespace scene
video::SColor FootColor; // Color at the source video::SColor FootColor; // Color at the source
video::SColor TailColor; // Color at the end. video::SColor TailColor; // Color at the end.
core::vector3df LightDimensions; // LightDimensions.Y Distance of shooting -- Length of beams // LightDimensions.Y Distance of shooting -- Length of beams
// LightDimensions.X and LightDimensions.Z determine the size/dimension of the plane // LightDimensions.X and LightDimensions.Z determine the
// size/dimension of the plane
core::vector3df LightDimensions;
}; };
} // end namespace scene } // end namespace scene
......
...@@ -566,8 +566,9 @@ private: ...@@ -566,8 +566,9 @@ private:
long size = callback->getSize(); long size = callback->getSize();
if (size<0) if (size<0)
return false; return false;
size += 4; // We need four terminating 0's at the end. // We need four terminating 0's at the end.
// For ASCII we need 1 0's, for UTF-16 2, for UTF-32 4. // For ASCII we need 1 0's, for UTF-16 2, for UTF-32 4.
size += 4;
char* data8 = new char[size]; char* data8 = new char[size];
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include "SMaterial.h" #include "SMaterial.h"
namespace irr namespace irr
{ {
...@@ -751,8 +750,7 @@ inline void getTexel_fix ( tFixPoint &r, tFixPoint &g, tFixPoint &b, ...@@ -751,8 +750,7 @@ inline void getTexel_fix ( tFixPoint &r, tFixPoint &g, tFixPoint &b,
// get video sample to fixpoint // get video sample to fixpoint
REALINLINE void getTexel_fix ( tFixPoint &a, REALINLINE void getTexel_fix ( tFixPoint &a,
const sInternalTexture * t, const tFixPointu tx, const tFixPointu ty const sInternalTexture * t, const tFixPointu tx, const tFixPointu ty)
)
{ {
u32 ofs; u32 ofs;
...@@ -889,16 +887,24 @@ REALINLINE void getSample_texture ( tFixPoint &r, tFixPoint &g, tFixPoint &b, ...@@ -889,16 +887,24 @@ REALINLINE void getSample_texture ( tFixPoint &r, tFixPoint &g, tFixPoint &b,
o3 = ( (tx+FIX_POINT_ONE) & t->textureXMask ) >> ( FIX_POINT_PRE - VIDEO_SAMPLE_GRANULARITY ); o3 = ( (tx+FIX_POINT_ONE) & t->textureXMask ) >> ( FIX_POINT_PRE - VIDEO_SAMPLE_GRANULARITY );
t00 = *((tVideoSample*)( (u8*) t->data + (o0 | o2 ) )); t00 = *((tVideoSample*)( (u8*) t->data + (o0 | o2 ) ));
r00 = (t00 & MASK_R) >> SHIFT_R; g00 = (t00 & MASK_G) >> SHIFT_G; b00 = (t00 & MASK_B); r00 = (t00 & MASK_R) >> SHIFT_R;
g00 = (t00 & MASK_G) >> SHIFT_G;
b00 = (t00 & MASK_B);
t00 = *((tVideoSample*)( (u8*) t->data + (o0 | o3 ) )); t00 = *((tVideoSample*)( (u8*) t->data + (o0 | o3 ) ));
r10 = (t00 & MASK_R) >> SHIFT_R; g10 = (t00 & MASK_G) >> SHIFT_G; b10 = (t00 & MASK_B); r10 = (t00 & MASK_R) >> SHIFT_R;
g10 = (t00 & MASK_G) >> SHIFT_G;
b10 = (t00 & MASK_B);
t00 = *((tVideoSample*)( (u8*) t->data + (o1 | o2 ) )); t00 = *((tVideoSample*)( (u8*) t->data + (o1 | o2 ) ));
r01 = (t00 & MASK_R) >> SHIFT_R; g01 = (t00 & MASK_G) >> SHIFT_G; b01 = (t00 & MASK_B); r01 = (t00 & MASK_R) >> SHIFT_R;
g01 = (t00 & MASK_G) >> SHIFT_G;
b01 = (t00 & MASK_B);
t00 = *((tVideoSample*)( (u8*) t->data + (o1 | o3 ) )); t00 = *((tVideoSample*)( (u8*) t->data + (o1 | o3 ) ));
r11 = (t00 & MASK_R) >> SHIFT_R; g11 = (t00 & MASK_G) >> SHIFT_G; b11 = (t00 & MASK_B); r11 = (t00 & MASK_R) >> SHIFT_R;
g11 = (t00 & MASK_G) >> SHIFT_G;
b11 = (t00 & MASK_B);
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment