From d2dca1f1feabc98079f61903b310a8b2d1214b5f Mon Sep 17 00:00:00 2001 From: hybrid Date: Mon, 27 Oct 2008 17:52:41 +0000 Subject: [PATCH] Reindentation. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1655 dfc29bdd-3216-0410-991c-e03cc46cb475 --- source/Irrlicht/CGUIColorSelectDialog.cpp | 133 +++++++++------------ source/Irrlicht/CQ3LevelMesh.cpp | 8 +- source/Irrlicht/CQuake3ShaderSceneNode.cpp | 6 +- source/Irrlicht/CSceneManager.h | 9 +- 4 files changed, 66 insertions(+), 90 deletions(-) diff --git a/source/Irrlicht/CGUIColorSelectDialog.cpp b/source/Irrlicht/CGUIColorSelectDialog.cpp index e6f9ccb5..283e1731 100644 --- a/source/Irrlicht/CGUIColorSelectDialog.cpp +++ b/source/Irrlicht/CGUIColorSelectDialog.cpp @@ -46,14 +46,15 @@ static const sTemplate Template [] = { L"L:", L"0", L"%",180,255, 0, 100 }, }; + //! constructor -CGUIColorSelectDialog::CGUIColorSelectDialog( const wchar_t* title, IGUIEnvironment* environment, IGUIElement* parent, s32 id) -: IGUIColorSelectDialog(environment, parent, id, - core::rect((parent->getAbsolutePosition().getWidth()-CSD_WIDTH)/2, - (parent->getAbsolutePosition().getHeight()-CSD_HEIGHT)/2, - (parent->getAbsolutePosition().getWidth()-CSD_WIDTH)/2+CSD_WIDTH, - (parent->getAbsolutePosition().getHeight()-CSD_HEIGHT)/2+CSD_HEIGHT)), - Dragging(false) +CGUIColorSelectDialog::CGUIColorSelectDialog(const wchar_t* title, IGUIEnvironment* environment, IGUIElement* parent, s32 id) + : IGUIColorSelectDialog(environment, parent, id, + core::rect((parent->getAbsolutePosition().getWidth()-CSD_WIDTH)/2, + (parent->getAbsolutePosition().getHeight()-CSD_HEIGHT)/2, + (parent->getAbsolutePosition().getWidth()-CSD_WIDTH)/2+CSD_WIDTH, + (parent->getAbsolutePosition().getHeight()-CSD_HEIGHT)/2+CSD_HEIGHT)), + Dragging(false) { #ifdef _DEBUG IGUIElement::setDebugName("CGUIColorSelectDialog"); @@ -62,12 +63,11 @@ CGUIColorSelectDialog::CGUIColorSelectDialog( const wchar_t* title, IGUIEnvironm Text = title; IGUISkin* skin = Environment->getSkin(); - core::rect rec; - s32 buttonw = environment->getSkin()->getSize(EGDS_WINDOW_BUTTON_WIDTH); - s32 posx = RelativeRect.getWidth() - buttonw - 4; + const s32 buttonw = environment->getSkin()->getSize(EGDS_WINDOW_BUTTON_WIDTH); + const s32 posx = RelativeRect.getWidth() - buttonw - 4; - CloseButton = Environment->addButton(core::rect(posx, 3, posx + buttonw, 3 + buttonw), + CloseButton = Environment->addButton(core::rect(posx, 3, posx + buttonw, 3 + buttonw), this, -1, L"", skin ? skin->getDefaultText(EGDT_WINDOW_CLOSE) : L"Close"); if (skin && skin->getSpriteBank()) { @@ -77,35 +77,33 @@ CGUIColorSelectDialog::CGUIColorSelectDialog( const wchar_t* title, IGUIEnvironm } CloseButton->setSubElement(true); CloseButton->setTabStop(false); - CloseButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT); + CloseButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT); CloseButton->grab(); OKButton = Environment->addButton( core::rect(RelativeRect.getWidth()-80, 30, RelativeRect.getWidth()-10, 50), this, -1, skin ? skin->getDefaultText(EGDT_MSG_BOX_OK) : L"OK"); OKButton->setSubElement(true); - OKButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT); + OKButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT); OKButton->grab(); CancelButton = Environment->addButton( - core::rect(RelativeRect.getWidth()-80, 55, RelativeRect.getWidth()-10, 75), + core::rect(RelativeRect.getWidth()-80, 55, RelativeRect.getWidth()-10, 75), this, -1, skin ? skin->getDefaultText(EGDT_MSG_BOX_CANCEL) : L"Cancel"); CancelButton->setSubElement(true); - CancelButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT); + CancelButton->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_UPPERLEFT); CancelButton->grab(); - core::rect r; - video::IVideoDriver* driver = Environment->getVideoDriver(); ColorRing.Texture = driver->getTexture ( "#colorring" ); if ( 0 == ColorRing.Texture ) { - buildColorRing(core::dimension2d(128, 128), 1, + buildColorRing(core::dimension2d(128, 128), 1, Environment->getSkin()->getColor(EGDC_3D_SHADOW).color); } - r.UpperLeftCorner.X = 20; - r.UpperLeftCorner.Y = 20; + core::rect r(20,20, 0,0); + ColorRing.Control = Environment->addImage(ColorRing.Texture, r.UpperLeftCorner, true, this); ColorRing.Control->setSubElement(true); ColorRing.Control->grab(); @@ -118,7 +116,7 @@ CGUIColorSelectDialog::CGUIColorSelectDialog( const wchar_t* title, IGUIEnvironm r.UpperLeftCorner.Y = Template[i].y; r.LowerRightCorner.X = r.UpperLeftCorner.X + 15; r.LowerRightCorner.Y = r.UpperLeftCorner.Y + 20; - IGUIElement *t = Environment->addStaticText( Template[i].pre, r, false, false, this); + IGUIElement *t = Environment->addStaticText(Template[i].pre, r, false, false, this); t->setSubElement(true); } @@ -162,7 +160,6 @@ CGUIColorSelectDialog::CGUIColorSelectDialog( const wchar_t* title, IGUIEnvironm } - //! destructor CGUIColorSelectDialog::~CGUIColorSelectDialog() { @@ -177,47 +174,34 @@ CGUIColorSelectDialog::~CGUIColorSelectDialog() for ( u32 i = 0; i != Battery.size ();++i ) { - Battery[i].Edit->drop (); - Battery[i].Scrollbar->drop (); + Battery[i].Edit->drop(); + Battery[i].Scrollbar->drop(); } - if ( ColorRing.Control ) - { - ColorRing.Control->drop (); - } + if (ColorRing.Control) + ColorRing.Control->drop(); } + //! renders a antialiased, colored ring void CGUIColorSelectDialog::buildColorRing( const core::dimension2d & dim, s32 supersample, const u32 borderColor ) { - video::CImage *RawTexture; - - core::dimension2d d; - d.Width = dim.Width * supersample; - d.Height = dim.Height * supersample; - - RawTexture = new video::CImage ( video::ECF_A8R8G8B8, d ); + const core::dimension2d d(dim.Width * supersample, dim.Height * supersample); + video::CImage *RawTexture = new video::CImage(video::ECF_A8R8G8B8, d); RawTexture->fill ( 0x00808080 ); - u8 * data= (u8*) RawTexture->lock(); - const u32 pitch = RawTexture->getPitch (); - - s32 radiusOut = ( d.Width / 2 ) - 4; + const u32 pitch = RawTexture->getPitch(); + const s32 radiusOut = ( d.Width / 2 ) - 4; const s32 fullR2 = radiusOut * radiusOut; - + video::SColor rgb(0xFF000000); video::SColorHSL hsl; - video::SColor rgb; - - rgb.color = 0xFF000000; hsl.Luminance = 0.5f; hsl.Saturation = 1.f; - - core::position2d p; u32 *dst; for ( p.Y = -radiusOut; p.Y <= radiusOut; p.Y += 1 ) @@ -237,25 +221,24 @@ void CGUIColorSelectDialog::buildColorRing( const core::dimension2d & dim, { // dotproduct u ( x,y ) * v ( 1, 0 ) = cosinus(a) - f32 r = (f32) sqrt ( (f32) r2 ); + const f32 r = sqrtf((f32) r2); // normalize, dotproduct = xnorm - f32 t = (f32) 1.0 / r; - f32 xn = -p.X * t; + const f32 xn = -p.X * core::reciprocal(r); - hsl.Hue = (f32) acos ( xn ); + hsl.Hue = acosf(xn); if ( p.Y > 0 ) hsl.Hue = (2.f * core::PI ) - hsl.Hue; hsl.Hue -= core::PI / 2.f; - f32 rTest = r / radiusOut; + const f32 rTest = r / radiusOut; /* if ( rTest < 0.25f ) { hsl.Luminance = rTest / 0.25f; hsl.Saturation = 0.f; - hsl.settoRGB ( rgb ); + hsl.toRGB ( rgb ); *dst = rgb.color; } else @@ -264,7 +247,7 @@ void CGUIColorSelectDialog::buildColorRing( const core::dimension2d & dim, hsl.Saturation = ( rTest - 0.25f ) / 0.15f; hsl.Luminance = 1.f - ( hsl.Saturation / 2.4f ); hsl.Luminance = 0.5f; - hsl.settoRGB ( rgb ); + hsl.toRGB ( rgb ); // *dst = rgb.color; } else @@ -272,7 +255,7 @@ void CGUIColorSelectDialog::buildColorRing( const core::dimension2d & dim, { hsl.Luminance = 0.5f; hsl.Saturation = 1.f; - hsl.settoRGB ( rgb ); + hsl.toRGB ( rgb ); *dst = rgb.color; } else @@ -280,7 +263,7 @@ void CGUIColorSelectDialog::buildColorRing( const core::dimension2d & dim, { hsl.Luminance = 0.5f - ( ( rTest - 0.75f ) / 0.75f ); hsl.Saturation = 1.f; - hsl.settoRGB ( rgb ); + hsl.toRGB ( rgb ); *dst = rgb.color; } */ @@ -305,10 +288,8 @@ void CGUIColorSelectDialog::buildColorRing( const core::dimension2d & dim, alpha = 255 - alpha; *dst = *dst & 0x00ffffff | (alpha << 24); } - } } - } RawTexture->unlock (); @@ -316,26 +297,23 @@ void CGUIColorSelectDialog::buildColorRing( const core::dimension2d & dim, if ( supersample > 1 ) { video::CImage * filter = new video::CImage(video::ECF_A8R8G8B8, dim ); - RawTexture->copyToScalingBoxFilter ( filter, 0 ); - RawTexture->drop (); + RawTexture->copyToScalingBoxFilter(filter, 0); + RawTexture->drop(); RawTexture = filter; } - video::IVideoDriver* driver = Environment->getVideoDriver(); - bool generateMipLevels = driver->getTextureCreationFlag( video::ETCF_CREATE_MIP_MAPS ); + bool generateMipLevels = driver->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS); driver->setTextureCreationFlag( video::ETCF_CREATE_MIP_MAPS, false); - ColorRing.Texture = driver->addTexture ( "#colorring", RawTexture ); - RawTexture->drop (); - - driver->setTextureCreationFlag( video::ETCF_CREATE_MIP_MAPS, generateMipLevels); + ColorRing.Texture = driver->addTexture ("#colorring", RawTexture); + RawTexture->drop(); + driver->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS, generateMipLevels); } - //! called if an event happened. bool CGUIColorSelectDialog::OnEvent(const SEvent& event) { @@ -352,10 +330,8 @@ bool CGUIColorSelectDialog::OnEvent(const SEvent& event) { if ( event.GUIEvent.Caller == Battery[i].Scrollbar ) { - s32 pos = Battery[i].Scrollbar->getPos (); - s32 value = Template[i].range_down + ( pos ); - core::stringw s ( value ); - Battery[i].Edit->setText ( s.c_str() ); + const s32 value = Template[i].range_down + Battery[i].Scrollbar->getPos(); + Battery[i].Edit->setText(core::stringw(value).c_str()); } } return true; @@ -385,7 +361,6 @@ bool CGUIColorSelectDialog::OnEvent(const SEvent& event) case EGET_LISTBOX_SELECTED_AGAIN: default: break; - } break; case EET_MOUSE_INPUT_EVENT: @@ -437,11 +412,8 @@ void CGUIColorSelectDialog::draw() return; IGUISkin* skin = Environment->getSkin(); - - core::rect rect = AbsoluteRect; - - rect = skin->draw3DWindowBackground(this, true, skin->getColor(EGDC_ACTIVE_BORDER), - rect, &AbsoluteClippingRect); + core::rect rect = skin->draw3DWindowBackground(this, true, skin->getColor(EGDC_ACTIVE_BORDER), + AbsoluteRect, &AbsoluteClippingRect); if (Text.size()) { @@ -450,16 +422,18 @@ void CGUIColorSelectDialog::draw() IGUIFont* font = skin->getFont(EGDF_WINDOW); if (font) - font->draw(Text.c_str(), rect, skin->getColor(EGDC_ACTIVE_CAPTION), false, true, + font->draw(Text.c_str(), rect, skin->getColor(EGDC_ACTIVE_CAPTION), false, true, &AbsoluteClippingRect); } + IGUIFont* font = Environment->getBuiltInFont(); + if (font) + font->draw(L"+", core::rect(20,20,50,50), video::SColor(), false, false, + &AbsoluteClippingRect); IGUIElement::draw(); } - - //! sends the event that the file has been selected. void CGUIColorSelectDialog::sendSelectedEvent() { @@ -471,6 +445,7 @@ void CGUIColorSelectDialog::sendSelectedEvent() Parent->OnEvent(event); } + //! sends the event that the file choose process has been canceld void CGUIColorSelectDialog::sendCancelEvent() { @@ -482,7 +457,9 @@ void CGUIColorSelectDialog::sendCancelEvent() Parent->OnEvent(event); } + } // end namespace gui } // end namespace irr #endif // _IRR_COMPILE_WITH_GUI_ + diff --git a/source/Irrlicht/CQ3LevelMesh.cpp b/source/Irrlicht/CQ3LevelMesh.cpp index feff248c..cf28c766 100644 --- a/source/Irrlicht/CQ3LevelMesh.cpp +++ b/source/Irrlicht/CQ3LevelMesh.cpp @@ -137,7 +137,7 @@ bool CQ3LevelMesh::loadFile(io::IReadFile* file) loadBrushes(&Lumps[kBrushes], file); // load the brushes of the BSP loadBrushSides(&Lumps[kBrushSides], file); // load the brushsides of the BSP loadLeafBrushes(&Lumps[kLeafBrushes], file); // load the brushes of the leaf - loadShaders(&Lumps[kShaders], file ); // load the shaderes + loadShaders(&Lumps[kShaders], file ); // load the shaders PatchTesselation = 8; @@ -1540,7 +1540,7 @@ void CQ3LevelMesh::InitShader() } -//!. script callback for shaders +//! script callback for shaders //! i'm having troubles with the reference counting, during callback.. resorting.. void CQ3LevelMesh::ReleaseShader() { @@ -1552,6 +1552,7 @@ void CQ3LevelMesh::ReleaseShader() ShaderFile.clear(); } + void CQ3LevelMesh::ReleaseEntity() { for ( u32 i = 0; i!= Entity.size(); ++i ) @@ -1559,7 +1560,6 @@ void CQ3LevelMesh::ReleaseEntity() Entity[i].VarGroup->drop(); } Entity.clear(); - } @@ -1571,7 +1571,6 @@ void CQ3LevelMesh::scriptcallback_entity( quake3::SVarGroupList *& grouplist ) if ( grouplist->VariableGroup.size() != 2 ) return; - element.name = grouplist->VariableGroup[1].get( "classname" ); grouplist->grab(); @@ -1692,6 +1691,7 @@ void CQ3LevelMesh::loadTextures() } } + // delete all buffers without geometry in it. void CQ3LevelMesh::cleanMeshes() { diff --git a/source/Irrlicht/CQuake3ShaderSceneNode.cpp b/source/Irrlicht/CQuake3ShaderSceneNode.cpp index 8f972adb..4527c855 100644 --- a/source/Irrlicht/CQuake3ShaderSceneNode.cpp +++ b/source/Irrlicht/CQuake3ShaderSceneNode.cpp @@ -247,7 +247,6 @@ void CQuake3ShaderSceneNode::render() { video::IVideoDriver* driver = SceneManager->getVideoDriver(); - bool isTransparentPass = SceneManager->getSceneNodeRenderPass() == scene::ESNRP_TRANSPARENT; @@ -270,7 +269,7 @@ void CQuake3ShaderSceneNode::render() for ( u32 stage = 0; stage < Shader->VarGroup->VariableGroup.size(); ++stage ) //for ( u32 stage = 2; stage < 3; ++stage ) { - SQ3Texture &q = Q3Texture [ stage]; + SQ3Texture &q = Q3Texture[stage]; // advance current stage core::matrix4 texture; @@ -283,7 +282,7 @@ void CQuake3ShaderSceneNode::render() // current stage group = Shader->getGroup( stage ); - material.setTexture(0, q.Texture [ q.TextureIndex ]); + material.setTexture(0, q.Texture[ q.TextureIndex ]); material.ZBuffer = quake3::getDepthFunction( group->get( "depthfunc" ) ); if ( group->getIndex( "depthwrite" ) >= 0 ) @@ -321,7 +320,6 @@ void CQuake3ShaderSceneNode::render() } - /*! */ void CQuake3ShaderSceneNode::vertextransform_wave( f32 dt, quake3::SModifierFunction &function ) diff --git a/source/Irrlicht/CSceneManager.h b/source/Irrlicht/CSceneManager.h index db8077de..9073824b 100644 --- a/source/Irrlicht/CSceneManager.h +++ b/source/Irrlicht/CSceneManager.h @@ -124,7 +124,7 @@ namespace scene //! \param lookat: Position where the camera will look at. Also known as target. //! \param parent: Parent scene node of the camera. Can be null. If the parent moves, //! the camera will move too. - //! \return Returns pointer to interface to camera + //! \return Pointer to interface to camera virtual ICameraSceneNode* addCameraSceneNode(ISceneNode* parent = 0, const core::vector3df& position = core::vector3df(0,0,0), const core::vector3df& lookat = core::vector3df(0,0,0), s32 id=-1); @@ -147,7 +147,8 @@ namespace scene //! turned on. (This is the default setting in most scene nodes). virtual ILightSceneNode* addLightSceneNode(ISceneNode* parent = 0, const core::vector3df& position = core::vector3df(0,0,0), - video::SColorf color = video::SColorf(1.0f, 1.0f, 1.0f), f32 range=100.0f, s32 id=-1); + video::SColorf color = video::SColorf(1.0f, 1.0f, 1.0f), + f32 range=100.0f, s32 id=-1); //! Adds a billboard scene node to the scene. A billboard is like a 3d sprite: A 2d element, //! which always looks to the camera. It is usually used for things like explosions, fire, @@ -258,7 +259,7 @@ namespace scene //! of all scene nodes. The root scene node is a special scene node which //! only exists to manage all scene nodes. It is not rendered and cannot //! be removed from the scene. - //! \return Returns a pointer to the root scene node. + //! \return Pointer to the root scene node. virtual ISceneNode* getRootSceneNode(); //! Returns the current active camera. @@ -272,7 +273,7 @@ namespace scene //! creates a rotation animator, which rotates the attached scene node around itself. //! \param rotationPerSecond: Specifies the speed of the animation - //! \return Returns the animator. Attach it to a scene node with ISceneNode::addAnimator() + //! \return The animator. Attach it to a scene node with ISceneNode::addAnimator() //! and the animator will animate it. virtual ISceneNodeAnimator* createRotationAnimator(const core::vector3df& rotationPerSecond);