summaryrefslogtreecommitdiffstats
path: root/o3d/collada_edge
diff options
context:
space:
mode:
authormaf@chromium.org <maf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-06 00:34:44 +0000
committermaf@chromium.org <maf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-06 00:34:44 +0000
commitde4817b40830c7d3af8c63e1f5ae14dde042fed0 (patch)
treeb80166553c03e360613a122c56b919187fe2bece /o3d/collada_edge
parenta14e56a9987689db99734d808768ed3be6a182da (diff)
downloadchromium_src-de4817b40830c7d3af8c63e1f5ae14dde042fed0.zip
chromium_src-de4817b40830c7d3af8c63e1f5ae14dde042fed0.tar.gz
chromium_src-de4817b40830c7d3af8c63e1f5ae14dde042fed0.tar.bz2
Deleting trailing spaces, add ending newline where missing to make lint happy. Also delete some commented out CSS, etc.
Review URL: http://codereview.chromium.org/3083012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55162 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/collada_edge')
-rw-r--r--o3d/collada_edge/cross/collada_edge.cpp2
-rw-r--r--o3d/collada_edge/cross/conditioner.cpp13
2 files changed, 8 insertions, 7 deletions
diff --git a/o3d/collada_edge/cross/collada_edge.cpp b/o3d/collada_edge/cross/collada_edge.cpp
index 81bb477..effb592 100644
--- a/o3d/collada_edge/cross/collada_edge.cpp
+++ b/o3d/collada_edge/cross/collada_edge.cpp
@@ -28,7 +28,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
+
// collada_edge.cpp : Defines the entry point for the console application.
#include "precompile.h"
#include "conditioner.h"
diff --git a/o3d/collada_edge/cross/conditioner.cpp b/o3d/collada_edge/cross/conditioner.cpp
index e1592b4..b9efb1a 100644
--- a/o3d/collada_edge/cross/conditioner.cpp
+++ b/o3d/collada_edge/cross/conditioner.cpp
@@ -27,7 +27,7 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
#include "precompile.h"
#include "conditioner.h"
@@ -70,7 +70,7 @@ Edge::Edge(Point3 p1, Point3 p2, uint32 i1, uint32 i2) {
}
}
-// less than operator overload, necessary function for edge-triangle map.
+// Less than operator overload, necessary function for edge-triangle map.
bool operator<(const Edge& left, const Edge& right) {
// compare two edges by their actually coordinates.
if (dist(left.pts[0], right.pts[0]) < kEpsilon) {
@@ -92,7 +92,7 @@ bool operator<(const Edge& left, const Edge& right) {
}
}
-// go through triangles who share this edge. And check whether
+// Go through triangles who share this edge. And check whether
// the max normal angle is larger than the threshold.
void CheckSharpEdge(const Edge& shared_edge,
const std::vector<Triangle>& triangle_list,
@@ -139,7 +139,7 @@ void CheckSharpEdge(const Edge& shared_edge,
}
}
-// insert edge-triangle pair to edge triangle map.
+// Insert edge-triangle pair to edge triangle map.
void InsertEdgeTrianglePair(const Edge& edge, const Triangle& triangle,
std::map<Edge, std::vector<Triangle>>* et_map) {
std::map<Edge, std::vector<Triangle>>::iterator iter1 =
@@ -164,7 +164,7 @@ NodeInstance* CreateInstanceTree(FCDSceneNode *node) {
return instance;
}
-// go through all polygons in geom_instance, and add all sharp edges
+// Go through all polygons in geom_instance, and add all sharp edges
// as a new polygon in geom. And also, add material and effect based
// on the given sharpEdgeColor option.
void BuildSharpEdge(FCDocument* doc, FCDGeometryInstance* geom_instance,
@@ -367,4 +367,5 @@ bool Condition(const wchar_t* in_filename, const wchar_t* out_filename,
}
FCollada::Release();
return retval;
-} \ No newline at end of file
+}
+