Skip to content

Commit

Permalink
strip copyrights
Browse files Browse the repository at this point in the history
Former-commit-id: ff641e3
  • Loading branch information
Alec Jacobson (jalec authored and Alec Jacobson (jalec committed Nov 25, 2013
1 parent 57eb03d commit 166ae80
Show file tree
Hide file tree
Showing 21 changed files with 1,100 additions and 106 deletions.
674 changes: 674 additions & 0 deletions LICENSE.GPL

Large diffs are not rendered by default.

373 changes: 373 additions & 0 deletions LICENSE.MPL2

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions RELEASE_HISTORY.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
0.4.0 Release under MPL2 license
0.3.7 Embree2.0 support
0.3.6 boost extra, patches, mosek 7 support, libiglbbw (mosek optional)
0.3.5 More examples, naive primitive sorting
Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
# Anyone may increment Minor to indicate a small change.
# Major indicates a large change or large number of changes (upload to website)
# World indicates a substantial change or release
0.3.7
0.4.0
1 change: 0 additions & 1 deletion include/igl/ReAntTweakBar.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
// requires changes in a few places...
//
//
// Copyright Alec Jacobson, 2011
//

// This allows the user to have a non-global, static installation of
Expand Down
5 changes: 0 additions & 5 deletions include/igl/is_border_vertex.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
//
// IGL Lib - Simple C++ mesh library
//
// Copyright 2011, Daniele Panozzo. All rights reserved.

#ifndef IGL_IS_BORDER_VERTEX_H
#define IGL_IS_BORDER_VERTEX_H
#include "igl_inline.h"
Expand Down
5 changes: 0 additions & 5 deletions include/igl/is_manifold.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
//
// IGL Lib - Simple C++ mesh library
//
// Copyright 2011, Daniele Panozzo. All rights reserved.

#ifndef IGL_IS_MANIFOLD_H
#define IGL_IS_MANIFOLD_H
#include "igl_inline.h"
Expand Down
6 changes: 0 additions & 6 deletions include/igl/matlab/matlabinterface.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
#ifndef IGL_MATLAB_INTERFACE_H
#define IGL_MATLAB_INTERFACE_H
#include "../igl_inline.h"

//
// IGL Lib - Simple C++ mesh library
//
// Copyright 2011, Daniele Panozzo. All rights reserved.

// WARNING: These functions require matlab installed
// Additional header folder required:
// /Applications/MATLAB_R2011a.app/extern/include
Expand Down
5 changes: 0 additions & 5 deletions include/igl/pos.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
//
// IGL Lib - Simple C++ mesh library
//
// Copyright 2011, Daniele Panozzo. All rights reserved.

#ifndef IGL_POS_H
#define IGL_POS_H

Expand Down
1 change: 0 additions & 1 deletion include/igl/project_to_line.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ namespace igl
// T #P by 1 list of parameters
// sqrD #P by 1 list of squared distances
//
// Copyright 2011, Alec Jacobson ([email protected])
//
template <
typename MatP,
Expand Down
11 changes: 2 additions & 9 deletions include/igl/read.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
//
// IGL Lib - Simple C++ mesh library
//
// Copyright 2011, Daniele Panozzo. All rights reserved.

// History:
// return type changed from void to bool Alec 18 Sept 2011


#ifndef IGL_READ_H
#define IGL_READ_H
#include "igl_inline.h"
Expand All @@ -16,6 +7,8 @@
#endif
#include <string>
#include <vector>
// History:
// return type changed from void to bool Alec 18 Sept 2011

namespace igl
{
Expand Down
12 changes: 3 additions & 9 deletions include/igl/readOBJ.h
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
//
// IGL Lib - Simple C++ mesh library
//
// Copyright 2011, Daniele Panozzo. All rights reserved.

#ifndef IGL_READOBJ_H
#define IGL_READOBJ_H
#include "igl_inline.h"
// History:
// return type changed from void to bool Alec 18 Sept 2011
// added pure vector of vectors version that has much more support Alec 31 Oct
// 2011

#ifndef IGL_READOBJ_H
#define IGL_READOBJ_H
#include "igl_inline.h"

#ifndef IGL_NO_EIGEN
# include <Eigen/Core>
#endif
Expand Down
10 changes: 2 additions & 8 deletions include/igl/readOFF.h
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
//
// IGL Lib - Simple C++ mesh library
//
// Copyright 2011, Daniele Panozzo. All rights reserved.

// History:
// return type changed from void to bool Alec 18 Sept 2011

#ifndef IGL_READOFF_H
#define IGL_READOFF_H
#include "igl_inline.h"
// History:
// return type changed from void to bool Alec 18 Sept 2011

#ifndef IGL_NO_EIGEN
# include <Eigen/Core>
Expand Down
8 changes: 0 additions & 8 deletions include/igl/removeDuplicates.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
//
// removeDuplicates.h
// Preview3D
//
// Created by Olga Diamanti on 17/11/11.
// Copyright (c) 2011 __MyCompanyName__. All rights reserved.
//

#ifndef IGL_REMOVEDUPLICATES_H
#define IGL_REMOVEDUPLICATES_H
#include "igl_inline.h"
Expand Down
5 changes: 0 additions & 5 deletions include/igl/tt.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
//
// IGL Lib - Simple C++ mesh library
//
// Copyright 2011, Daniele Panozzo. All rights reserved.

#ifndef IGL_TT_H
#define IGL_TT_H
#include "igl_inline.h"
Expand Down
5 changes: 0 additions & 5 deletions include/igl/write.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
//
// IGL Lib - Simple C++ mesh library
//
// Copyright 2011, Daniele Panozzo. All rights reserved.

#ifndef IGL_WRITE_H
#define IGL_WRITE_H
#include "igl_inline.h"
Expand Down
10 changes: 2 additions & 8 deletions include/igl/writeOBJ.h
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
//
// IGL Lib - Simple C++ mesh library
//
// Copyright 2011, Daniele Panozzo. All rights reserved.

// History:
// return type changed from void to bool Alec 20 Sept 2011

#ifndef IGL_WRITEOBJ_H
#define IGL_WRITEOBJ_H
#include "igl_inline.h"
// History:
// return type changed from void to bool Alec 20 Sept 2011

#include <Eigen/Core>
#include <string>
Expand Down
11 changes: 3 additions & 8 deletions include/igl/writeOFF.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
//
// IGL Lib - Simple C++ mesh library
//
// Copyright 2011, Daniele Panozzo. All rights reserved.

#ifndef IGL_WRITEOFF_H
#define IGL_WRITEOFF_H
#include "igl_inline.h"
Expand All @@ -14,9 +9,9 @@ namespace igl
{
template <typename DerivedV, typename DerivedF>
IGL_INLINE bool writeOFF(
const std::string str,
const Eigen::PlainObjectBase<DerivedV>& V,
const Eigen::PlainObjectBase<DerivedF>& F);
const std::string str,
const Eigen::PlainObjectBase<DerivedV>& V,
const Eigen::PlainObjectBase<DerivedF>& F);
}

#ifdef IGL_HEADER_ONLY
Expand Down
6 changes: 5 additions & 1 deletion scripts/compress.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,13 @@ libigl - A simple c++ geometry processing library
http://igl.ethz.ch/projects/libigl/
Copyright 2013 - Alec Jacobson, Daniele Panozzo, Olga Diamanti, Kenshi
Copyright (C) 2013 - Alec Jacobson, Daniele Panozzo, Olga Diamanti, Kenshi
Takayama, Leo Sacht, Interactive Geometry Lab - ETH Zurich
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/.
`cat $LIBIGL/VERSION.txt | sed -ne "s/^\([^\#]\)/VERSION \1/p"`
Compressed on `date`
Expand Down
1 change: 0 additions & 1 deletion style.css
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ ul
padding: 0px 20px;
list-style-type:none;
}
li { padding-left: 30px;text-indent: -30px;}
li { font-size: 100% }
li li { font-size: 90% }
li li li { font-size: 80% }
Expand Down
54 changes: 34 additions & 20 deletions style_guidelines.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ <h2>Example</h2>
</p>
<h3>example_fun.h</h3>
<pre><code>
// This file is part of libigl, a simple c++ geometry processing library.
//
// Copyright (C) 2013 Alec Jacobson &lt;[email protected]&gt;
//
// 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_EXAMPLE_FUN_H
#define IGL_EXAMPLE_FUN_H

Expand All @@ -41,7 +48,7 @@ <h3>example_fun.h</h3>
// input some input of a Printable type
// Returns true for the sake of returning something
template &lt;typename Printable&gt;
IGL_INLINE bool example_fun(const Printable & input);
IGL_INLINE bool example_fun(const Printable &amp; input);
}

