Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
David Cazier
CGoGN
Commits
89d6b223
Commit
89d6b223
authored
Jun 17, 2014
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
compil visual 2013
parent
1e795b2d
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
29 additions
and
13 deletions
+29
-13
Apps/Benches/bench_trav.cpp
Apps/Benches/bench_trav.cpp
+1
-1
Apps/Tests/copyfrom.cpp
Apps/Tests/copyfrom.cpp
+1
-1
Apps/Tests/loadSave.cpp
Apps/Tests/loadSave.cpp
+1
-1
ThirdParty/build/.gitignore
ThirdParty/build/.gitignore
+0
-0
include/Algo/Decimation/approximator.hpp
include/Algo/Decimation/approximator.hpp
+2
-2
include/Container/attributeMultiVectorBool.hpp
include/Container/attributeMultiVectorBool.hpp
+1
-1
include/Utils/colorMaps.hpp
include/Utils/colorMaps.hpp
+1
-0
include/Utils/qem.hpp
include/Utils/qem.hpp
+12
-2
src/Utils/GLSLShader.cpp
src/Utils/GLSLShader.cpp
+2
-0
src/Utils/frameManipulator.cpp
src/Utils/frameManipulator.cpp
+4
-4
src/Utils/pickables.cpp
src/Utils/pickables.cpp
+1
-1
src/Utils/text3d.cpp
src/Utils/text3d.cpp
+3
-0
No files found.
Apps/Benches/bench_trav.cpp
View file @
89d6b223
...
...
@@ -58,7 +58,7 @@ int main()
ch
.
start
();
// add position attribute on vertices and get handler on it
VertexAttribute
<
VEC3
,
MAP
>
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
,
MAP
>
(
"position"
);
const
expr
int
nb
=
100
;
const
int
nb
=
100
;
Algo
::
Volume
::
Tilings
::
Cubic
::
Grid
<
PFP
>
cubic
(
myMap
,
nb
,
nb
,
nb
);
cubic
.
embedIntoGrid
(
position
,
10.0
f
,
10.0
f
,
10.0
f
);
std
::
cout
<<
"construct grid in "
<<
ch
.
elapsed
()
<<
" ms"
<<
std
::
endl
;
...
...
Apps/Tests/copyfrom.cpp
View file @
89d6b223
...
...
@@ -53,7 +53,7 @@ int main()
// add position attribute on vertices and get handler on it
VertexAttribute
<
VEC3
,
MAP
>
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
,
MAP
>
(
"position"
);
const
expr
int
nb
=
2
;
const
int
nb
=
2
;
Algo
::
Volume
::
Tilings
::
Cubic
::
Grid
<
PFP
>
cubic
(
myMap
,
nb
,
nb
,
nb
);
cubic
.
embedIntoGrid
(
position
,
10.0
f
,
10.0
f
,
10.0
f
);
...
...
Apps/Tests/loadSave.cpp
View file @
89d6b223
...
...
@@ -54,7 +54,7 @@ int main()
// add position attribute on vertices and get handler on it
VertexAttribute
<
VEC3
,
MAP
>
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
,
MAP
>
(
"position"
);
const
expr
int
nb
=
2
;
const
int
nb
=
2
;
Algo
::
Volume
::
Tilings
::
Cubic
::
Grid
<
PFP
>
cubic
(
myMap
,
nb
,
nb
,
nb
);
cubic
.
embedIntoGrid
(
position
,
10.0
f
,
10.0
f
,
10.0
f
);
...
...
ThirdParty/build/.gitignore
deleted
100644 → 0
View file @
1e795b2d
include/Algo/Decimation/approximator.hpp
View file @
89d6b223
...
...
@@ -69,9 +69,9 @@ Approximator<PFP,T,ORBIT>::~Approximator()
// std::cout << "Approximator<PFP,T,ORBIT>::~Approximator()" << std::endl ;
for
(
unsigned
int
i
=
0
;
i
<
m_attrV
.
size
()
;
++
i
)
{
this
->
m_map
.
template
removeAttribute
(
m_approx
[
i
])
;
this
->
m_map
.
removeAttribute
(
m_approx
[
i
])
;
if
(
m_predictor
)
this
->
m_map
.
template
removeAttribute
(
m_detail
[
i
])
;
this
->
m_map
.
removeAttribute
(
m_detail
[
i
])
;
}
}
...
...
include/Container/attributeMultiVectorBool.hpp
View file @
89d6b223
...
...
@@ -288,7 +288,7 @@ public:
*/
void
overwrite
(
unsigned
int
src_b
,
unsigned
int
src_id
,
unsigned
int
dst_b
,
unsigned
int
dst_id
)
{
bool
b
=
m_tableData
[
src_b
][
src_id
/
32
]
&
(
1
<<
(
src_id
%
32
))
;
bool
b
=
(
m_tableData
[
src_b
][
src_id
/
32
]
&
(
1
<<
(
src_id
%
32
)))
!=
0
;
unsigned
int
mask
=
1
<<
(
dst_id
%
32
);
...
...
include/Utils/colorMaps.hpp
View file @
89d6b223
...
...
@@ -21,6 +21,7 @@
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
#include <algorithm>
namespace
CGoGN
{
...
...
include/Utils/qem.hpp
View file @
89d6b223
...
...
@@ -22,6 +22,8 @@
* *
*******************************************************************************/
#include <cmath>
namespace CGoGN {
namespace Utils {
...
...
@@ -139,7 +141,11 @@ template <typename REAL>
bool
Quadric<REAL>::optimize(VEC4& v) const
{
if (std::isnan(A(0,0)))
#ifdef WIN32
if (A(0, 0) != A(0, 0))
#else
if (std::isnan(A(0, 0)))
#endif
return false ;
MATRIX44 A2(A) ;
...
...
@@ -286,7 +292,11 @@ template <typename REAL, unsigned int N>
bool
QuadricNd<REAL,N>::optimize(VECN& v) const
{
if (std::isnan(A(0,0)))
#ifdef WIN32
if (A(0, 0) != A(0, 0))
#else
if (std::isnan(A(0, 0)))
#endif
return false ;
Geom::Matrix<N,N,double> Ainv ;
...
...
src/Utils/GLSLShader.cpp
View file @
89d6b223
...
...
@@ -28,10 +28,12 @@
#include <iostream>
#include <fstream>
#include <vector>
#include <algorithm>
#include "Utils/cgognStream.h"
#include "glm/gtx/inverse_transpose.hpp"
namespace
CGoGN
{
...
...
src/Utils/frameManipulator.cpp
View file @
89d6b223
...
...
@@ -840,14 +840,14 @@ float FrameManipulator::scaleFromMouse(int dx, int dy)
if
(
abs
(
dx
)
>
abs
(
dy
))
{
if
(
dx
>
0
)
return
1.01
;
return
0.99
;
return
1.01
f
;
return
0.99
f
;
}
else
{
if
(
dy
>
0
)
return
1.01
;
return
0.99
;
return
1.01
f
;
return
0.99
f
;
}
}
...
...
src/Utils/pickables.cpp
View file @
89d6b223
...
...
@@ -262,7 +262,7 @@ Pickable* Pickable::pick(const std::vector<Pickable*>& picks,const Geom::Vec3f&
glm
::
vec4
IWglm
=
tr
*
ii
;
Geom
::
Vec3f
IW
(
IWglm
[
0
]
/
IWglm
[
3
],
IWglm
[
1
]
/
IWglm
[
3
],
IWglm
[
2
]
/
IWglm
[
3
]);
IW
-=
P
;
float
dist
=
IW
.
norm
(
);
float
dist
=
float
(
IW
.
norm
()
);
if
(
dist
<
mdist
)
{
res
=
*
it
;
...
...
src/Utils/text3d.cpp
View file @
89d6b223
...
...
@@ -27,6 +27,9 @@
#include "Utils/svg.h"
#include "Utils/gzstream.h"
#include <algorithm>
namespace
CGoGN
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment