Browse Source

Small changes

Former-commit-id: a050209d83914035eefcc6d8164e6a544d9969f9
schuellc 10 years ago
parent
commit
6d2a4dc498

+ 1 - 0
include/igl/embree/EmbreeIntersector.h

@@ -1,6 +1,7 @@
 // This file is part of libigl, a simple c++ geometry processing library.
 // This file is part of libigl, a simple c++ geometry processing library.
 // 
 // 
 // Copyright (C) 2013 Alec Jacobson <alecjacobson@gmail.com>
 // Copyright (C) 2013 Alec Jacobson <alecjacobson@gmail.com>
+//               2014 Christian Schüller <schuellchr@gmail.com>
 // 
 // 
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 

+ 2 - 1
include/igl/embree/Hit.h

@@ -1,7 +1,8 @@
 // This file is part of libigl, a simple c++ geometry processing library.
 // This file is part of libigl, a simple c++ geometry processing library.
 // 
 // 
 // Copyright (C) 2013 Alec Jacobson <alecjacobson@gmail.com>
 // Copyright (C) 2013 Alec Jacobson <alecjacobson@gmail.com>
-// 
+//               2014 Christian Schüller <schuellchr@gmail.com> 
+//
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
 // obtain one at http://mozilla.org/MPL/2.0/.

+ 2 - 6
include/igl/serialize.cpp

@@ -1,14 +1,10 @@
-// This file is part of libigl, a simple c++ geometry processing library.
 // 
 // 
-// Copyright (C) 2013 Alec Jacobson <alecjacobson@gmail.com>
+// Copyright (C) 2014 Christian Schüller <schuellchr@gmail.com>
 // 
 // 
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
 // obtain one at http://mozilla.org/MPL/2.0/.
-// ---------------------------------------------------------------------------
-// serialize.h
-// author: Christian Schüller <schuellchr@gmail.com>
-// -----------------------------------------------------------------------------
+
 #include "serialize.h"
 #include "serialize.h"
 
 
 namespace igl
 namespace igl

+ 1 - 5
include/igl/serialize.h

@@ -1,13 +1,9 @@
-// This file is part of libigl, a simple c++ geometry processing library.
 // 
 // 
-// Copyright (C) 2013 Alec Jacobson <alecjacobson@gmail.com>
+// Copyright (C) 2014 Christian Schüller <schuellchr@gmail.com>
 // 
 // 
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
 // obtain one at http://mozilla.org/MPL/2.0/.
-// ---------------------------------------------------------------------------
-// serialize.h
-// author: Christian Schüller <schuellchr@gmail.com>
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // Functions to save and load a serialization of fundamental c++ data types to
 // Functions to save and load a serialization of fundamental c++ data types to
 // and from a binary file. STL containers, Eigen matrix types and nested data
 // and from a binary file. STL containers, Eigen matrix types and nested data

+ 6 - 0
include/igl/xml/XMLSerialization.h

@@ -1,3 +1,9 @@
+// 
+// Copyright (C) 2014 Christian Schüller <schuellchr@gmail.com>
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public License 
+// v. 2.0. If a copy of the MPL was not distributed with this file, You can 
+// obtain one at http://mozilla.org/MPL/2.0/.
 #ifndef IGL_XML_SERIALIZATION_H
 #ifndef IGL_XML_SERIALIZATION_H
 #define IGL_XML_SERIALIZATION_H
 #define IGL_XML_SERIALIZATION_H
 
 

+ 0 - 1
include/igl/xml/old version/XMLSerializer.h.REMOVED.git-id

@@ -1 +0,0 @@
-ab26d135c79d225b587e9dd8a7cb86a677edcb82

+ 2 - 2
include/igl/xml/old version/ReAntTweakBarXMLSerialization.h → include/igl/xml/old_version/ReAntTweakBarXMLSerialization.h

@@ -1,10 +1,10 @@
-// This file is part of libigl, a simple c++ geometry processing library.
 // 
 // 
-// Copyright (C) 2013 Alec Jacobson <alecjacobson@gmail.com>
+// Copyright (C) 2014 Christian Schüller <schuellchr@gmail.com>
 // 
 // 
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
 // obtain one at http://mozilla.org/MPL/2.0/.
+
 #ifndef IGL_REANTTWEAKBAR_XML_SERIALIZATION_H
 #ifndef IGL_REANTTWEAKBAR_XML_SERIALIZATION_H
 #define IGL_REANTTWEAKBAR_XML_SERIALIZATION_H
 #define IGL_REANTTWEAKBAR_XML_SERIALIZATION_H
 #include "../igl_inline.h"
 #include "../igl_inline.h"

+ 3 - 7
include/igl/xml/old version/XMLSerializable.h → include/igl/xml/old_version/XMLSerializable.h

@@ -1,13 +1,9 @@
-// This file is part of libigl, a simple c++ geometry processing library.
 // 
 // 
-// Copyright (C) 2013 Alec Jacobson <alecjacobson@gmail.com>
+// Copyright (C) 2014 Christian Schüller <schuellchr@gmail.com>
 // 
 // 
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
 // obtain one at http://mozilla.org/MPL/2.0/.
