[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54979] branches/soc-2008-mxcurioni/source /blender/freestyle/intern/application: Removed redundant definitions of __min and __max macros by replacing them with
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sun Mar 3 00:17:21 CET 2013
Revision: 54979
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54979
Author: kjym3
Date: 2013-03-02 23:17:20 +0000 (Sat, 02 Mar 2013)
Log Message:
-----------
Removed redundant definitions of __min and __max macros by replacing them with
std::min() and std::max(), respectively. Based on review comment from Campbell.
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppView.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppView.h
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppView.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppView.cpp 2013-03-02 22:50:46 UTC (rev 54978)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppView.cpp 2013-03-02 23:17:20 UTC (rev 54979)
@@ -84,13 +84,13 @@
_RootNode.AddChild(_DebugRootNode);
- _minBBox = __min(__min(_ModelRootNode->bbox().getMin()[0], _ModelRootNode->bbox().getMin()[1]),
- _ModelRootNode->bbox().getMin()[2]);
- _maxBBox = __max(__max(_ModelRootNode->bbox().getMax()[0], _ModelRootNode->bbox().getMax()[1]),
- _ModelRootNode->bbox().getMax()[2]);
+ _minBBox = std::min(std::min(_ModelRootNode->bbox().getMin()[0], _ModelRootNode->bbox().getMin()[1]),
+ _ModelRootNode->bbox().getMin()[2]);
+ _maxBBox = std::max(std::max(_ModelRootNode->bbox().getMax()[0], _ModelRootNode->bbox().getMax()[1]),
+ _ModelRootNode->bbox().getMax()[2]);
- _maxAbs = __max(rabs(_minBBox), rabs(_maxBBox));
- _minAbs = __min(rabs(_minBBox), rabs(_maxBBox));
+ _maxAbs = std::max(rabs(_minBBox), rabs(_maxBBox));
+ _minAbs = std::min(rabs(_minBBox), rabs(_maxBBox));
_p2DSelectionNode = new NodeDrawingStyle;
_p2DSelectionNode->setLightingEnabled(false);
@@ -137,23 +137,23 @@
Vec3r w7(u[0], v[1], v[2]);
Vec3r w8(v[0], v[1], v[2]);
- real _znear = __min((w1 - cameraCenter).norm(),
- __min((w2 - cameraCenter).norm(),
- __min((w3 - cameraCenter).norm(),
- __min((w4 - cameraCenter).norm(),
- __min((w5 - cameraCenter).norm(),
- __min((w6 - cameraCenter).norm(),
- __min((w7 - cameraCenter).norm(),
- (w8 - cameraCenter).norm()
- )
+ real _znear = std::min((w1 - cameraCenter).norm(),
+ std::min((w2 - cameraCenter).norm(),
+ std::min((w3 - cameraCenter).norm(),
+ std::min((w4 - cameraCenter).norm(),
+ std::min((w5 - cameraCenter).norm(),
+ std::min((w6 - cameraCenter).norm(),
+ std::min((w7 - cameraCenter).norm(),
+ (w8 - cameraCenter).norm()
+ )
+ )
+ )
)
- )
- )
+ )
)
- )
- );
+ );
- return __max(_znear, 0.001);
+ return std::max(_znear, 0.001);
}
real AppView::zfar()
@@ -172,27 +172,27 @@
Vec3r w7(u[0], v[1], v[2]);
Vec3r w8(v[0], v[1], v[2]);
- real _zfar = __max((w1 - cameraCenter).norm(),
- __max((w2 - cameraCenter).norm(),
- __max((w3 - cameraCenter).norm(),
- __max((w4 - cameraCenter).norm(),
- __max((w5 - cameraCenter).norm(),
- __max((w6 - cameraCenter).norm(),
- __max((w7 - cameraCenter).norm(),
- (w8 - cameraCenter).norm()
- )
+ real _zfar = std::max((w1 - cameraCenter).norm(),
+ std::max((w2 - cameraCenter).norm(),
+ std::max((w3 - cameraCenter).norm(),
+ std::max((w4 - cameraCenter).norm(),
+ std::max((w5 - cameraCenter).norm(),
+ std::max((w6 - cameraCenter).norm(),
+ std::max((w7 - cameraCenter).norm(),
+ (w8 - cameraCenter).norm()
+ )
+ )
+ )
)
- )
- )
+ )
)
- )
- );
+ );
return _zfar;
}
real AppView::GetFocalLength()
{
- real Near = __max(0.1, (real)(-2.0f * _maxAbs + distanceToSceneCenter()));
+ real Near = std::max(0.1, (real)(-2.0f * _maxAbs + distanceToSceneCenter()));
return Near;
}
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppView.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppView.h 2013-03-02 22:50:46 UTC (rev 54978)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/application/AppView.h 2013-03-02 23:17:20 UTC (rev 54979)
@@ -32,13 +32,6 @@
* \ingroup freestyle
*/
-#if !defined(WIN32) || defined(__GNUC__)
-# include <algorithm>
-# define __min(x,y) (min(x,y))
-# define __max(x,y) (max(x,y))
- using namespace std;
-#endif // WIN32
-
#include "AppConfig.h"
#include "../geometry/Geom.h"
#include "../geometry/BBox.h"
@@ -92,13 +85,13 @@
_ModelRootNode->AddChild(iModel);
_ModelRootNode->UpdateBBox();
- _minBBox = __min(__min(_ModelRootNode->bbox().getMin()[0], _ModelRootNode->bbox().getMin()[1]),
- _ModelRootNode->bbox().getMin()[2]);
- _maxBBox = __max(__max(_ModelRootNode->bbox().getMax()[0], _ModelRootNode->bbox().getMax()[1]),
- _ModelRootNode->bbox().getMax()[2]);
+ _minBBox = std::min(std::min(_ModelRootNode->bbox().getMin()[0], _ModelRootNode->bbox().getMin()[1]),
+ _ModelRootNode->bbox().getMin()[2]);
+ _maxBBox = std::max(std::max(_ModelRootNode->bbox().getMax()[0], _ModelRootNode->bbox().getMax()[1]),
+ _ModelRootNode->bbox().getMax()[2]);
- _maxAbs = __max(rabs(_minBBox), rabs(_maxBBox));
- _minAbs = __min(rabs(_minBBox), rabs(_maxBBox));
+ _maxAbs = std::max(rabs(_minBBox), rabs(_maxBBox));
+ _minAbs = std::min(rabs(_minBBox), rabs(_maxBBox));
}
inline void AddSilhouette(NodeGroup* iSilhouette)
@@ -136,13 +129,13 @@
_ModelRootNode->DetachChild(iModel);
_ModelRootNode->UpdateBBox();
- _minBBox = __min(__min(_ModelRootNode->bbox().getMin()[0], _ModelRootNode->bbox().getMin()[1]),
- _ModelRootNode->bbox().getMin()[2]);
- _maxBBox = __max(__max(_ModelRootNode->bbox().getMax()[0], _ModelRootNode->bbox().getMax()[1]),
- _ModelRootNode->bbox().getMax()[2]);
+ _minBBox = std::min(std::min(_ModelRootNode->bbox().getMin()[0], _ModelRootNode->bbox().getMin()[1]),
+ _ModelRootNode->bbox().getMin()[2]);
+ _maxBBox = std::max(std::max(_ModelRootNode->bbox().getMax()[0], _ModelRootNode->bbox().getMax()[1]),
+ _ModelRootNode->bbox().getMax()[2]);
- _maxAbs = __max(rabs(_minBBox), rabs(_maxBBox));
- _minAbs = __min(rabs(_minBBox), rabs(_maxBBox));
+ _maxAbs = std::max(rabs(_minBBox), rabs(_maxBBox));
+ _minAbs = std::min(rabs(_minBBox), rabs(_maxBBox));
}
inline void DetachModel()
More information about the Bf-blender-cvs
mailing list