Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add MapRender for quads #316

Open
wants to merge 32 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
631d4d9
comment typo
Jun 28, 2017
19580b4
Merge branch 'develop' of github.com:cgogn/CGoGN_2 into kvanhoey
Jul 3, 2017
c63c9f6
Merge branch 'develop' of github.com:cgogn/CGoGN_1 into kvanhoey
Aug 8, 2017
1504c97
Add map_quad_render
Aug 8, 2017
9f9efc6
Cleanup MapQuadRender
Aug 11, 2017
53c7b8e
add ParallelogramTiling Topo. Ongoing ...
Aug 21, 2017
100adff
paralellogram_grid
Aug 23, 2017
7dca195
cleanup for parallelogram grid
Aug 23, 2017
4bee075
code refactoring on parallelogram_grid
Aug 24, 2017
7e6a4e7
code refactoring on parallelogram_grid
Aug 24, 2017
4abd9c5
integrate MapQuadRender into MapRender with an enum QUAD
Sep 12, 2017
f5e2681
Merge branch 'develop' of github.com:cgogn/CGoGN_2 into kvanhoey
Sep 12, 2017
ff110a1
update CMakeList accordingly
Sep 12, 2017
ad23554
add missing break; instruction
Sep 12, 2017
a099b06
change spaces to tabs
Sep 12, 2017
e3d0cc5
sampling parallelograms
Sep 13, 2017
f50c66f
sample parallelograms
Sep 13, 2017
c12be0e
Sample parallelograms updated
Sep 18, 2017
c2dcb16
Sample parallelograms updated
Sep 18, 2017
b0726f5
bug fixing
Sep 22, 2017
4921587
double templates for parallelogram_grid
Sep 29, 2017
9717168
replace assert by warning
Oct 5, 2017
1eb98f4
compil fix
kvanhoey Oct 6, 2017
c24b111
Merge branch 'develop' of github.com:cgogn/CGoGN_2 into kvanhoey
kvanhoey Oct 6, 2017
869cc70
tmp commit
kvanhoey Oct 9, 2017
cca187d
fix conflict
kvanhoey Oct 9, 2017
71ffd9c
adding planarity and convexity tests for faces
Oct 27, 2017
cbd1ec9
add parallelogram::isApprox
Oct 27, 2017
082bba6
correct snake_case
kvanhoey Oct 27, 2017
0cad941
correct snake_case
kvanhoey Oct 27, 2017
bce8843
uint -> uint32 for windows compatibility
Oct 30, 2017
af487e9
uint -> uint32 for windows compatibility
Oct 30, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cgogn/modeling/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ set(HEADER_TILING
tiling/square_grid.h
tiling/square_cylinder.h
tiling/square_tore.h
tiling/parallelogram_grid.h
)
set(HEADER_DECIMATION
decimation/edge_approximator.h
Expand Down Expand Up @@ -50,6 +51,7 @@ set(SOURCE_TILING
tiling/square_cylinder.cpp
tiling/square_tore.cpp
# tiling/square_cube.h
tiling/parallelogram_grid.cpp
)
set(SOURCE_FILES ${SOURCE_ALGOS} ${SOURCE_TILING})

Expand Down
38 changes: 38 additions & 0 deletions cgogn/modeling/tiling/parallelogram_grid.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* Copyright (C) 2015, IGG Group, ICube, University of Strasbourg, France *
* *
* This library is free software; you can redistribute it and/or modify it *
* under the terms of the GNU Lesser General Public License as published by the *
* Free Software Foundation; either version 2.1 of the License, or (at your *
* option) any later version. *
* *
* This library 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 Lesser General Public License *
* for more details. *
* *
* You should have received a copy of the GNU Lesser General Public License *
* along with this library; if not, write to the Free Software Foundation, *
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
* *
* Web site: http://cgogn.unistra.fr/ *
* Contact information: [email protected] *
* *
*******************************************************************************/

#define CGOGN_MODELING_TILING_PARALLELOGRAM_GRID_CPP_

#include <cgogn/modeling/tiling/parallelogram_grid.h>

namespace cgogn
{

namespace modeling
{

//template class CGOGN_MODELING_API ParallelogramGrid<CMap2,Eigen::Vector2d>;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Est-ce qu'il y a une raison pour laquelle c'est commenté ?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Non. Ou du moins, je ne m'en souviens pas. En fait, je devrais vraiment exclure cette classe du pull request car cette classe n'est absolument pas finalisée (c'était un effet de bord de mon pull request pour le MapRender).
C'est faisable facilement ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Je pense que le plus simple est de faire un commit dans lequel tu enlèves les parties non-finalisées. Sinon ça peut très bien rester en l'état le temps que tu travailles dessus, faut voir avec Pierre.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ouai mais j'aimerais quand même avoir le commit et le push sur mon github à des fins de backup ... mais pas dans le pull request pour ne pas polluer CGoGN.
@pierrekraemer, un avis ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tu peux créer une nouvelle branche de backup à partir de celle que tu utilises pour la PR. Puis tu continues tes modifs dans l'ancienne branche.


} // namespace modeling

} // namespace cgogn
Loading