[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20575] branches/nurbs/blender: Preliminary OpenNURBS integration.

Emmanuel Stone emmanuel.stone at gmail.com
Tue Jun 2 10:10:27 CEST 2009


Revision: 20575
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20575
Author:   eman
Date:     2009-06-02 10:10:22 +0200 (Tue, 02 Jun 2009)

Log Message:
-----------
Preliminary OpenNURBS integration.
http://www.opennurbs.org/

This is not currently functional, but openNURBS is included correctly.
This will allow reading of Rhino .3dm files in future, but it is not currently possible.

Builds with CMake on Windows.

Modified Paths:
--------------
    branches/nurbs/blender/CMakeLists.txt
    branches/nurbs/blender/intern/nurbana/CMakeLists.txt
    branches/nurbs/blender/intern/nurbana/extern/nurbana.h
    branches/nurbs/blender/intern/nurbana/intern/Object_NURBS.cpp
    branches/nurbs/blender/intern/nurbana/intern/Object_NURBS.h
    branches/nurbs/blender/intern/nurbana/intern/Object_Primitives.cpp
    branches/nurbs/blender/intern/nurbana/intern/Object_Primitives.h
    branches/nurbs/blender/intern/nurbana/intern/libNurbana.cpp
    branches/nurbs/blender/source/blender/blenkernel/BKE_curve.h
    branches/nurbs/blender/source/blender/blenkernel/intern/curve.c
    branches/nurbs/blender/source/blender/blenkernel/intern/exotic.c
    branches/nurbs/blender/source/blender/src/buttons_editing.c
    branches/nurbs/blender/source/blender/src/editcurve.c
    branches/nurbs/blender/source/blender/src/header_info.c
    branches/nurbs/blender/source/creator/CMakeLists.txt

Added Paths:
-----------
    branches/nurbs/blender/intern/nurbana/intern/ON_IO.cpp
    branches/nurbs/blender/intern/nurbana/intern/ON_IO.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/faq.txt
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/makefile
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs.ncb
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs.rc
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs.sln
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs.suo
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs.vcproj
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_3dm.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_3dm_attributes.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_3dm_attributes.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_3dm_properties.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_3dm_properties.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_3dm_settings.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_3dm_settings.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_annotation.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_annotation.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_annotation2.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_annotation2.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_arc.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_arc.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_arccurve.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_arccurve.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_archive.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_archive.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_array.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_array.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_array_defs.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_basic.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_bezier.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_bezier.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_beziervolume.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_bitmap.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_bitmap.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_bounding_box.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_bounding_box.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_box.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_box.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_brep.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_brep.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_brep_changesrf.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_brep_extrude.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_brep_io.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_brep_isvalid.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_brep_kinky.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_brep_tools.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_brep_v2valid.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_circle.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_circle.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_color.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_color.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_cone.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_cone.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_crashtest.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_crc.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_crc.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_curve.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_curve.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_curveonsurface.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_curveonsurface.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_curveproxy.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_curveproxy.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_cylinder.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_cylinder.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_defines.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_defines.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_detail.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_detail.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_dimstyle.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_dimstyle.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_dll.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_dll_resource.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_ellipse.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_ellipse.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_error.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_error.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_error_message.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_evaluate_nurbs.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_evaluate_nurbs.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_extensions.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_extensions.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_font.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_font.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_fpoint.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_geometry.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_geometry.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_gl.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_gl.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_group.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_group.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_hatch.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_hatch.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_instance.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_instance.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_intersect.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_intersect.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_knot.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_knot.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_layer.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_layer.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_light.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_light.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_line.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_line.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_linecurve.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_linecurve.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_linestyle.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_linetype.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_linetype.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_mapchan.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_massprop.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_massprop.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_material.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_material.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_math.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_math.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_matrix.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_matrix.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_memory.c
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_memory.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_memory_new.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_memory_util.c
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_mesh.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_mesh.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_mesh_tools.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_morph.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_nurbscurve.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_nurbscurve.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_nurbssurface.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_nurbssurface.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_nurbsvolume.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_object.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_object.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_object_history.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_object_history.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_objref.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_objref.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_offsetsurface.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_offsetsurface.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_optimize.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_optimize.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_plane.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_plane.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_planesurface.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_planesurface.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_pluginlist.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_pluginlist.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_point.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_point.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_pointcloud.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_pointcloud.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_pointgeometry.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_pointgeometry.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_pointgrid.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_pointgrid.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_polycurve.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_polycurve.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_polyline.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_polyline.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_polylinecurve.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_polylinecurve.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_precompiledheader.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_rendering.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_revsurface.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_revsurface.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_sphere.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_sphere.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_static_vc60.dsp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_staticlib.vcproj
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_staticlib.vcproj.EMAN-WIN-LAPTOP.eman.user
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_string.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_string.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_sum.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_sumsurface.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_sumsurface.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_surface.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_surface.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_surfaceproxy.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_surfaceproxy.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_system.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_textlog.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_textlog.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_texture.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_texture_mapping.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_torus.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_torus.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_userdata.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_userdata.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_uuid.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_uuid.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_vc60.dsp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_vc60.dsw
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_version.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_viewport.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_viewport.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_workspace.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_workspace.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_wstring.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_x.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_x.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_xform.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_xform.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_zlib.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_zlib.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/opennurbs_zlib_memory.cpp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/readme.txt
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/adler32.c
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/compress.c
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/crc32.c
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/crc32.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/deflate.c
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/deflate.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/infback.c
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/inffast.c
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/inffast.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/inffixed.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/inflate.c
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/inflate.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/inftrees.c
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/inftrees.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/opennurbs_zlib_readme.txt
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/trees.c
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/trees.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/uncompr.c
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/zconf.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/zlib.h
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/zlib.vcproj
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/zlib.xcodeproj/
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/zlib.xcodeproj/project.pbxproj
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/zlib_vc60.dsp
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/zutil.c
    branches/nurbs/blender/intern/nurbana/intern/opennurbs/zlib/zutil.h

