Merge branch 'release-1.0.0'

.gitignore

@@ -29,6 +29,8 @@ src/.deps/*
 src/config.h
 src/config.h.in
 src/stamp-h1
+src/lodifier/lodifier
+src/lodifier/megascene
 spin-*.pc
 tests/.deps/*
 *.lo
@@ -47,16 +49,12 @@ src/spin/spindocgenerator
 src/spin/spinserver
 src/spin/spinviewer
 src/editor/spineditor
-src/osgWrappers/introspection/CompositeViewer.cpp
+src/osgWrappers/introspection/*.cpp
 src/osgWrappers/introspection/Users
-src/osgWrappers/introspection/dofppu.cpp
-src/osgWrappers/introspection/ssaoppu.cpp
-src/osgWrappers/introspection/pocoUtil.cpp
 spinframework-*.*.*
 doxyfile
 doxyfile.stamp
 html
-man
 doxygen
 latex
 tests/check_it_works

AUTHORS

@@ -7,4 +7,5 @@ Contributors:
     Louis Bouchard (http://lwi.users.sourceforge.net)
     Tristan Matthews <tristan@sat.qc.ca>
     Alexandre Quessy <alexandre@quessy.net>
+    Emmanuel Durand <emmanueldurand@gmail.com>
 

LICENSE

@@ -7,7 +7,7 @@
 // |---------------------------------------------------------------------------|
 //
 // http://spinframework.sourceforge.net
-// Copyright (C) 2009 Mike Wozniewski, Zack Settel
+// Copyright (C) 2009-2013 Mike Wozniewski, Zack Settel
 //
 // Developed/Maintained by:
 //    Mike Wozniewski (http://www.mikewoz.com)

Makefile.am

@@ -1,36 +1,19 @@
 # "foreign" means not GNU, and is common for avoiding boring messages about files organized differently from what gnu expects
 AUTOMAKE_OPTIONS = foreign
-
 ACLOCAL_AMFLAGS = -I m4
 
 # Order of compilation really matters:
 SUBDIRS = \
     completion \
     src \
+    man \
     tests
 
-man_MANS = spinserver.1 spinviewer.1 
-MAN_TEXT_FILES = man-spinserver.txt man-spinviewer.txt
 EXTRA_DIST = \
+    buildWrappers.sh \
     LICENSE \
     README \
-    NEWS \
-    $(man_MANS) \
-    $(MAN_TEXT_FILES)
-
-MAINTAINERCLEANFILES = $(man_MANS)
-
-# The man pages depend on the --help strings and the version number.
-common_mandeps = $(top_srcdir)/configure.ac
-
-# Depend on the source, not the binary; we don't need to regenerate the
-# binary when any source file changes, only the main one.
-# Use -o so that the `missing' program can infer the output file.
-spinserver.1: $(top_srcdir)/src/spin/spinServer.cpp $(common_mandeps) $(top_srcdir)/man-spinserver.txt
-	$(HELP2MAN) --include=man-spinserver.txt --name="server for the SPIN Framework" --no-info $(top_builddir)/src/spin/spinserver -o $@
-
-spinviewer.1: $(top_srcdir)/src/spin/spinViewer.cpp $(common_mandeps) $(top_srcdir)/man-spinviewer.txt
-	$(HELP2MAN) --include=man-spinviewer.txt --name="3D viewer for the SPIN Framework" --no-info $(top_builddir)/src/spin/spinviewer -o $@
+    NEWS
 
 wrappers:
 	@echo ""; \
@@ -45,31 +28,12 @@ apps:
 	echo ">>>>>>>>>>>>>>>>>>>>> Generating OSX App Bundles <<<<<<<<<<<<<<<<<<<<<"; \
 	$(MAKE) -C src/spin spinviewer.app
 
-INCLUDES = src/tinyxml
-
 html-local: htmldoc
 htmldoc:
 	@if [ -z `which doxygen` ]; then echo "No Doxygen!"; else doxygen; fi
 
-# man pages:
-# if HAVE_DOXYGEN
-# dist_man_MANS = $(top_srcdir)/man/man3/*.3
-# $(top_srcdir)/man/man3/*.3: doxyfile.stamp
-# 
-# doxyfile.stamp:
-# 	$(DOXYGEN) doxyfile
-# 	echo `date -R` > doxyfile.stamp
-# 
-# CLEANFILES = doxyfile.stamp
-# 
-# all-local: doxyfile.stamp
-# clean-local:
-# 	rm -rf $(top_builddir)/man
-# 	rm -rf html
-# endif 
-
 # pkg-config file:
 DISTCLEANFILES = spin.pc
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = spin-@SPIN_API_VERSION@.pc
+pkgconfig_DATA = spinframework-@SPIN_API_VERSION@.pc
 

NEWS

@@ -1,6 +1,105 @@
 SPIN Framework release notes
 ============================
 
+2013-06-17 : spinframework 1.0.0
+---------------------------------
+This is a stable release of SPIN that marks the start of the 1.x series. 
+
+New Features:
+
+* Improved physics (wind, joints, support for loading of models)
+* libshmdata and Switcher is now the predominant video texturing method. FFMPEG is left as a possibility but is now deprecated and will be removed for the next release
+* Added proper animation parsing in ModelNode to handle the 3 different types of animations (osg::Switch, osg::Sequence, and osgAnimation); now all are controlled with one transparent API
+* Now requires SpatOSC 0.6, allowing events to be propagated
+* Added setColor to group nodes and switches
+* PointCloud support now requires PCL 1.7+
+* Improved dome rendering configuration
+* Added setDetailRatio method to ShapeNode, and reduced default detail for shapes to be more efficient
+* Panoscope support: added rotation parameter to spherical renderer and changed the viewport so it stretches according to the aspect ratio of the display
+
+Bugs fixed:
+
+* Fixed motion blur
+* Many fixes to TextNode
+* Fixed billboards in the dome
+* Many other bugs fixed
+
+
+2012-10-16 : spinframework 0.3.24
+---------------------------------
+This release is in the development series 0.3 that has an unstable API. 
+
+It is a release candidate for the 0.4 series.
+
+New Features:
+
+* lodified (level of detail) models now loadable in spin via ModelNode
+* add new lodifer tool. (level of detail) takes a 3d scene as input and creates levels of detail versions of it
+
+Bugs fixed:
+
+* fixing libflann pck-config issue
+
+
+2012-10-08 : spinframework 0.3.22
+---------------------------------
+This release is in the development series 0.3 that has an unstable API. 
+
+It is a release candidate for the 0.4 series.
+
+New Features:
+
+* support geometry shaders
+
+Bugs fixed:
+
+* Check for libshmdata in SharedVideoTexture.cpp
+* remove bullet-specific files to be installed by default
+* fix typo in a command in README
+
+
+2012-10-03 : spinframework 0.3.20
+---------------------------------
+This release is in the development series 0.3 that has an unstable API. 
+
+It is the first release candidate for the 0.4 series.
+
+New Features:
+
+* Update spatosc version to 0.4
+* Add PPU pipeline with nodemasks for selective rendering
+* Support tilde in python script paths
+* More doc
+* Add setDirectivity setTransitionFactor and debugPrint to SoundNode
+* Rename secureBroadcast to reliableBroadcast
+* Add outline PPU glow effect
+* support shadows
+* support physics with bullet
+* PPU masks
+* dome_viewer.pd patch created
+* changed required Bullet version
+* added shmdata PointCloud reader
+* added double pass rendering to the osg particle system for it to write to the depth buffer
+* Added level-of-detail (LOD) node to allow automatic switching between different qualities of subgraphs based on distance
+* Added a uniform to control transparency in the PPU mask
+* Added a depth buffer to the mask PPU, might be useful
+
+Bugs fixed:
+
+* Fix bug 1002: osg::LightSource was not propely destroyed because it was not accessed through the attachment node.
+* Fix crash when receiving OSC string instead of float
+* Prevent double messaging in spatosc due to global6DOF having a different orientation vector (with a -0 for roll)
+* Remove deprecated classes: MediaManager and MeasurementNode
+* Fix XCode app store link
+* Remove useless STATSDATA_NODE_MASK
+* Fix error with man pages not being generated and build aborted
+* update README and AUTHORS
+* fix error in check_it_works test
+* fix crash when leaving the spinviewer
+* now syncs with milisecond double instead of osg::timer_t
+* Corrected the mask PPU slave camera creation to work with dome view
+
+
 2012-08-31 : spinframework 0.3.18
 ---------------------------------
 This release is in the development series 0.3.x that has an unstable API. 

README

@@ -12,6 +12,11 @@ Copyright (C) 2009 Mike Wozniewski, Zack Settel
 Developed/Maintained by:
    Mike Wozniewski (http://www.mikewoz.com)
    Zack Settel (http://www.sheefa.net/zack)
+   Nicolas Bouillot (http://www.nicolasbouillot.net)
+   Louis Bouchard <lwi.bouchard@gmail.com>
+   Tristan Matthews <tristan@sat.qc.ca>
+   Alexandre Quessy <alexandre@quessy.net>
+   Emmanuel Durand <emmanueldurand@gmail.com>
 
 Principle Partners:
    La Société des Arts Technologiques (http://www.sat.qc.ca)
@@ -45,37 +50,48 @@ For full documentation, visit http://spinframework.org
 
 Dependencies
 ------------
-* Compile and install openscenegraph 2.9.8 or later.
-* Compile and install wxwidgets2.9 2.9.1 or later.::
-
-   On Ubuntu, you can get the libwxgtk2.9-dev package from the Metalab PPA. Do this:
-   $ sudo add-apt-repository ppa:sat-metalab/metalab
-   $ sudo apt-get update
-   $ sudo apt-get install libwxgtk2.9-dev libcppintrospection-2.11-dev
-   $ sudo ln -s /usr/lib/wx/config/gtk2-unicode-2.9 /usr/local/bin/wx-config
-
-* Compile and install cppintrospection from the https://github.com/sat-metalab/cppintrospection
+On Ubuntu GNU/Linux Precise LTS 12.04::
+
+    sudo apt-add-repository ppa:sat-metalab/metalab
+    sudo apt-add-repository ppa:openrave/release
+    sudo apt-add-repository ppa:v-launchpad-jochen-sprickerhof-de/pcl
+    sudo apt-get update
+    sudo apt-get -y install automake bison build-essential cmake-curses-gui flex libtool 
+    sudo apt-get -y install ffmpeg freeglut3-dev libavcodec-dev libavdevice-dev libavformat-dev libboost-filesystem-dev libboost-program-options-dev libboost-python-dev libboost-regex-dev libboost-system-dev libboost-thread-dev libcppintrospection-3.0-dev liblo-dev libopenscenegraph-dev libswscale-dev libxml++2.6-dev libtinyxml-dev
+    sudo apt-get -y install libspatosc-dev
+    sudo apt-get -y install libspnav-dev spacenavd
+    sudo apt-get -y install python python-dev python-setuptools
+    sudo apt-get -y install libbullet-dev
+    sudo apt-get -y install libpoco-dev
+    sudo apt-get -y install ffmpeg
+    sudo apt-get -y install libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev
+    sudo apt-get -y install libshmdata-0.8-dev
+    sudo apt-get -y install libpcl-1.6-all
+    sudo apt-get -y install libtinyxml-dev
 
 
 Compiling
 ---------
-To compile SPIN::
+If you are compiling from a clone of the Git repository, and not from a tarball, you must first do this::
+
+    ./autogen.sh
+
+And then , to compile SPIN::
 
-  ./autogen.sh (if from svn/git, not the tarball)
-  ./configure
-  make 
+    ./configure
+    make 
 
 
 Installing 
 ----------
 To install SPIN::
 
-  sudo make install
-  sudo ldconfig
+    sudo make install
+    sudo ldconfig
 
 
-Installation notes on Ubuntu Lucid GNU/Linux
---------------------------------------------
+Installation notes on the old Ubuntu GNU/Linux Lucid LTS 10.04
+--------------------------------------------------------------
 * make sure you have no openscenegraph, nor openthreads Ubuntu package
 * download and compile openscenegraph (which contains openthreads)
 * download and compile cppintrospection version 3.0
@@ -93,5 +109,5 @@ Linking to SPIN
 ---------------
 To build a C++ that is linked to the SPIN library, use the following flags::
 
-  `pkg-config --libs --cflags spin-0.3 cppintrospection-3.0` -I/usr/include/python2.7
+  `pkg-config --libs --cflags spin-1.0 cppintrospection-3.0` -I/usr/include/python2.7