-/* ---------------------------------------------------------------------------
- // XMLSerializable.h
- // Author: Christian Schüller <schuellchr@gmail.com>
  ------------------------------------------------------------------------------
  ------------------------------------------------------------------------------
  Inherit from this abstract class to have full control over the serialization
  Inherit from this abstract class to have full control over the serialization
  of your user defined class.
  of your user defined class.
@@ -39,13 +35,13 @@ namespace igl
         * Serialize your stuff within this function.
         * Serialize your stuff within this function.
         * doc is the current serialization xml file. You can use SaveToXMLDoc to add your objects.
         * doc is the current serialization xml file. You can use SaveToXMLDoc to add your objects.
         */
         */
-      virtual void Serialize(tinyxml2::XMLDocument* doc,tinyxml2::XMLElement* element) = 0;
+      virtual bool Serialize(tinyxml2::XMLDocument* doc,tinyxml2::XMLElement* element) = 0;
 
 
       /**
       /**
         * Deserialize your stuff within this function.
         * Deserialize your stuff within this function.
         * doc is the current serialization xml file. You can use LoadFromXMLDoc to read out your objects.
         * doc is the current serialization xml file. You can use LoadFromXMLDoc to read out your objects.
         */
         */
-      virtual void Deserialize(tinyxml2::XMLDocument* doc,const tinyxml2::XMLElement* element) = 0;
+      virtual bool Deserialize(tinyxml2::XMLDocument* doc,const tinyxml2::XMLElement* element) = 0;
     };
     };
   }
   }
 }
 }

+ 1 - 5
include/igl/xml/old version/XMLSerialization.h → include/igl/xml/old_version/XMLSerialization.h

@@ -1,13 +1,9 @@
-// This file is part of libigl, a simple c++ geometry processing library.
 // 
 // 
-// Copyright (C) 2013 Alec Jacobson <alecjacobson@gmail.com>
+// Copyright (C) 2014 Christian Schüller <schuellchr@gmail.com>
 // 
 // 
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
 // obtain one at http://mozilla.org/MPL/2.0/.
-/* ---------------------------------------------------------------------------
- // XMLSerialization.h
- // Author: Christian Schüller <schuellchr@gmail.com>
  ------------------------------------------------------------------------------
  ------------------------------------------------------------------------------
  Inherit from this class to have the easiest way to serialize your user defined class.
  Inherit from this class to have the easiest way to serialize your user defined class.
  
  

+ 1 - 5
include/igl/xml/old version/XMLSerializationTest.h → include/igl/xml/old_version/XMLSerializationTest.h

@@ -1,13 +1,9 @@
-// This file is part of libigl, a simple c++ geometry processing library.
 // 
 // 
-// Copyright (C) 2013 Alec Jacobson <alecjacobson@gmail.com>
+// Copyright (C) 2014 Christian Schüller <schuellchr@gmail.com>
 // 
 // 
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
 // obtain one at http://mozilla.org/MPL/2.0/.
-/* ---------------------------------------------------------------------------
-// XMLSerializationTest.h
-// Author: Christian Schüller <schuellchr@gmail.com>
 ------------------------------------------------------------------------------
 ------------------------------------------------------------------------------
  Used to demonstrates howto use the XMLSerialization class.
  Used to demonstrates howto use the XMLSerialization class.
 ----------------------------------------------------------------------------*/
 ----------------------------------------------------------------------------*/

+ 1 - 0
include/igl/xml/old_version/XMLSerializer.h.REMOVED.git-id

@@ -0,0 +1 @@
+681d2916ad693666eda6e41efaf85b0cc14f2dfd

+ 6 - 0
include/igl/xml/serialization_test.h

@@ -1,3 +1,9 @@
+// 
+// Copyright (C) 2014 Christian Schüller <schuellchr@gmail.com>
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public License 
+// v. 2.0. If a copy of the MPL was not distributed with this file, You can 
+// obtain one at http://mozilla.org/MPL/2.0/.
 #ifndef IGL_SERIALIZATION_TEST_H
 #ifndef IGL_SERIALIZATION_TEST_H
 #define IGL_SERIALIZATION_TEST_H
 #define IGL_SERIALIZATION_TEST_H
 
 

+ 1 - 6
include/igl/xml/serialize_xml.cpp

@@ -1,14 +1,9 @@
-// This file is part of libigl, a simple c++ geometry processing library.
 // 
 // 
-// Copyright (C) 2013 Alec Jacobson <alecjacobson@gmail.com>
+// Copyright (C) 2014 Christian Schüller <schuellchr@gmail.com>
 // 
 // 
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
 // obtain one at http://mozilla.org/MPL/2.0/.
-// ---------------------------------------------------------------------------
-// serialize.h
-// author: Christian Schüller <schuellchr@gmail.com>
-// -----------------------------------------------------------------------------
 
 
 #include "serialize_xml.h"
 #include "serialize_xml.h"
 
 

+ 1 - 5
include/igl/xml/serialize_xml.h

@@ -1,13 +1,9 @@
-// This file is part of libigl, a simple c++ geometry processing library.
 // 
 // 
-// Copyright (C) 2013 Alec Jacobson <alecjacobson@gmail.com>
+// Copyright (C) 2014 Christian Schüller <schuellchr@gmail.com>
 // 
 // 
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
 // obtain one at http://mozilla.org/MPL/2.0/.
-// ---------------------------------------------------------------------------
-// serialize.h
-// author: Christian Schüller <schuellchr@gmail.com>
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // Functions to save and load a serialization of fundamental c++ data types to
 // Functions to save and load a serialization of fundamental c++ data types to
 // and from a xml file. STL containers, Eigen matrix types and nested data
 // and from a xml file. STL containers, Eigen matrix types and nested data