[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30361] branches/soc-2010-rohith291991: Small changes.

[Rohith B V]

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

Log Message:
-----------
Small changes.

Modified Paths:
--------------
    branches/soc-2010-rohith291991/intern/comiso/intern/CMesh.cpp
    branches/soc-2010-rohith291991/intern/comiso/intern/uv.cpp
    branches/soc-2010-rohith291991/source/blender/modifiers/intern/MOD_quadrangulate.c

Modified: branches/soc-2010-rohith291991/intern/comiso/intern/CMesh.cpp
===================================================================
--- branches/soc-2010-rohith291991/intern/comiso/intern/CMesh.cpp	2010-07-15 03:00:38 UTC (rev 30360)
+++ branches/soc-2010-rohith291991/intern/comiso/intern/CMesh.cpp	2010-07-15 03:08:15 UTC (rev 30361)
@@ -368,8 +368,8 @@
 	
 	mesh->edges[i].p=(int)solution.data[i+totface];
 
-	printf("%d   %lf\n",mesh->edges[i].p,solution.data[i+totface]);
 
+
 	}
 
 
@@ -829,7 +829,5 @@
 
 	}
 
-printf("numsing: %d\n",numsing);
-
 return 1;
 }
\ No newline at end of file

Modified: branches/soc-2010-rohith291991/intern/comiso/intern/uv.cpp
===================================================================
--- branches/soc-2010-rohith291991/intern/comiso/intern/uv.cpp	2010-07-15 03:00:38 UTC (rev 30360)
+++ branches/soc-2010-rohith291991/intern/comiso/intern/uv.cpp	2010-07-15 03:08:15 UTC (rev 30361)
@@ -7,6 +7,9 @@
 #include "Geometry"
 #include <math.h>
 
+
+//DONE 
+
 void compute_rotated_uv_vars(//rotates variable indices
   int var, int rot, //u is 2*var, v is 2*var+1
   int &uvar, int &vvar, //rotated variable indices
@@ -20,6 +23,7 @@
 
 void compute_edge_flux(HMesh *hm, bool curl_correction = true) { //with optional curl correction
  
+
   //Reset the fluxes
 	int totedge,totface,totvert;
 	totvert=hm->numVerts;
@@ -460,6 +464,7 @@
     //check that the edge forms a seam, and was not already given a tvar index
     if(!(hi->flag & CE_MARKED)&& !hi->test) {
       hi->test = 1 ;
+	  //hi->opposite->test = 1 ;
       //provide variables for the edge and its opposite edge
       hi->tvar = nvar ;
       hi->opposite->tvar = nvar ;
@@ -531,7 +536,7 @@
   int constraint = 0 ;
   for(int i=0;i<totedge;i++){
 	  HEdge * hi=&hm->edges[i];
-    if(!(hi->flag & CE_MARKED) && hi->test) {
+    if(!(hi->flag & CE_MARKED)) {
       //recover the opposite indices
       int vp_in  = hi->vvar ;
       int vp_out = hi->opposite->prev->vvar ;
@@ -573,8 +578,9 @@
     }
   }
 
+ 
     std::vector<double> x(2*nvar,0) ;
-SparseXdc Acsc;// Not used
+ /*SparseXdc Acsc;// Not used
   ConstrainedSolver cs;
   	std::vector< int > ids_to_elim;
 	std::vector< int > new_idx;
@@ -585,7 +591,8 @@
 	MISolver miso;
 	miso.solve( A, x, b, ids_to_round);
 	cs.restore_eliminated_vars( C,x, ids_to_elim, new_idx);
-	
+	*/
+
 std::cout<<"x: \n\n";
 for(int i=0;i<x.size();i++)
 	{

Modified: branches/soc-2010-rohith291991/source/blender/modifiers/intern/MOD_quadrangulate.c
===================================================================
--- branches/soc-2010-rohith291991/source/blender/modifiers/intern/MOD_quadrangulate.c	2010-07-15 03:00:38 UTC (rev 30360)
+++ branches/soc-2010-rohith291991/source/blender/modifiers/intern/MOD_quadrangulate.c	2010-07-15 03:08:15 UTC (rev 30361)
@@ -360,8 +360,8 @@
 		
 //Switch to half edge DS for much easier parametrization
 		   //  doNothing(&hm,&cm);
-			copyHC(&hm,&cm);
-				mi_quad_param(&hm);
+		copyHC(&hm,&cm);
+			mi_quad_param(&hm);