Browse Source

ARAP implementation

Former-commit-id: 79f7861431205655e9052072c5fc8b40b7481011
Alec Jacobson (jalec 11 years ago
parent
commit
dc00275e20

+ 1 - 0
RELEASE_HISTORY.txt

@@ -1,3 +1,4 @@
+0.4.3  ARAP implementation
 0.4.1  Migrated much of the FAST code including extra for Sifakis' 3x3 svd
 0.4.1  Migrated much of the FAST code including extra for Sifakis' 3x3 svd
 0.4.0  Release under MPL2 license
 0.4.0  Release under MPL2 license
 0.3.7  Embree2.0 support
 0.3.7  Embree2.0 support

+ 1 - 1
VERSION.txt

@@ -3,4 +3,4 @@
 # Anyone may increment Minor to indicate a small change.
 # Anyone may increment Minor to indicate a small change.
 # Major indicates a large change or large number of changes (upload to website)
 # Major indicates a large change or large number of changes (upload to website)
 # World indicates a substantial change or release
 # World indicates a substantial change or release
-0.4.2
+0.4.3

+ 1 - 1
examples/arap/Makefile

@@ -31,7 +31,7 @@ ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework Ap
 INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(YIMG_INC)
 INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(YIMG_INC)
 LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(YIMG_LIB)
 LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(YIMG_LIB)
 
 
-example: example.o arap.o
+example: example.o
 	g++ $(OPENMP) $(AFLAGS) $(CFLAGS) $(LIB) -o example $^
 	g++ $(OPENMP) $(AFLAGS) $(CFLAGS) $(LIB) -o example $^
 
 
 %.o: %.cpp
 %.o: %.cpp

+ 1 - 1
examples/arap/example.cpp

@@ -1,4 +1,4 @@
-#include "arap.h"
+#include <igl/svd3x3/arap.h>
 #include <igl/OpenGL_convenience.h>
 #include <igl/OpenGL_convenience.h>
 #include <igl/per_face_normals.h>
 #include <igl/per_face_normals.h>
 #include <igl/per_vertex_normals.h>
 #include <igl/per_vertex_normals.h>

+ 1 - 1
examples/arap/arap.cpp → include/igl/svd3x3/arap.cpp

@@ -16,7 +16,7 @@
 #include <igl/arap_rhs.h>
 #include <igl/arap_rhs.h>
 #include <igl/repdiag.h>
 #include <igl/repdiag.h>
 #include <igl/columnize.h>
 #include <igl/columnize.h>
-#include <igl/svd3x3/fit_rotations.h>
+#include "fit_rotations.h"
 #include <cassert>
 #include <cassert>
 #include <iostream>
 #include <iostream>
 
 

+ 0 - 0
examples/arap/arap.h → include/igl/svd3x3/arap.h