[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31484] branches/soc-2010-rohith291991/ intern/comiso/intern/uv.cpp: quadrangulation updates.

[Rohith B V]

Revision: 31484
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31484
Author:   rohith291991
Date:     2010-08-20 18:14:36 +0200 (Fri, 20 Aug 2010)

Log Message:
-----------
quadrangulation updates.

Modified Paths:
--------------
    branches/soc-2010-rohith291991/intern/comiso/intern/uv.cpp

Modified: branches/soc-2010-rohith291991/intern/comiso/intern/uv.cpp
===================================================================
--- branches/soc-2010-rohith291991/intern/comiso/intern/uv.cpp	2010-08-20 16:02:20 UTC (rev 31483)
+++ branches/soc-2010-rohith291991/intern/comiso/intern/uv.cpp	2010-08-20 16:14:36 UTC (rev 31484)
@@ -2434,7 +2434,7 @@
 							}
 
 					
-						if((co1[0]-co2[0])*(co1[0]-co2[0])+(co1[1]-co2[1])*(co1[1]-co2[1])+(co1[2]-co2[2])*(co1[2]-co2[2])<1e-6)
+						if((co1[0]-co2[0])*(co1[0]-co2[0])+(co1[1]-co2[1])*(co1[1]-co2[1])+(co1[2]-co2[2])*(co1[2]-co2[2])<1e-9)
 							{
 					
 							terminate=1;
@@ -2500,12 +2500,6 @@
 				
 			}
 
-		for(int i=0;i<result->numVerts;i++)
-			{
-			
-			//printf("i: %d num: %d\n",i,result->verts[result->verts[i].index].numNeighbors);
-			
-			}
 
 
 
@@ -2517,10 +2511,14 @@
 	for(int i=0;i<result->numVerts;i++)
 		{
 		
-		result->verts[result->verts[i].index].vvar=0;
-		result->verts[result->verts[i].index].test=0;
-		result->verts[result->verts[i].index].pvert=0;
+		result->verts[i].vvar=0;
+		result->verts[i].test=0;
+		result->verts[i].pvert=0;
+	//	if(!(result->verts[i].flag & CV_INTEGER))
+	   // printf("%d\n",result->verts[i].flag );
 
+		
+
 		}
 	vc1=0;
 	ec1=0;
@@ -2530,7 +2528,7 @@
 		if(result->verts[i].flag & CV_INTEGER)
 			{
 			result->verts[result->verts[i].index].vvar=0;
-			result->verts[result->verts[i].index].test=0;
+			result->verts[result->verts[i].index].test=result->verts[i].index;
 
 
 			result->verts[result->verts[i].index].pvert=0;
@@ -2557,7 +2555,7 @@
 
 	
 
-		
+		int count=0;
 			//Iterative Dijsktra on primal from each singularity
 			int terminate=1;
 
@@ -2582,14 +2580,21 @@
 						int index=result->verts[currentVerts[i][j]].pvert;
 						int test=result->verts[currentVerts[i][j]].test;
 						CVert *vert=&(result->verts[currentVerts[i][j]]);
+						if((result->verts[currentVerts[i][j]].flag & CV_INTEGER))
+	{
+	//printf("%d\n",(result->verts[currentVerts[i][j]].numNeighbors));
+	}
 
+
 					//	printf("num Neighbors %d\n",vert->numNeighbors);
 						for(int k=0;k<vert->numNeighbors;k++)
 							{
 
+							
 					//	printf("neighbor index %d\n",vert->neighbors[k]);
 							int nIndex=result->verts[vert->neighbors[k]].index;
 
+
 						
 									
 								//printf("5\n");
@@ -2607,6 +2612,7 @@
 								
 								}*/
 
+
 								if(!(result->verts[nIndex].flag & CV_INTEGER))
 
 									{
@@ -2620,8 +2626,9 @@
 									newVerts.push_back(nIndex);
 										}
 									}
-								else if((result->verts[nIndex].vvar <4))
+								else if((result->verts[nIndex].vvar <=4))
 									{
+									count++;
 									result->verts[test].vvar++;
 									result->verts[nIndex].vvar++;
 									//printf("2\n");
@@ -2631,7 +2638,7 @@
 									if((result->verts[nIndex].vvar==1))
 										{
 									result->verts[nIndex].pvert=vc1;
-									printf("vc1 %d\n",vc1);
+								//	printf("vc1 %d\n",vc1);
 									connect=vc1;
 
 									//add point
@@ -2654,10 +2661,10 @@
 									else
 										{
 										connect=result->verts[nIndex].pvert;
-										//printf("vc2 %d\n",connect);
+									//	printf("vvar %d\n",result->verts[nIndex].vvar);
 										
 										}
-									
+								    result1->verts[connect].vvar=result->verts[nIndex].vvar-1;
 									//create edge
 									if(result1->edges==NULL)
 			result1->edges=(CEdge*)MEM_mallocN(sizeof(CEdge)*(ec1+1), "edges");
@@ -2667,8 +2674,10 @@
 
 			result1->edges[ec1].v[0]=connect;
 			result1->edges[ec1].v[1]=index;
-			//if(index==connect&&index==0)
-			//	printf("WTF\n");
+			//if(index==connect&&connect<14)
+				printf("WTF %d\n",index);
+								else if (index1=connect&&connect<14)
+								printf("!WTF %d\n",index);
 		
 			ec1++;
 		//	if(result->verts[nIndex].vvar <4)
@@ -2677,8 +2686,7 @@
 									}
 								else
 									{
-									printf("3\n");
-									//do nothing
+								
 									
 									}
 								}
@@ -2695,8 +2703,12 @@
 					}
 				}
 
+				for(int i=0;i<vc1;i++)
+					{
+				//	printf("vvar %d\n",result1->verts[i].vvar);
+					}
 
-	result1->numVerts=vc1;	
+					result1->numVerts=vc1;	
 	result1->numEdges=ec1;	
 
 	//printf("BLAH\n");