Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
KennethVanhoey
CGoGN
Commits
3ad89e99
Commit
3ad89e99
authored
Aug 29, 2012
by
Sylvain Thery
Browse files
Merge branch 'master' of cgogn:CGoGN
parents
774ea2c9
045c81ca
Changes
6
Hide whitespace changes
Inline
Side-by-side
include/Container/registered.h
View file @
3ad89e99
...
...
@@ -37,6 +37,8 @@ protected:
std
::
string
m_name
;
// TODO inutile ??
public:
virtual
~
RegisteredBaseAttribute
()
{}
/**
* affecte un nom de type a l'attribut
*/
...
...
include/Topology/generic/attribmap.hpp
View file @
3ad89e99
...
...
@@ -38,7 +38,7 @@ template <typename T, unsigned int ORBIT>
inline
bool
AttribMap
::
removeAttribute
(
AttributeHandler
<
T
,
ORBIT
>&
attr
)
{
assert
(
attr
.
isValid
()
||
!
"Invalid attribute handler"
)
;
if
(
m_attribs
[
attr
.
getOrbit
()].
removeAttribute
<
T
>
(
attr
.
getIndex
()))
if
(
m_attribs
[
attr
.
getOrbit
()].
template
removeAttribute
<
T
>(
attr
.
getIndex
()))
{
typedef
std
::
multimap
<
AttributeMultiVectorGen
*
,
AttributeHandlerGen
*>::
iterator
IT
;
std
::
pair
<
IT
,
IT
>
bounds
=
attributeHandlers
.
equal_range
(
attr
.
getDataVector
())
;
...
...
include/Utils/clippingPresets.h
View file @
3ad89e99
...
...
@@ -48,6 +48,8 @@ class ClippingPreset
public
:
virtual
~
ClippingPreset
()
{}
/// public static constructor
static
ClippingPreset
*
CreateEmptyPreset
();
...
...
@@ -92,7 +94,6 @@ protected :
/// protected constructor (used by public static constructors or child class)
ClippingPreset
();
/***********************************************
*
* Preset settings
...
...
include/Utils/textures.h
View file @
3ad89e99
...
...
@@ -45,6 +45,7 @@ namespace Utils
class
GTexture
{
public:
virtual
~
GTexture
()
{}
virtual
void
bind
()
{}
};
...
...
src/Utils/Qt/qtcolorschooser.cpp
View file @
3ad89e99
...
...
@@ -36,7 +36,7 @@ namespace QT
ColorsChooser
::
ColorsChooser
(
SimpleQT
*
interf
)
:
QtPopUp
(
false
),
m_interf
(
interf
),
m_current
(
0
)
QtPopUp
(
NULL
,
false
),
m_interf
(
interf
),
m_current
(
0
)
{
m_list
=
new
QListWidget
();
m_diag
=
new
QColorDialog
();
...
...
src/Utils/svg.cpp
View file @
3ad89e99
...
...
@@ -498,14 +498,14 @@ void SVGOut::endPoints()
void
SVGOut
::
addPoint
(
const
Geom
::
Vec3f
&
P
)
{
glm
::
vec3
Q
=
glm
::
project
(
glm
::
vec3
(
P
[
0
],
P
[
1
],
P
[
2
]),
m_model
,
m_proj
,
m_viewport
);
glm
::
vec3
R
=
glm
::
project
(
glm
::
vec3
(
P
[
0
],
P
[
1
],
P
[
2
]),
m_model
,
glm
::
mat4
(
1.0
),
m_viewport
);
//
glm::vec3 R = glm::project(glm::vec3(P[0],P[1],P[2]),m_model,glm::mat4(1.0),m_viewport);
m_current
->
addVertex
(
Geom
::
Vec3f
(
float
(
Q
[
0
]),
float
(
m_viewport
[
3
])
-
float
(
Q
[
1
]),
float
(
Q
[
2
])));
}
void
SVGOut
::
addPoint
(
const
Geom
::
Vec3f
&
P
,
const
Geom
::
Vec3f
&
C
)
{
glm
::
vec3
Q
=
glm
::
project
(
glm
::
vec3
(
P
[
0
],
P
[
1
],
P
[
2
]),
m_model
,
m_proj
,
m_viewport
);
glm
::
vec3
R
=
glm
::
project
(
glm
::
vec3
(
P
[
0
],
P
[
1
],
P
[
2
]),
m_model
,
glm
::
mat4
(
1.0
),
m_viewport
);
//
glm::vec3 R = glm::project(glm::vec3(P[0],P[1],P[2]),m_model,glm::mat4(1.0),m_viewport);
m_current
->
addVertex
(
Geom
::
Vec3f
(
float
(
Q
[
0
]),
float
(
m_viewport
[
3
])
-
float
(
Q
[
1
]),
float
(
Q
[
2
])),
C
);
}
...
...
@@ -527,10 +527,10 @@ void SVGOut::endLines()
void
SVGOut
::
addLine
(
const
Geom
::
Vec3f
&
P
,
const
Geom
::
Vec3f
&
P2
)
{
glm
::
vec3
Q
=
glm
::
project
(
glm
::
vec3
(
P
[
0
],
P
[
1
],
P
[
2
]),
m_model
,
m_proj
,
m_viewport
);
glm
::
vec3
R
=
glm
::
project
(
glm
::
vec3
(
P
[
0
],
P
[
1
],
P
[
2
]),
m_model
,
glm
::
mat4
(
1.0
),
m_viewport
);
//
glm::vec3 R = glm::project(glm::vec3(P[0],P[1],P[2]),m_model,glm::mat4(1.0),m_viewport);
glm
::
vec3
Q2
=
glm
::
project
(
glm
::
vec3
(
P2
[
0
],
P2
[
1
],
P2
[
2
]),
m_model
,
m_proj
,
m_viewport
);
glm
::
vec3
R2
=
glm
::
project
(
glm
::
vec3
(
P2
[
0
],
P2
[
1
],
P2
[
2
]),
m_model
,
glm
::
mat4
(
1.0
),
m_viewport
);
//
glm::vec3 R2 = glm::project(glm::vec3(P2[0],P2[1],P2[2]),m_model,glm::mat4(1.0),m_viewport);
m_current
->
addVertex
(
Geom
::
Vec3f
(
float
(
Q
[
0
]),
float
(
m_viewport
[
3
])
-
float
(
Q
[
1
]),
float
(
Q
[
2
])));
m_current
->
addVertex
(
Geom
::
Vec3f
(
float
(
Q2
[
0
]),
float
(
m_viewport
[
3
])
-
float
(
Q2
[
1
]),
float
(
Q2
[
2
])));
...
...
@@ -541,10 +541,10 @@ void SVGOut::addLine(const Geom::Vec3f& P, const Geom::Vec3f& P2)
void
SVGOut
::
addLine
(
const
Geom
::
Vec3f
&
P
,
const
Geom
::
Vec3f
&
P2
,
const
Geom
::
Vec3f
&
C
)
{
glm
::
vec3
Q
=
glm
::
project
(
glm
::
vec3
(
P
[
0
],
P
[
1
],
P
[
2
]),
m_model
,
m_proj
,
m_viewport
);
glm
::
vec3
R
=
glm
::
project
(
glm
::
vec3
(
P
[
0
],
P
[
1
],
P
[
2
]),
m_model
,
glm
::
mat4
(
1.0
),
m_viewport
);
//
glm::vec3 R = glm::project(glm::vec3(P[0],P[1],P[2]),m_model,glm::mat4(1.0),m_viewport);
glm
::
vec3
Q2
=
glm
::
project
(
glm
::
vec3
(
P2
[
0
],
P2
[
1
],
P2
[
2
]),
m_model
,
m_proj
,
m_viewport
);
glm
::
vec3
R2
=
glm
::
project
(
glm
::
vec3
(
P2
[
0
],
P2
[
1
],
P2
[
2
]),
m_model
,
glm
::
mat4
(
1.0
),
m_viewport
);
//
glm::vec3 R2 = glm::project(glm::vec3(P2[0],P2[1],P2[2]),m_model,glm::mat4(1.0),m_viewport);
m_current
->
addVertex
(
Geom
::
Vec3f
(
float
(
Q
[
0
]),
float
(
m_viewport
[
3
])
-
float
(
Q
[
1
]),
float
(
Q
[
2
])),
C
);
m_current
->
addVertex
(
Geom
::
Vec3f
(
float
(
Q2
[
0
]),
float
(
m_viewport
[
3
])
-
float
(
Q2
[
1
]),
float
(
Q2
[
2
])),
C
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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