Revision: 54046
http://brlcad.svn.sourceforge.net/brlcad/?rev=54046&view=rev
Author: starseeker
Date: 2012-12-11 21:26:55 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
checkpoint
Modified Paths:
--------------
brlcad/trunk/src/librt/test_subdivision.cpp
Modified: brlcad/trunk/src/librt/test_subdivision.cpp
===================================================================
--- brlcad/trunk/src/librt/test_subdivision.cpp 2012-12-11 21:23:11 UTC (rev
54045)
+++ brlcad/trunk/src/librt/test_subdivision.cpp 2012-12-11 21:26:55 UTC (rev
54046)
@@ -188,9 +188,15 @@
point_subdiv(mesh->iteration_cnt, pcnt, starting_mesh,
&(mesh->points_p0));
mesh->iteration_of_insert[pcnt] =
starting_mesh->iteration_of_insert[pcnt];
} else {
-
starting_mesh->points_inf.Append(*starting_mesh->points_p0.At(pcnt));
- mesh->points_p0.Append(*starting_mesh->points_p0.At(pcnt));
- mesh->iteration_of_insert[pcnt] =
starting_mesh->iteration_of_insert[pcnt];
+ if (mesh->iteration_cnt % 2 == 0) {
+ // Need to do "proper" boundary point adjustment here
+ point_subdiv(mesh->iteration_cnt, pcnt, starting_mesh,
&(mesh->points_p0));
+ mesh->iteration_of_insert[pcnt] =
starting_mesh->iteration_of_insert[pcnt];
+ } else {
+
starting_mesh->points_inf.Append(*starting_mesh->points_p0.At(pcnt));
+ mesh->points_p0.Append(*starting_mesh->points_p0.At(pcnt));
+ mesh->iteration_of_insert[pcnt] =
starting_mesh->iteration_of_insert[pcnt];
+ }
}
}
for(f_it = starting_mesh->face_pts.begin(); f_it !=
starting_mesh->face_pts.end(); f_it++) {
@@ -220,13 +226,13 @@
face_cnt++;
old_edges.erase(edge);
} else {
- //if (mesh->iteration_cnt % 2 == 0) {
- std::cout << "second iteration: " << q0 << "\n";
- //} else {
- mesh_add_face((*e_it).first, (*e_it).second, q0,
face_cnt, mesh);
- face_cnt++;
- old_edges.erase(edge);
- //}
+ if (mesh->iteration_cnt % 2 == 0) {
+ std::cout << "second iteration: " << q0 << "\n";
+ } else {
+ mesh_add_face((*e_it).first, (*e_it).second, q0,
face_cnt, mesh);
+ face_cnt++;
+ old_edges.erase(edge);
+ }
}
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
