Skip to content

Commit

Permalink
Simplify copyright header and remove comment junk
Browse files Browse the repository at this point in the history
  • Loading branch information
dsieger committed May 3, 2020
1 parent d892e1f commit 4fe7d52
Show file tree
Hide file tree
Showing 96 changed files with 299 additions and 1,863 deletions.
5 changes: 1 addition & 4 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
Valid-License-Identifier: LicenseRef-MIT-with-employer-disclaimer
License-Text:

MIT License with employer disclaimer

Copyright (C) 2011-2019 The pmp-library developers
Copyright (C) 2011-2020 the Polygon Mesh Processing Library developers.
Copyright (C) 2001-2005 by Computer Graphics Group, RWTH Aachen

Permission is hereby granted, free of charge, to any person obtaining a copy of
Expand Down
5 changes: 3 additions & 2 deletions docs/footer.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<div id="footer">
<address>
Copyright &copy; 2011-2020 The pmp-library developers
Copyright 2011-2020 the Polygon Mesh Processing Library developers.
</address>
</div>
</div>
</body>
</html>

</html>
6 changes: 4 additions & 2 deletions docs/jekyll/_includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<footer class="py-2 bg-light">
<div class="container">
<p class="m-0 text-center text-dark">Copyright &copy; 2011-{{ site.time | date: '%Y' }} The pmp-library developers.</p>
<p class="m-0 text-center text-dark">
Copyright 2011-{{ site.time | date: '%Y' }} the Polygon Mesh Processing Library developers.
</p>
</div>
</footer>
</footer>
18 changes: 2 additions & 16 deletions examples/SurfaceMeshBarycenter.cpp
Original file line number Diff line number Diff line change
@@ -1,21 +1,10 @@
//=============================================================================
// Copyright (C) 2013-2017 The pmp-library developers
//
// This file is part of the Polygon Mesh Processing Library.
// Copyright 2013-2017 the Polygon Mesh Processing Library developers.
// Distributed under a MIT-style license, see LICENSE.txt for details.
//
// SPDX-License-Identifier: MIT-with-employer-disclaimer
//=============================================================================

#include <pmp/SurfaceMesh.h>

//=============================================================================

using namespace pmp;

//=============================================================================


