Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dtk
dtk
Commits
4e085b00
Commit
4e085b00
authored
Feb 03, 2014
by
KLOCZKO Thibaud
Browse files
Clean build bis.
parent
f173c981
Changes
369
Hide whitespace changes
Inline
Side-by-side
cmake/dtkConfig.cmake.in
View file @
4e085b00
...
...
@@ -3,9 +3,9 @@
## Author: Julien Wintz
## Created: Tue Feb 5 10:26:22 2013 (+0100)
## Version:
## Last-Updated:
Mon Jul 15 16:23:11
201
3
(+0
2
00)
## By:
Julien Wintz
## Update #: 2
3
## Last-Updated:
lun. févr. 3 11:16:03
201
4
(+0
1
00)
## By:
Thibaud Kloczko
## Update #: 2
4
######################################################################
##
### Change Log:
...
...
@@ -22,17 +22,11 @@ set(dtk_INCLUDE_DIRS
"@CMAKE_SOURCE_DIR@"
"@CMAKE_SOURCE_DIR@/src"
"@CMAKE_SOURCE_DIR@/src/dtk"
"@CMAKE_SOURCE_DIR@/src/dtkLog"
"@CMAKE_SOURCE_DIR@/src/dtkCore"
"@CMAKE_SOURCE_DIR@/src/dtkDistributed"
"@CMAKE_SOURCE_DIR@/src/dtkMath"
"@CMAKE_SOURCE_DIR@/src/dtkTest")
if(Qt53D_FOUND)
set(dtk_INCLUDE_DIRS ${dtk_INCLUDE_DIRS}
"@CMAKE_SOURCE_DIR@/src/dtk3D")
endif(Qt53D_FOUND)
include("@CMAKE_BINARY_DIR@/dtkDepends.cmake")
set(dtk_LIBRARIES dtkDistributed)
qml/CMakeLists.txt
deleted
100644 → 0
View file @
f173c981
### CMakeLists.txt ---
##
## Author: Julien Wintz
## Created: Tue Apr 2 10:04:48 2013 (+0200)
## Version:
## Last-Updated: Wed Apr 17 10:46:48 2013 (+0200)
## By: Julien Wintz
## Update #: 9
######################################################################
##
### Change Log:
##
######################################################################
add_subdirectory
(
dtk3DQuick
)
add_subdirectory
(
dtkComposerQuick
)
configure_file
(
dtk3DQuickConfig.h.in
${
CMAKE_SOURCE_DIR
}
/src/dtk3DQuick/dtk3DQuickConfig
)
configure_file
(
dtk3DQuickConfig.h.in
${
CMAKE_SOURCE_DIR
}
/src/dtk3DQuick/dtk3DQuickConfig.h
)
configure_file
(
dtkComposerQuickConfig.h.in
${
CMAKE_SOURCE_DIR
}
/src/dtkComposerQuick/dtkComposerQuickConfig
)
configure_file
(
dtkComposerQuickConfig.h.in
${
CMAKE_SOURCE_DIR
}
/src/dtkComposerQuick/dtkComposerQuickConfig.h
)
qml/dtk3DQuick/CMakeLists.txt
deleted
100644 → 0
View file @
f173c981
### CMakeLists.txt ---
##
## Author: Julien Wintz
## Created: Tue Apr 2 10:03:58 2013 (+0200)
## Version:
## Last-Updated: Tue Apr 2 10:04:36 2013 (+0200)
## By: Julien Wintz
## Update #: 2
######################################################################
##
### Change Log:
##
######################################################################
configure_file
(
qmldir.in
${
CMAKE_CURRENT_SOURCE_DIR
}
/qmldir @ONLY
)
qml/dtk3DQuick/dtk3DQuickShortcuts.qml
deleted
100644 → 0
View file @
f173c981
/* dtk3DQuickShortcuts.qml ---
*
* Author: Julien Wintz
* Created: Wed Apr 10 16:55:14 2013 (+0200)
* Version:
* Last-Updated: Fri Apr 12 17:31:45 2013 (+0200)
* By: Julien Wintz
* Update #: 312
*/
/* Change Log:
*
*/
import
QtQuick
2.0
Image
{
property
Item
view
;
id
:
dtk3DQuickShortcuts
;
source
:
"
dtk3DQuickShortcutsBackground.png
"
;
fillMode
:
Image
.
Tile
;
ListModel
{
id
:
dtk3DQuickShortcutsModel
;
ListElement
{
name
:
"
Toggle pick buffer painting
"
;
category
:
"
Painting
"
;
key
:
"
Tab
"
;
modifier
:
"
No
"
;
}
ListElement
{
name
:
"
Fit
"
;
category
:
"
Camera shortcuts
"
;
key
:
"
F
"
;
modifier
:
"
No
"
;
}
ListElement
{
name
:
"
Fit -X aligned
"
;
category
:
"
Camera shortcuts
"
;
key
:
"
X
"
;
modifier
:
"
Alt
"
;
}
ListElement
{
name
:
"
Fit +X aligned
"
;
category
:
"
Camera shortcuts
"
;
key
:
"
X
"
;
modifier
:
"
No
"
;
}
ListElement
{
name
:
"
Fit -Y aligned
"
;
category
:
"
Camera shortcuts
"
;
key
:
"
Y
"
;
modifier
:
"
Alt
"
;
}
ListElement
{
name
:
"
Fit +Y aligned
"
;
category
:
"
Camera shortcuts
"
;
key
:
"
Y
"
;
modifier
:
"
No
"
;
}
ListElement
{
name
:
"
Fit -Z aligned
"
;
category
:
"
Camera shortcuts
"
;
key
:
"
Z
"
;
modifier
:
"
Alt
"
;
}
ListElement
{
name
:
"
Fit +Z aligned
"
;
category
:
"
Camera shortcuts
"
;
key
:
"
Z
"
;
modifier
:
"
No
"
;
}
ListElement
{
name
:
"
Fit
"
;
category
:
"
Item shortcuts
"
;
key
:
"
F
"
;
modifier
:
"
No
"
;
}
ListElement
{
name
:
"
Fit -X aligned
"
;
category
:
"
Item shortcuts
"
;
key
:
"
X
"
;
modifier
:
"
Alt
"
;
}
ListElement
{
name
:
"
Fit +X aligned
"
;
category
:
"
Item shortcuts
"
;
key
:
"
X
"
;
modifier
:
"
No
"
;
}
ListElement
{
name
:
"
Fit -Y aligned
"
;
category
:
"
Item shortcuts
"
;
key
:
"
Y
"
;
modifier
:
"
Alt
"
;
}
ListElement
{
name
:
"
Fit +Y aligned
"
;
category
:
"
Item shortcuts
"
;
key
:
"
Y
"
;
modifier
:
"
No
"
;
}
ListElement
{
name
:
"
Fit -Z aligned
"
;
category
:
"
Item shortcuts
"
;
key
:
"
Z
"
;
modifier
:
"
Alt
"
;
}
ListElement
{
name
:
"
Fit +Z aligned
"
;
category
:
"
Item shortcuts
"
;
key
:
"
Z
"
;
modifier
:
"
No
"
;
}
}
ListView
{
id
:
dtk3DQuickShortcutsView
;
model
:
dtk3DQuickShortcutsModel
;
delegate
:
dtk3DQuickShortcutsDelegate
;
anchors.fill
:
parent
;
section.property
:
"
category
"
;
section.criteria
:
ViewSection
.
FullString
;
section.delegate
:
dtk3DQuickShortcutsSectionDelegate
;
section.labelPositioning
:
ViewSection
.
InlineLabels
|
ViewSection
.
CurrentLabelAtStart
;
}
// ///////////////////////////////////////////////////////////////////
// dtk3DQuickShortcutsDelegate
// ///////////////////////////////////////////////////////////////////
Component
{
id
:
dtk3DQuickShortcutsDelegate
;
Rectangle
{
width
:
dtk3DQuickShortcuts
.
width
;
height
:
64
;
color
:
"
#272727
"
;
Text
{
text
:
name
;
color
:
"
#dddddd
"
;
font.family
:
"
Menlo
"
;
font.pixelSize
:
12
;
anchors.left
:
parent
.
left
;
anchors.leftMargin
:
10
;
anchors.verticalCenter
:
parent
.
verticalCenter
;
}
Image
{
id
:
dtk3DQuickShortcutsModifier
;
source
:
"
dtk3DQuickShortcuts
"
+
modifier
+
"
Modifier.png
"
;
width
:
parent
.
height
;
height
:
parent
.
height
;
anchors.right
:
dtk3DQuickShortcutsKey
.
left
;
}
Image
{
id
:
dtk3DQuickShortcutsKey
;
source
:
"
dtk3DQuickShortcutsKey
"
+
key
+
"
.png
"
;
width
:
parent
.
height
;
height
:
parent
.
height
;
anchors.right
:
parent
.
right
;
}
Rectangle
{
x
:
0
;
y
:
parent
.
height
-
2
;
width
:
dtk3DQuickShortcuts
.
width
;
height
:
1
;
color
:
"
#151515
"
;
}
Rectangle
{
x
:
0
;
y
:
parent
.
height
-
1
;
width
:
dtk3DQuickShortcuts
.
width
;
height
:
1
;
color
:
"
#363636
"
;
}
// MouseArea {
// anchors.fill: parent;
// onPressed: {
// trigger(dtk3DQuickShortcutsModel.get(index));
// }
// }
}
}
// ///////////////////////////////////////////////////////////////////
// dtk3DQuickShortcutsSectionDelegate
// ///////////////////////////////////////////////////////////////////
Component
{
id
:
dtk3DQuickShortcutsSectionDelegate
;
Rectangle
{
width
:
dtk3DQuickShortcuts
.
width
;
height
:
30
;
gradient
:
Gradient
{
GradientStop
{
position
:
0.0
;
color
:
"
#3c3c3c
"
;
}
GradientStop
{
position
:
1.0
;
color
:
"
#303030
"
;
}
}
Text
{
text
:
section
;
color
:
"
#000000
"
;
x
:
dtk3DQuickShortcutsSectionDelegateText
.
x
-
1
;
y
:
dtk3DQuickShortcutsSectionDelegateText
.
y
-
1
;
font.family
:
"
Courier
"
;
font.pixelSize
:
14
;
}
Text
{
id
:
dtk3DQuickShortcutsSectionDelegateText
;
text
:
section
;
color
:
"
#666666
"
;
anchors.centerIn
:
parent
;
font.family
:
"
Courier
"
;
font.pixelSize
:
14
;
}
Rectangle
{
x
:
0
;
y
:
0
;
width
:
dtk3DQuickShortcuts
.
width
;
height
:
1
;
color
:
"
#575757
"
;
}
Rectangle
{
x
:
0
;
y
:
parent
.
height
-
2
;
width
:
dtk3DQuickShortcuts
.
width
;
height
:
1
;
color
:
"
#151515
"
;
}
Rectangle
{
x
:
0
;
y
:
parent
.
height
-
1
;
width
:
dtk3DQuickShortcuts
.
width
;
height
:
1
;
color
:
"
#363636
"
;
}
}
}
// ///////////////////////////////////////////////////////////////////
// Helper fuunctions
// ///////////////////////////////////////////////////////////////////
function
trigger
(
shortcut
)
{
if
(
shortcut
.
category
==
"
Painting
"
)
{
if
(
shortcut
.
key
==
"
Tab
"
)
view
.
togglePickPainting
();
}
if
(
shortcut
.
category
==
"
Camera shortcuts
"
)
{
if
(
shortcut
.
key
==
"
F
"
)
view
.
fit
();
if
(
shortcut
.
key
==
"
X
"
&&
shortcut
.
modifier
==
"
No
"
)
view
.
fitFromRight
();
if
(
shortcut
.
key
==
"
X
"
&&
shortcut
.
modifier
==
"
Alt
"
)
view
.
fitFromLeft
();
if
(
shortcut
.
key
==
"
Y
"
&&
shortcut
.
modifier
==
"
No
"
)
view
.
fitFromTop
();
if
(
shortcut
.
key
==
"
Y
"
&&
shortcut
.
modifier
==
"
Alt
"
)
view
.
fitFromBottom
();
if
(
shortcut
.
key
==
"
Z
"
&&
shortcut
.
modifier
==
"
No
"
)
view
.
fitFromFront
();
if
(
shortcut
.
key
==
"
Z
"
&&
shortcut
.
modifier
==
"
Alt
"
)
view
.
fitFromBack
();
}
if
(
shortcut
.
category
==
"
Item shortcuts
"
)
{
console
.
log
(
"
Item interaction is not yet supported
"
);
}
}
}
qml/dtk3DQuick/dtk3DQuickShortcutsAltModifier.png
deleted
100644 → 0
View file @
f173c981
14.9 KB
qml/dtk3DQuick/dtk3DQuickShortcutsBackground.png
deleted
100644 → 0
View file @
f173c981
137 KB
qml/dtk3DQuick/dtk3DQuickShortcutsKeyF.png
deleted
100644 → 0
View file @
f173c981
14.6 KB
qml/dtk3DQuick/dtk3DQuickShortcutsKeyTab.png
deleted
100644 → 0
View file @
f173c981
15.1 KB
qml/dtk3DQuick/dtk3DQuickShortcutsKeyX.png
deleted
100644 → 0
View file @
f173c981
14.9 KB
qml/dtk3DQuick/dtk3DQuickShortcutsKeyY.png
deleted
100644 → 0
View file @
f173c981
14.8 KB
qml/dtk3DQuick/dtk3DQuickShortcutsKeyZ.png
deleted
100644 → 0
View file @
f173c981
14.8 KB
qml/dtk3DQuick/dtk3DQuickShortcutsNoModifier.png
deleted
100644 → 0
View file @
f173c981
4.35 KB
qml/dtk3DQuick/dtk3DQuickViewShadow.png
deleted
100644 → 0
View file @
f173c981
588 Bytes
qml/dtk3DQuick/dtk3DQuickViewShadow.qml
deleted
100644 → 0
View file @
f173c981
/* dtk3DQuickViewShadow.qml ---
*
* Author: Julien Wintz
* Created: Thu Apr 11 10:00:09 2013 (+0200)
* Version:
* Last-Updated: Thu Apr 11 10:16:14 2013 (+0200)
* By: Julien Wintz
* Update #: 6
*/
/* Change Log:
*
*/
import
QtQuick
2.0
BorderImage
{
property
Item
view
;
anchors.fill
:
view
;
anchors
{
topMargin
:
-
8
;
leftMargin
:
-
8
;
rightMargin
:
-
8
;
bottomMargin
:
-
8
;
}
border
{
top
:
10
;
left
:
10
;
right
:
10
;
bottom
:
10
;
}
source
:
"
dtk3DQuickViewShadow.png
"
;
smooth
:
true
;
}
qml/dtk3DQuick/qmldir.in
deleted
100644 → 0
View file @
f173c981
### qmldir.in ---
##
## Author: Julien Wintz
## Created: Tue Apr 2 10:02:06 2013 (+0200)
## Version:
## Last-Updated: Thu Apr 11 10:15:35 2013 (+0200)
## By: Julien Wintz
## Update #: 15
######################################################################
##
### Change Log:
##
######################################################################
module dtk3DQuick
## ###################################################################
## QML defined QML types
## ###################################################################
Quick3DShortcuts 1.0 dtk3DQuickShortcuts.qml
Quick3DViewShadow 1.0 dtk3DQuickViewShadow.qml
## ###################################################################
## C++ defined QML types
## ###################################################################
plugin dtk3DQuick @CMAKE_BINARY_DIR@/lib
# - dtk3DQuickItem 1.0 - Quick3DItem
# - dtk3DQuickMesh 1.0 - Quick3DMesh
# - dtk3DQuickPoint 1.0 - Quick3DPoint
# - dtk3DQuickScene 1.0 - Quick3DScene
# - dtk3DQuickView 1.0 - Quick3DView
qml/dtk3DQuickConfig.h.in
deleted
100644 → 0
View file @
f173c981
/* dtk3DQuickConfig.h.in ---
*
* Author: Julien Wintz
* Created: Tue Apr 2 10:09:08 2013 (+0200)
* Version:
* Last-Updated: Tue Apr 2 10:09:29 2013 (+0200)
* By: Julien Wintz
* Update #: 2
*/
/* Change Log:
*
*/
#define dtk3DQuickImportPath QString("@CMAKE_CURRENT_SOURCE_DIR@")
qml/dtkComposerQuick/CMakeLists.txt
deleted
100644 → 0
View file @
f173c981
### CMakeLists.txt ---
##
## Author: Julien Wintz
## Created: Tue Apr 2 10:03:58 2013 (+0200)
## Version:
## Last-Updated: Wed Apr 17 10:48:59 2013 (+0200)
## By: Julien Wintz
## Update #: 3
######################################################################
##
### Change Log:
##
######################################################################
configure_file
(
qmldir.in
${
CMAKE_CURRENT_SOURCE_DIR
}
/qmldir @ONLY
)
qml/dtkComposerQuick/qmldir.in
deleted
100644 → 0
View file @
f173c981
### qmldir.in ---
##
## Author: Julien Wintz
## Created: Wed Apr 17 10:49:24 2013 (+0200)
## Version:
## Last-Updated: Wed Apr 24 10:53:29 2013 (+0200)
## By: Julien Wintz
## Update #: 14
######################################################################
##
### Change Log:
##
######################################################################
module dtkComposerQuick
## ###################################################################
## QML defined QML types
## ###################################################################
# ...
## ###################################################################
## C++ defined QML types
## ###################################################################
plugin dtkComposerQuick @CMAKE_BINARY_DIR@/lib
qml/dtkComposerQuickConfig.h.in
deleted
100644 → 0
View file @
f173c981
/* dtkComposerQuickConfig.h.in ---
*
* Author: Julien Wintz
* Created: Wed Apr 17 10:47:20 2013 (+0200)
* Version:
* Last-Updated: Wed Apr 17 10:47:40 2013 (+0200)
* By: Julien Wintz
* Update #: 2
*/
/* Change Log:
*
*/
#define dtkComposerQuickImportPath QString("@CMAKE_CURRENT_SOURCE_DIR@")
src/dtk3D/CMakeLists.txt
deleted
100644 → 0
View file @
f173c981
### CMakeLists.txt ---
##
## Author: Julien Wintz
## Created: Fri Mar 22 09:22:26 2013 (+0100)
## Version:
## Last-Updated: Mon Apr 8 14:53:40 2013 (+0200)
## By: Julien Wintz
## Update #: 73
######################################################################
##
### Change Log:
##
######################################################################
project
(
dtk3D
)
## #################################################################
## Input
## #################################################################
set
(
${
PROJECT_NAME
}
_HEADERS
dtk3D
dtk3D.h
dtk3DEffect
dtk3DEffect.h
dtk3DItem
dtk3DItem.h
dtk3DMesh
dtk3DMesh.h
dtk3DScene
dtk3DScene.h
dtk3DSettings
dtk3DSettings.h
dtk3DView
dtk3DView.h
)
set
(
${
PROJECT_NAME
}
_SOURCES
dtk3D.cpp
dtk3DEffect.cpp
dtk3DItem.cpp
dtk3DMesh.cpp
dtk3DScene.cpp
dtk3DSettings.cpp
dtk3DView.cpp
)
set
(
${
PROJECT_NAME
}
_SOURCES_RCC
dtk3D.qrc
)
## #################################################################
## Build rules
## #################################################################
qt5_add_resources
(
${
PROJECT_NAME
}
_SOURCES_QRC
${${
PROJECT_NAME
}
_SOURCES_RCC
}
)
add_library
(
${
PROJECT_NAME
}
SHARED
${${
PROJECT_NAME
}
_SOURCES_QRC
}
${${
PROJECT_NAME
}
_SOURCES
}
${${
PROJECT_NAME
}
_HEADERS
}
)
target_link_libraries
(
${
PROJECT_NAME
}
${
OPENGL_LIBRARIES
}
)
## ###################################################################
## Link rules
## ###################################################################
qt5_use_modules
(
${
PROJECT_NAME
}
3D
)
qt5_use_modules
(
${
PROJECT_NAME
}
Core
)
qt5_use_modules
(
${
PROJECT_NAME
}
Gui
)
qt5_use_modules
(
${
PROJECT_NAME
}
OpenGL
)
## ###################################################################
## Install rules - files
## ###################################################################
install
(
FILES
${${
PROJECT_NAME
}
_HEADERS
}
DESTINATION include/
${
PROJECT_NAME
}
COMPONENT 3D
)
## ###################################################################
## Install rules - targets
## ###################################################################
install
(
TARGETS
${
PROJECT_NAME
}
DESTINATION lib
COMPONENT 3D
EXPORT dtkDepends
)
Prev
1
2
3
4
5
…
19
Next
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