#ifdef IGL_HEADER_ONLY
Expand All @@ -52,58 +59,62 @@ <h3>example_fun.h</h3>
</code></pre>
<h3>example_fun.cpp</h3>
<pre><code>
#include "igl/example_fun.h"
// This file is part of libigl, a simple c++ geometry processing library.
//
// Copyright (C) 2013 Alec Jacobson &lt;[email protected]&gt;
//
// 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/.#include "igl/example_fun.h"
#include &lt;iostream&gt;

template &lt;typename Printable&gt;
IGL_INLINE bool igl::example_fun(const Printable & input)
IGL_INLINE bool igl::example_fun(const Printable &amp; input)
{
using namespace std;
cout&lt;&lt;"example_fun: "&lt;&lt;input&lt;&lt;endl;
return true;
}

#ifndef IGL_HEADER_ONLY
template bool igl::example_fun&lt;double&gt;(const double& input);
template bool igl::example_fun&lt;int&gt;(const int& input);
template bool igl::example_fun&lt;double&gt;(const double&amp; input);
template bool igl::example_fun&lt;int&gt;(const int&amp; input);
#endif
</code></pre>



<h2>General rules</h2>
<h2 id=general_rules>General rules</h2>
<ul>
<li> Use a single .h/.cpp pair with the same name as the function </li>
<li>
At least one version of the function should use references for all outputs
</li>
<li>
Functions with external dependencies should be a single .h file (no .cpp file)
so it won't appear in libigl.a
</li>
<li>
Use wrappers and additional prototypes for returning single-output functions'
outputs, but the default is to only use outputs
</li>
<li> All inputs should be const when appropriate </li>
<li> All inputs should be <code>const</code>.</li>
<li>
Use c++ references for inputs and outputs rather than pointers or pass-by-copy
Use C++ references (e.g. <code>Matrix &amp; mat</code>) for inputs and outputs
rather than pointers (e.g. <code>Matrix * mat</code>) or pass-by-copy (e.g.
<code>Matrix mat</code>).
</li>
<li>
Take the time to write multiple prototypes if you'd like to have optional
parameters with default values
Write multiple prototypes if you'd like to have optional parameters with
default values.
</li>
<li>
External dependencies (besides Eigen, OpenGL, etc.) are discouraged
External dependencies (besides Eigen and OpenGL) are only allowed within extras.
</li>
<li>
External dependencies must be clearly identified at the top of each file.
New extras and their dependencies must be discussed first.
</li>
<li>
External dependencies can go in the external/ directory
Hard-to-compile or obscure external dependencies can go in the <code>external/</code> directory.
</li>
<li>
Do not use the using namespace directive anywhere outside a local scope. This
Do not use the <code>using namespace</code> directive anywhere outside a local scope. This
means never write: <code>using namespace std;</code> or <code>using namespace
igl;</code> etc. at the top of a file.
</li>
Expand All @@ -114,8 +125,8 @@ <h2>General rules</h2>
</li>
<li> Classes should be in <code>CamelCase</code></li>
<li> No tabs, only two spaces per indentation level </li>
<li> Be generous with assertions, but always identify them with strings:
<br> e.g. <code>assert(m&lt;n && "m must be less than n");</code></li>
<li> Be generous with assertions and always identify them with strings:
<br> e.g. <code>assert(m&lt;n &amp;&amp; "m must be less than n");</code></li>
</ul>

<h2>Specific rules</h2>
Expand Down Expand Up @@ -187,6 +198,9 @@ <h2>Useful scripts to check style</h2>
<td><code>grep -L "^#ifndef IGL_" *</code></td>
<td>Find files that don't contain #ifndef IGL_</td>
</tr>
<tr class=d1>
<td><code>grep -L "^This file is part of libigl" *</code></td>
</tr>
</table>

<p>See also: <a href=tutorial.html>tutorial</a>, <a
Expand Down

0 comments on commit 166ae80

Please sign in to comment.