From 4a32ffeddea99b9f1a8a05624388b523b2cc84a3 Mon Sep 17 00:00:00 2001
From: Wenzel Jakob <wenzel@cs.cornell.edu>
Date: Tue, 19 Oct 2010 00:05:02 +0200
Subject: [PATCH] bugfixes, primitive clipping for cylinders

---
 src/qtgui/save.cpp      |  7 +++++--
 src/shapes/cylinder.cpp | 13 ++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/qtgui/save.cpp b/src/qtgui/save.cpp
index a44ca363..829de03e 100644
--- a/src/qtgui/save.cpp
+++ b/src/qtgui/save.cpp
@@ -331,7 +331,9 @@ void saveScene(QWidget *parent, SceneContext *ctx, const QString &targetFile) {
 	QString textContent = doc.toString();
 	QTextStream input(&textContent);
 	QTextStream output(&file);
-	QRegExp nameRegExp("name=\"[^\"]*\""),
+	QRegExp 
+		filenameRegExp("filename=\"[^\"]*\""),
+		nameRegExp("name=\"[^\"]*\""),
 		tagRegExp("^\\s*<([a-zA-Z]+) "),
 		leadingSpaces("^ *"),
 		closeTag("^\\s*</");
@@ -362,8 +364,9 @@ void saveScene(QWidget *parent, SceneContext *ctx, const QString &targetFile) {
 		int tagMatch = tagRegExp.indexIn(line),
 			tagLength = tagRegExp.matchedLength();
 		int nameMatch = nameRegExp.indexIn(line),
+			filenameMatch = filenameRegExp.indexIn(line),
 			nameLength = nameRegExp.matchedLength();
-		if (tagMatch != -1 && nameMatch != -1) {
+		if (tagMatch != -1 && nameMatch != -1 && filenameMatch == -1) {
 			line = line.left(tagLength) + line.mid(nameMatch, nameLength) + " "
 				+ line.mid(tagMatch+tagLength, nameMatch-(tagMatch+tagLength))
 				+ line.mid(nameMatch+nameLength);
diff --git a/src/shapes/cylinder.cpp b/src/shapes/cylinder.cpp
index f27da9b3..1c345d97 100644
--- a/src/shapes/cylinder.cpp
+++ b/src/shapes/cylinder.cpp
@@ -166,11 +166,11 @@ public:
 	AABB getAABB() const {
 		return getAABB(0, m_length);
 	}
-/*
-	AABB getClippedAABB(const AABB &aabb) const {
+
+	AABB getClippedAABB(const AABB &box) const {
 		Float nearT, farT;
-		AABB result(m_aabb);
-		result.clip(aabb);
+		AABB result(getAABB(0, m_length));
+		result.clip(box);
 
 		Point a = m_objectToWorld(Point(0, 0, 0));
 		Point b = m_objectToWorld(Point(0, 0, m_length));
@@ -180,12 +180,11 @@ public:
 
 		nearT = std::max(nearT, (Float) 0);
 		farT = std::min(farT, m_length);
-		result = getWorldAABB(nearT, farT);
-		result.clip(aabb);
+		result = getAABB(nearT, farT);
+		result.clip(box);
 
 		return result;
 	}
-*/
 
 	Float getSurfaceArea() const {
 		return 2*M_PI*m_radius*m_length;