[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52900] branches/soc-2008-mxcurioni/source /blender/freestyle/intern: Fix for svn:eol-style in the source/blender/ freestyle directory.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Tue Dec 11 23:08:29 CET 2012


Revision: 52900
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52900
Author:   kjym3
Date:     2012-12-11 22:08:29 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Fix for svn:eol-style in the source/blender/freestyle directory.

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/GridHelpers.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/GridHelpers.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/system/PointerSequence.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/BoxGrid.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/BoxGrid.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/CulledOccluderSource.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/GridDensityProvider.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/OccluderSource.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/OccluderSource.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/SphericalGrid.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/SphericalGrid.h

Property Changed:
----------------
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/GridHelpers.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/GridHelpers.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/system/PointerSequence.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/system/RenderMonitor.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/BoxGrid.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/BoxGrid.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/CulledOccluderSource.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/GridDensityProvider.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/OccluderSource.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/OccluderSource.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/SphericalGrid.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/SphericalGrid.h


Property changes on: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.cpp
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/GridHelpers.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/GridHelpers.cpp	2012-12-11 22:00:22 UTC (rev 52899)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/GridHelpers.cpp	2012-12-11 22:08:29 UTC (rev 52900)
@@ -1,56 +1,56 @@
-//
-//  Filename         : GridHelpers.cpp
-//  Author(s)        : Alexander Beels
-//  Purpose          : Class to define a cell grid surrounding
-//                     the projected image of a scene
-//  Date of creation : 2010-12-21
-//
-///////////////////////////////////////////////////////////////////////////////
-
-//
-//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
-//   with this source distribution. 
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include <math.h>
-#include "GridHelpers.h"
-
-void GridHelpers::getDefaultViewProscenium(real viewProscenium[4]) {
-	// Get proscenium boundary for culling
-	// bufferZone determines the amount by which the area processed
-	// should exceed the actual image area.  This is intended to
-	// avoid visible artifacts generated along the proscenium edge.
-	// Perhaps this is no longer needed now that entire view edges
-	// are culled at once, since that theoretically should eliminate
-	// visible artifacts.
-	// To the extent it is still useful, bufferZone should be put into 
-	// the UI as configurable percentage value
-	const real bufferZone = 0.05;
-	// borderZone describes a blank border outside the proscenium, but
-	// still inside the image area.  Only intended for exposing possible
-	// artifacts along or outside the proscenium edge during debugging.
-	const real borderZone = 0.0;
-	viewProscenium[0] = freestyle_viewport[2] * (borderZone - bufferZone);
-	viewProscenium[1] = freestyle_viewport[2] * (1.0f - borderZone + bufferZone);
-	viewProscenium[2] = freestyle_viewport[3] * (borderZone - bufferZone);
-	viewProscenium[3] = freestyle_viewport[3] * (1.0f - borderZone + bufferZone);
-}
-
-GridHelpers::Transform::~Transform () {}
-
-
+//
+//  Filename         : GridHelpers.cpp
+//  Author(s)        : Alexander Beels
+//  Purpose          : Class to define a cell grid surrounding
+//                     the projected image of a scene
+//  Date of creation : 2010-12-21
+//
+///////////////////////////////////////////////////////////////////////////////
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include <math.h>
+#include "GridHelpers.h"
+
+void GridHelpers::getDefaultViewProscenium(real viewProscenium[4]) {
+	// Get proscenium boundary for culling
+	// bufferZone determines the amount by which the area processed
+	// should exceed the actual image area.  This is intended to
+	// avoid visible artifacts generated along the proscenium edge.
+	// Perhaps this is no longer needed now that entire view edges
+	// are culled at once, since that theoretically should eliminate
+	// visible artifacts.
+	// To the extent it is still useful, bufferZone should be put into 
+	// the UI as configurable percentage value
+	const real bufferZone = 0.05;
+	// borderZone describes a blank border outside the proscenium, but
+	// still inside the image area.  Only intended for exposing possible
+	// artifacts along or outside the proscenium edge during debugging.
+	const real borderZone = 0.0;
+	viewProscenium[0] = freestyle_viewport[2] * (borderZone - bufferZone);
+	viewProscenium[1] = freestyle_viewport[2] * (1.0f - borderZone + bufferZone);
+	viewProscenium[2] = freestyle_viewport[3] * (borderZone - bufferZone);
+	viewProscenium[3] = freestyle_viewport[3] * (1.0f - borderZone + bufferZone);
+}
+
+GridHelpers::Transform::~Transform () {}
+
+