int main(int argc, char** argv)
{
//! [barycenter]
Expand All @@ -28,7 +17,7 @@ int main(int argc, char** argv)
// get (pre-defined) property storing vertex positions
auto points = mesh.get_vertex_property<Point>("v:point");

Point p(0,0,0);
Point p(0, 0, 0);

for (auto vit : mesh.vertices())
{
Expand All @@ -42,6 +31,3 @@ int main(int argc, char** argv)

//! [barycenter]
}


//=============================================================================
36 changes: 12 additions & 24 deletions examples/SurfaceMeshBasics.cpp
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
//=============================================================================
// Copyright (C) 2013-2017 The pmp-library developers
//
// This file is part of the Polygon Mesh Processing Library.
// Copyright 2013-2017 the Polygon Mesh Processing Library developers.
// Distributed under a MIT-style license, see LICENSE.txt for details.
//
// SPDX-License-Identifier: MIT-with-employer-disclaimer
//=============================================================================

#include <pmp/SurfaceMesh.h>

//=============================================================================

using namespace pmp;

//=============================================================================

int main(void)
{
//! [basics]
Expand All @@ -23,26 +13,24 @@ int main(void)
SurfaceMesh mesh;

// instantiate 4 vertex handles
Vertex v0,v1,v2,v3;
Vertex v0, v1, v2, v3;

// add 4 vertices
v0 = mesh.add_vertex(Point(0,0,0));
v1 = mesh.add_vertex(Point(1,0,0));
v2 = mesh.add_vertex(Point(0,1,0));
v3 = mesh.add_vertex(Point(0,0,1));
v0 = mesh.add_vertex(Point(0, 0, 0));
v1 = mesh.add_vertex(Point(1, 0, 0));
v2 = mesh.add_vertex(Point(0, 1, 0));
v3 = mesh.add_vertex(Point(0, 0, 1));

// add 4 triangular faces
mesh.add_triangle(v0,v1,v3);
mesh.add_triangle(v1,v2,v3);
mesh.add_triangle(v2,v0,v3);
mesh.add_triangle(v0,v2,v1);
mesh.add_triangle(v0, v1, v3);
mesh.add_triangle(v1, v2, v3);
mesh.add_triangle(v2, v0, v3);
mesh.add_triangle(v0, v2, v1);

std::cout << "vertices: " << mesh.n_vertices() << std::endl;
std::cout << "edges: " << mesh.n_edges() << std::endl;
std::cout << "faces: " << mesh.n_faces() << std::endl;
std::cout << "edges: " << mesh.n_edges() << std::endl;
std::cout << "faces: " << mesh.n_faces() << std::endl;

//! [basics]
return 0;
}

//=============================================================================
15 changes: 1 addition & 14 deletions examples/SurfaceMeshIO.cpp
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
//=============================================================================
// Copyright (C) 2013-2017 The pmp-library developers
//
// This file is part of the Polygon Mesh Processing Library.
// Copyright 2013-2017 the Polygon Mesh Processing Library developers.
// Distributed under a MIT-style license, see LICENSE.txt for details.
//
// SPDX-License-Identifier: MIT-with-employer-disclaimer
//=============================================================================

#include <pmp/SurfaceMesh.h>

//=============================================================================

using namespace pmp;

//=============================================================================

int main(int argc, char** argv)
{
//! [io]
Expand All @@ -37,6 +27,3 @@ int main(int argc, char** argv)
//! [io]
return 0;
}


//=============================================================================
14 changes: 1 addition & 13 deletions examples/SurfaceMeshIterators.cpp
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
//=============================================================================
// Copyright (C) 2013-2017 The pmp-library developers
//
// This file is part of the Polygon Mesh Processing Library.
// Copyright 2013-2017 the Polygon Mesh Processing Library developers.
// Distributed under a MIT-style license, see LICENSE.txt for details.
//
// SPDX-License-Identifier: MIT-with-employer-disclaimer
//=============================================================================

#include <pmp/SurfaceMesh.h>

//=============================================================================

using namespace pmp;

//=============================================================================

int main(int argc, char** argv)
{
//! [iterators]
Expand All @@ -39,5 +29,3 @@ int main(int argc, char** argv)

//! [iterators]
}

//=============================================================================
18 changes: 1 addition & 17 deletions src/apps/MeshProcessingViewer.cpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
//=============================================================================
// Copyright (C) 2011-2019 The pmp-library developers
//
// This file is part of the Polygon Mesh Processing Library.
// Copyright 2011-2019 the Polygon Mesh Processing Library developers.
// Distributed under a MIT-style license, see LICENSE.txt for details.
//
// SPDX-License-Identifier: MIT-with-employer-disclaimer
//=============================================================================

#include "MeshProcessingViewer.h"

Expand All @@ -20,8 +14,6 @@

#include <imgui.h>

//=============================================================================

MeshProcessingViewer::MeshProcessingViewer(const char* title, int width,
int height)
: MeshViewer(title, width, height), smoother_(mesh_)
Expand All @@ -33,8 +25,6 @@ MeshProcessingViewer::MeshProcessingViewer(const char* title, int width,
add_help_item("O", "Flip mesh orientation", 5);
}

//----------------------------------------------------------------------------

void MeshProcessingViewer::keyboard(int key, int scancode, int action, int mods)
{
if (action != GLFW_PRESS && action != GLFW_REPEAT)
Expand Down Expand Up @@ -97,8 +87,6 @@ void MeshProcessingViewer::keyboard(int key, int scancode, int action, int mods)
}
}

//----------------------------------------------------------------------------

void MeshProcessingViewer::process_imgui()
{
MeshViewer::process_imgui();
Expand Down Expand Up @@ -294,8 +282,6 @@ void MeshProcessingViewer::process_imgui()
}
}

//----------------------------------------------------------------------------

void MeshProcessingViewer::mouse(int button, int action, int mods)
{
if (action == GLFW_PRESS && button == GLFW_MOUSE_BUTTON_MIDDLE &&
Expand Down Expand Up @@ -326,5 +312,3 @@ void MeshProcessingViewer::mouse(int button, int action, int mods)
MeshViewer::mouse(button, action, mods);
}
}