Modified: branches/nurbs/blender/CMakeLists.txt
===================================================================
--- branches/nurbs/blender/CMakeLists.txt	2009-06-02 08:08:41 UTC (rev 20574)
+++ branches/nurbs/blender/CMakeLists.txt	2009-06-02 08:10:22 UTC (rev 20575)
@@ -294,6 +294,9 @@
   SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
   ENDIF(CMAKE_CL_64)
   
+  #OpenNURBS FIXME make optional
+  SET(LLIBS ${LLIBS} rpcrt4)
+
   IF(WITH_OPENAL)
     SET(LLIBS ${LLIBS} dxguid)
   ENDIF(WITH_OPENAL)

Modified: branches/nurbs/blender/intern/nurbana/CMakeLists.txt
===================================================================
--- branches/nurbs/blender/intern/nurbana/CMakeLists.txt	2009-06-02 08:08:41 UTC (rev 20574)
+++ branches/nurbs/blender/intern/nurbana/CMakeLists.txt	2009-06-02 08:10:22 UTC (rev 20575)
@@ -28,8 +28,8 @@
 
 SET(INC include)
 
-FILE(GLOB SRC intern/*.cpp)
+FILE(GLOB SRC intern/*.cpp intern/opennurbs/*.cpp intern/opennurbs/*.c intern/opennurbs/zlib/*.c)
 
-INCLUDE_DIRECTORIES(../../intern/guardedalloc)
+INCLUDE_DIRECTORIES(../../intern/guardedalloc ./opennurbs ./opennurbs/zlib)
 BLENDERLIB(bf_nurbana "${SRC}" "${INC}")
 #, libtype=['intern','game','game2','player'], priority = [15, 55, 100, 135] )

Modified: branches/nurbs/blender/intern/nurbana/extern/nurbana.h
===================================================================
--- branches/nurbs/blender/intern/nurbana/extern/nurbana.h	2009-06-02 08:08:41 UTC (rev 20574)
+++ branches/nurbs/blender/intern/nurbana/extern/nurbana.h	2009-06-02 08:10:22 UTC (rev 20575)
@@ -1,189 +1,194 @@
-/*
-* $Id$
-*
-* ***** BEGIN GPL LICENSE BLOCK *****
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software  Foundation,
-* Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*
-* The Original Code is Copyright (C) 2005 by Emmanuel Stone
-* All rights reserved.
-*
-* The Original Code is: all of this file.
-*
-* Contributor(s): none yet.
-*
-* ***** END GPL LICENSE BLOCK *****
-*/
-
-#ifndef NAN_INCLUDED_nurbana_h
-#define NAN_INCLUDED_nurbana_h
-
-#include "../intern/blenderNurbsStruct.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern void nurbs_test();
-
-typedef float nbReal;
-
-typedef struct nbReal3 {
-	nbReal  x;
-	nbReal  y;
-	nbReal  z;
-
-}nbReal3;
-typedef struct nbReal4 {
-	nbReal  x;
-	nbReal  y;
-	nbReal  z;
-	nbReal  a;
-}nbReal4;
-
-
-/*typedef struct Point3d {
-	nbReal  x;
-	nbReal  y;
-	nbReal  z;
-	nbReal  H;
-
-	// This extra data should make Point4d 'struct'rally equivalent to BPoint from Blender::DNA_Data_Types.h
-	nbReal alfa, weight;		// alfa: tilt in 3D View, weight: used for softbody goal weight 
-	short f1, hide;
-	nbReal radius, pad;		// user-set radius per point for bevelling etc 
-}Point3d;
-*/
-//typedef Point3d nbReal3;
-
-typedef struct Nurb_Extern {
-   int numCPu;
-	int numCPv;
-	int resolu;
-	int resolv;
-	short cyclicU;
-	short cyclicV;
-	short orderU;
-	short orderV;
-	int numKnotsU;
-	int numKnotsV;
-	nbReal *KnotU;
-	nbReal *KnotV;
-	struct ControlPoint *CP;
-} Nurb_Extern;
-
-typedef struct ControlPoint {
-	nbReal x;
-	nbReal y;
-	nbReal z;
-	nbReal H;
-	// This extra data makes nurbana struct compatible with blender
-	float alfa, weight;		/* alfa: tilt in 3D View, weight: used for softbody goal weight */
-	short f1, hide;
-	float radius, pad;		/* user-set radius per point for bevelling etc */
-} ControlPoint;
-
-
-typedef Nurb_Extern* Nurb_ExternPtr;
-
-// forward declare as void
-//typedef void Point3d; 
-//typedef void* Point3d_ptr;
-typedef Point3d* Point3d_ptr;
-typedef nbReal3* nbReal3_ptr;
-typedef void* BlenderNurbs_ptr;
-typedef void* NurbanaObj_ptr; // to hide pointer to C++ object in C space
-
-//extern NurbanaObj_ptr NRB_addObject(Point3d** CtlPts, short* numCPu, short* numCPv, short* orderU, short* orderV, nbReal** knotsU, nbReal** knotsV,  short* cyclicU,  short* cyclicV, short* knottypeu, short* knottypev,  short* resolu,  short* resolv, short* isores, short* isoden, short* isovis) ;
-extern NurbanaObj_ptr NRB_addObject(BlenderNurbs_ptr bNurbs);
-
-//extern NurbanaObj_ptr NRB_allocate();
-//extern void NRB_deallocate(NurbanaObj_ptr nop);
-extern void NRB_init(NurbanaObj_ptr nop);
-
-extern NurbanaObj_ptr NRB_reallocate(BlenderNurbs_ptr bNurbs);
-
-extern NurbanaObj_ptr NRB_CreatePrimitive(NurbanaObj_ptr nop, unsigned char type);
-extern void NRB_removeObject(NurbanaObj_ptr nop);
-
-extern void NRB_changeCyclic(NurbanaObj_ptr nop,int uv);
-
-
-
-extern void NRB_ResChanged(NurbanaObj_ptr nop );
-extern void NRB_SizeChanged(NurbanaObj_ptr nop, int newU, int newV);
-extern void NRB_UpdateSize(NurbanaObj_ptr nop);
-
-extern void NRB_setLength(int U, int V, int shiftU, int shiftV, int copyKnots, NurbanaObj_ptr nurb);
-extern void NRB_reallocKnots(int U, int V, int copy, NurbanaObj_ptr nurb);
-extern void NRB_copyPatchFromBuffer(nbReal4 *buffer, int curveLength, int nextCurve, int curveCount, NurbanaObj_ptr nurb, int uOffset, int vOffset);
-extern void NRB_reallocCtlPts(int U, int V, int shiftU, int shiftV, NurbanaObj_ptr nurb);
-
-extern void NRB_ConvertToPrimitive(NurbanaObj_ptr nop,unsigned char type);
-
-extern void NRB_RecalculateKnots(NurbanaObj_ptr nop,int uv,int type);
-
-extern Nurb_ExternPtr NRB_getNurbData(NurbanaObj_ptr nop);
-
-extern void NRB_freeNurbData(Nurb_ExternPtr ne);
-extern void NRB_updateNurbData(Nurb_ExternPtr ne,NurbanaObj_ptr nop);
-
-extern int NRB_getNumTessPoints(NurbanaObj_ptr nurb);
-extern int NRB_getNumCPoints(int uv,NurbanaObj_ptr nurb);
-extern int NRB_getOrder(int uv,NurbanaObj_ptr nurb);
-extern int NRB_getNumKnots(int uv,NurbanaObj_ptr nurb);
-extern nbReal NRB_getLastKnotValue(NurbanaObj_ptr nurb,int uv);
-extern nbReal NRB_getFirstKnotValue(NurbanaObj_ptr nurb,int uv);
-
-extern void NRB_resetIsoLines(NurbanaObj_ptr nurb);
-extern int NRB_getNumIsoPoints(NurbanaObj_ptr nop);
-extern int NRB_getIsoResolution(NurbanaObj_ptr nop);
-extern int NRB_getIsoDensity(NurbanaObj_ptr nop);
-extern void NRB_setIsoResolution(NurbanaObj_ptr nop,int res);
-extern void NRB_setIsoDensity(NurbanaObj_ptr nop,int den);
-extern nbReal* NRB_getIsoPoints(NurbanaObj_ptr nop, nbReal* buffer);
-
-//extern nbReal* NRB_GenerateSurface(NurbanaObj_ptr nop, nbReal* buffer, int dim );
-extern nbReal* NRB_GenerateSurface(NurbanaObj_ptr nop, nbReal* buffer, int resU, int resV, int dim);
-
-extern nbReal* NRB_GenerateCurve(NurbanaObj_ptr nop, nbReal* buffer, nbReal* tiltBuffer, nbReal* radiusBuffer, int res);
-extern nbReal* NRB_GenerateCurveOnSurface(NurbanaObj_ptr nop, nbReal* buffer, int res, float t, int uv, int dim);
-extern nbReal3_ptr NRB_GenerateNormals(NurbanaObj_ptr nop);
-
-extern void NRB_Subdivide(NurbanaObj_ptr nop,int subdivideU, int subdivideV);
-extern void NRB_Refine(NurbanaObj_ptr nop, int U, int V);
-extern void NRB_KnotInsert(NurbanaObj_ptr nop,nbReal *X, int r, int UV);
-
-extern void NRB_split(NurbanaObj_ptr nop, nbReal x, int uv, nbReal4* dst, int dstLen, int* frstLen, int* scndLen, int* k, int* newPoints, int* inserted);
-extern void NRB_splitBuffer(nbReal4* buffer, int newPoints, NurbanaObj_ptr nop, NurbanaObj_ptr nop2, nbReal splitKnot, int newLength, int span, int uv, int frstLen, int scndLen);
-
-extern void NRB_DegreeElevate(NurbanaObj_ptr nop,int Uinc, int Vinc);
-extern void NRB_DegreeReduce(NurbanaObj_ptr nop,int Udec, int Vdec);
-
-extern void NRB_Print(NurbanaObj_ptr nop);
-
-extern void NRB_Echo();
-
-#define  NURBANA_PRIMITIVE_CURVE     0
-#define  NURBANA_PRIMITIVE_SURFACE   1
-#define  NURBANA_PRIMITIVE_CIRCLE    2
-#define NURBANA_PRIMITIVE_TUBE    3
-#define NURBANA_PRIMITIVE_TORUS      4
-#define  NURBANA_PRIMITIVE_SPHERE    5
-#ifdef __cplusplus
-}
-#endif
-
-#endif // NAN_INCLUDED_nurbana_h
+/*
+* $Id$
+*
+* ***** BEGIN GPL LICENSE BLOCK *****
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software  Foundation,
+* Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*
+* The Original Code is Copyright (C) 2005 by Emmanuel Stone
+* All rights reserved.
+*
+* The Original Code is: all of this file.
+*
+* Contributor(s): none yet.
+*
+* ***** END GPL LICENSE BLOCK *****
+*/
+
+#ifndef NAN_INCLUDED_nurbana_h
+#define NAN_INCLUDED_nurbana_h
+
+#include "../intern/blenderNurbsStruct.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void nurbs_test();
+
+typedef float nbReal;
+
+typedef struct nbReal3 {
+	nbReal  x;
+	nbReal  y;
+	nbReal  z;
+
+}nbReal3;
+typedef struct nbReal4 {
+	nbReal  x;
+	nbReal  y;
+	nbReal  z;
+	nbReal  a;
+}nbReal4;
+
+
+/*typedef struct Point3d {
+	nbReal  x;
+	nbReal  y;
+	nbReal  z;
+	nbReal  H;
+
+	// This extra data should make Point4d 'struct'rally equivalent to BPoint from Blender::DNA_Data_Types.h
+	nbReal alfa, weight;		// alfa: tilt in 3D View, weight: used for softbody goal weight 
+	short f1, hide;
+	nbReal radius, pad;		// user-set radius per point for bevelling etc 
+}Point3d;
+*/
+//typedef Point3d nbReal3;
+
+typedef struct Nurb_Extern {
+   int numCPu;
+	int numCPv;
+	int resolu;
+	int resolv;
+	short cyclicU;
+	short cyclicV;
+	short orderU;
+	short orderV;
+	int numKnotsU;
+	int numKnotsV;
+	nbReal *KnotU;
+	nbReal *KnotV;
+	struct ControlPoint *CP;
+} Nurb_Extern;
+
+typedef struct ControlPoint {
+	nbReal x;
+	nbReal y;
+	nbReal z;
+	nbReal H;
+	// This extra data makes nurbana struct compatible with blender

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list