Property changes on: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/GridHelpers.cpp
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/GridHelpers.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/GridHelpers.h	2012-12-11 22:00:22 UTC (rev 52899)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/GridHelpers.h	2012-12-11 22:08:29 UTC (rev 52900)
@@ -1,199 +1,199 @@
-//
-//  Filename         : GridHelpers.h
-//  Author(s)        : Alexander Beels
-//  Purpose          : Class to define a cell grid surrounding
-//                     the projected image of a scene
-//  Date of creation : 2010-12-13
-//
-///////////////////////////////////////////////////////////////////////////////
-
-
-//
-//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
-//   with this source distribution. 
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef  GRIDHELPERS_H
-#define GRIDHELPERS_H
-
-#include <vector>
-#include "Polygon.h"
-#include "../winged_edge/WEdge.h"
-#include "FRS_freestyle.h"
-#include "GeomUtils.h"
-
-namespace GridHelpers {
-
-/*! Computes the distance from a point P to a segment AB */
-template<class T>
-T closestPointToSegment(const T& P, const T& A , const T& B, real& distance) { 
-	T AB, AP, BP;
-	AB = B - A;
-	AP = P - A;
-	BP = P - B;
-
-	real c1(AB * AP);
-	if (c1 <= 0) {
-		distance = AP.norm();
-		return A; // A is closest point
-	}
-
-	real c2(AB * AB);
-	if (c2 <= c1) {
-		distance = BP.norm();
-		return B; // B is closest point
-	}
-
-    real b = c1 / c2;
-    T Pb, PPb;
-    Pb = A + b * AB;
-    PPb = P - Pb;
-
-    distance = PPb.norm();
-	return Pb; // closest point lies on AB
-} 
-
-inline Vec3r closestPointOnPolygon(const Vec3r& point, const Polygon3r& poly) {
-	// First cast a ray from the point onto the polygon plane
-	// If the ray intersects the polygon, then the intersection point
-	// is the closest point on the polygon
-	real t, u, v;
-	if ( poly.rayIntersect(point, poly.getNormal(), t, u, v) ) {
-		return point + poly.getNormal() * t;
-	}
-
-	// Otherwise, get the nearest point on each edge, and take the closest
-	real distance;
-	Vec3r closest = closestPointToSegment(point, poly.getVertices()[2], poly.getVertices()[0], distance);
-	for ( unsigned i = 0; i < 2; ++i ) {
-		real t;
-		Vec3r p = closestPointToSegment(point, poly.getVertices()[i], poly.getVertices()[i + 1], t);
-		if ( t < distance ) {
-			distance = t;
-			closest = p;
-		}
-	}
-	return closest;
-}
-
-inline real distancePointToPolygon(const Vec3r& point, const Polygon3r& poly) {
-	// First cast a ray from the point onto the polygon plane
-	// If the ray intersects the polygon, then the intersection point
-	// is the closest point on the polygon
-	real t, u, v;
-	if ( poly.rayIntersect(point, poly.getNormal(), t, u, v) ) {
-		return t > 0.0 ? t : -t;
-	}
-
-	// Otherwise, get the nearest point on each edge, and take the closest
-	real distance = GeomUtils::distPointSegment(point, poly.getVertices()[2], poly.getVertices()[0]);
-	for ( unsigned i = 0; i < 2; ++i ) {
-		real t = GeomUtils::distPointSegment(point, poly.getVertices()[i], poly.getVertices()[i + 1]);
-		if ( t < distance ) {
-			distance = t;
-		}
-	}
-	return distance;
-}
-
-class Transform {
-public:
-	virtual ~Transform () =0;

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list