//=============================================================================
14 changes: 2 additions & 12 deletions src/apps/MeshProcessingViewer.h
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
//=============================================================================
// Copyright (C) 2011-2019 The pmp-library developers
//
// This file is part of the Polygon Mesh Processing Library.
// Copyright 2011-2019 the Polygon Mesh Processing Library developers.
// Distributed under a MIT-style license, see LICENSE.txt for details.
//
// SPDX-License-Identifier: MIT-with-employer-disclaimer
//=============================================================================

#pragma once
//=============================================================================

#include <pmp/visualization/MeshViewer.h>
#include <pmp/algorithms/SurfaceSmoothing.h>

using namespace pmp;

//=============================================================================

class MeshProcessingViewer : public pmp::MeshViewer
{
public:
Expand All @@ -36,5 +28,3 @@ class MeshProcessingViewer : public pmp::MeshViewer
// smoother has to remember cotan weights, hence it global member
SurfaceSmoothing smoother_;
};

//=============================================================================
18 changes: 1 addition & 17 deletions src/apps/curview.cpp
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
//=============================================================================
// Copyright (C) 2011-2019 The pmp-library developers
//
// This file is part of the Polygon Mesh Processing Library.
// Copyright 2011-2019 the Polygon Mesh Processing Library developers.
// Distributed under a MIT-style license, see LICENSE.txt for details.
//
// SPDX-License-Identifier: MIT-with-employer-disclaimer
//=============================================================================

#include <pmp/visualization/MeshViewer.h>
#include <pmp/algorithms/SurfaceCurvature.h>
#include <imgui.h>

using namespace pmp;

//=============================================================================

class Viewer : public MeshViewer
{
public:
Expand All @@ -24,16 +16,12 @@ class Viewer : public MeshViewer
virtual void process_imgui();
};

//=============================================================================

Viewer::Viewer(const char* title, int width, int height, bool showgui)
: MeshViewer(title, width, height, showgui)
{
set_draw_mode("Solid Smooth");
}

//=============================================================================

void Viewer::process_imgui()
{
MeshViewer::process_imgui();
Expand Down Expand Up @@ -70,8 +58,6 @@ void Viewer::process_imgui()
}
}

//=============================================================================

int main(int argc, char** argv)
{
#ifndef __EMSCRIPTEN__
Expand All @@ -85,5 +71,3 @@ int main(int argc, char** argv)
return window.run();
#endif
}

//=============================================================================
18 changes: 1 addition & 17 deletions src/apps/decimation.cpp
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
//=============================================================================
// Copyright (C) 2011-2019 The pmp-library developers
//
// This file is part of the Polygon Mesh Processing Library.
// Copyright 2011-2019 the Polygon Mesh Processing Library developers.
// Distributed under a MIT-style license, see LICENSE.txt for details.
//
// SPDX-License-Identifier: MIT-with-employer-disclaimer
//=============================================================================

#include <pmp/visualization/MeshViewer.h>
#include <pmp/algorithms/SurfaceSimplification.h>
#include <imgui.h>

using namespace pmp;

//=============================================================================

class Viewer : public MeshViewer
{
public:
Expand All @@ -24,17 +16,13 @@ class Viewer : public MeshViewer
virtual void process_imgui();
};

//=============================================================================

Viewer::Viewer(const char* title, int width, int height)
: MeshViewer(title, width, height)
{
set_draw_mode("Hidden Line");
crease_angle_ = 0.0;
}

//=============================================================================

void Viewer::process_imgui()
{
MeshViewer::process_imgui();
Expand Down Expand Up @@ -69,8 +57,6 @@ void Viewer::process_imgui()
}
}

//=============================================================================

int main(int argc, char** argv)
{
#ifndef __EMSCRIPTEN__
Expand All @@ -84,5 +70,3 @@ int main(int argc, char** argv)
return window.run();
#endif
}

//=============================================================================
Loading

0 comments on commit 4fe7d52

Please sign in to comment.