[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31078] branches/soc-2010-rohith291991/ intern/comiso/intern/uv.cpp: Updates to mesh extraction.

[Rohith B V]

Revision: 31078
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31078
Author:   rohith291991
Date:     2010-08-05 20:17:17 +0200 (Thu, 05 Aug 2010)

Log Message:
-----------
Updates to mesh extraction. I get disjoint quadrangulated patches for now.

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-05 17:55:10 UTC (rev 31077)
+++ branches/soc-2010-rohith291991/intern/comiso/intern/uv.cpp	2010-08-05 18:17:17 UTC (rev 31078)
@@ -916,20 +916,29 @@
 	
 
 	//Add relevant edge connectivities to CMesh
+		int m1=(uRange-1)*vRange;
+		int m2=(vRange-1)*uRange;
+		if(m1<0)
+			m1=0;
+		if(m2<0)
+			m2=0;
 
-	/*	if(result->edges==NULL)
-				result->edges=(CEdge*)MEM_mallocN(sizeof(CEdge)*(ec+((uRange-1)*vRange+(vRange-1)*uRange)), "edges");
+		//printf("%d\n",((uRange-1)*vRange+(vRange-1)*uRange));
+
+
+		if(result->edges==NULL)
+				result->edges=(CEdge*)MEM_mallocN(sizeof(CEdge)*(ec+m1+m2), "edges");
 				else
-					result->edges=(CEdge*)MEM_reallocN(result->edges,(sizeof(CEdge)*((uRange-1)*vRange+(vRange-1)*uRange)));
+					result->edges=(CEdge*)MEM_reallocN(result->edges,(sizeof(CEdge)*(ec+m1+m2)));
 
-		printf("test4\n");
+		//printf("test4\n");
 		for(int j=0;j<uRange;j++)
 			{
 			
 			for(int k=0;k<vRange-1;k++)
 				{
 				
-				printf("test5\n");
+				//printf("test5\n");
 				int v1,v2;
 				v1=vertices[j][k];
 				v2=vertices[j][k+1];
@@ -952,7 +961,7 @@
 					result->verts[v2].neighbors=(int*)MEM_reallocN(result->verts[v2].neighbors,(sizeof(int)*(++result->verts[v2].numNeighbors)));
 				result->verts[v2].neighbors[result->verts[v2].numNeighbors-1]=v1;
 
-				printf("test6\n");
+				//printf("test6\n");
 
 				}
 			
@@ -973,7 +982,7 @@
 				result->edges[ec].v[1]=v2;
 				ec++;
 				
-				printf("test7\n");
+			//	printf("test7\n");
 				if(result->verts[v1].neighbors==NULL)
 					result->verts[v1].neighbors=(int*)MEM_mallocN(sizeof(int)*(++result->verts[v1].numNeighbors), "neighbors");
 					
@@ -986,7 +995,7 @@
 				else
 					result->verts[v2].neighbors=(int*)MEM_reallocN(result->verts[v2].neighbors,(sizeof(int)*(++result->verts[v2].numNeighbors)));
 				result->verts[v2].neighbors[result->verts[v2].numNeighbors-1]=v1;
-				printf("test8\n");
+				//printf("test8\n");
 
 				}
 			
@@ -994,15 +1003,11 @@
 				//for loop
 				// Include points where edges meet triangle border
 
-*/
-			
 			}
-
 		
 			result->numVerts=vc;
 			result->numEdges=ec;
-			
-		
+					
 		return result;
 		
 		}