Skip to content

GitLab

Commit 10ee12d1 authored by Julien Wintz's avatar Julien Wintz
Browse files

3D layer inception.

parent 9dd963c4
Hide whitespace changes
Inline Side-by-side
Showing with 319 additions and 15 deletions
CMakeLists.txt
View file @ 10ee12d1
......@@ -3,9 +3,9 @@
## Author: Julien Wintz
## Created: Mon Feb 4 10:17:21 2013 (+0100)
## Version:
## Last-Updated: Wed Mar 20 13:10:44 2013 (+0100)
## Last-Updated: Fri Mar 22 10:18:13 2013 (+0100)
## By: Julien Wintz
## Update #: 122
## Update #: 133
######################################################################
##
### Change Log:
......@@ -67,6 +67,7 @@ find_package(Qt5Qml REQUIRED)
find_package(Qt5Quick REQUIRED)
find_package(Qt5Test REQUIRED)
find_package(Qt5Widgets REQUIRED)
find_package(Qt53D)
## #################################################################
## Dependencies - internal
......@@ -75,9 +76,12 @@ find_package(Qt5Widgets REQUIRED)
include_directories(${PROJECT_SOURCE_DIR}/src)
include_directories(${PROJECT_SOURCE_DIR}/src/dtk)
include_directories(${PROJECT_SOURCE_DIR}/src/dtkLog)
include_directories(${PROJECT_SOURCE_DIR}/src/dtkTest)
include_directories(${PROJECT_SOURCE_DIR}/src/dtkCore)
include_directories(${PROJECT_SOURCE_DIR}/src/dtkDistributed)
include_directories(${PROJECT_SOURCE_DIR}/src/dtkTest)
if(Qt53D_FOUND)
include_directories(${PROJECT_SOURCE_DIR}/src/dtk3D)
endif(Qt53D_FOUND)
## ###################################################################
## Input
......
src/CMakeLists.txt
View file @ 10ee12d1
......@@ -3,19 +3,24 @@
## Author: Julien Wintz
## Created: Mon Feb 4 10:29:13 2013 (+0100)
## Version:
## Last-Updated: Wed Mar 20 14:50:49 2013 (+0100)
## Last-Updated: Fri Mar 22 09:37:49 2013 (+0100)
## By: Julien Wintz
## Update #: 16
## Update #: 29
######################################################################
##
### Change Log:
##
######################################################################
set(DTK_TARGETS)
add_subdirectory(dtk)
add_subdirectory(dtkLog)
add_subdirectory(dtkTest)
add_subdirectory(dtkCore)
add_subdirectory(dtkDistributed)
add_subdirectory(dtkTest)
if(Qt53D_FOUND)
add_subdirectory(dtk3D)
endif(Qt53D_FOUND)
export(TARGETS dtkLog dtkCore dtkDistributed FILE "${CMAKE_BINARY_DIR}/dtkDepends.cmake")
export(TARGETS ${DTK_TARGETS} FILE "${CMAKE_BINARY_DIR}/dtkDepends.cmake") # dtkLog dtkCore dtkDistributed
src/dtk3D/CMakeLists.txt 0 → 100644
View file @ 10ee12d1
### CMakeLists.txt ---
##
## Author: Julien Wintz
## Created: Fri Mar 22 09:22:26 2013 (+0100)
## Version:
## Last-Updated: Fri Mar 22 10:27:10 2013 (+0100)
## By: Julien Wintz
## Update #: 12
######################################################################
##
### Change Log:
##
######################################################################
project(dtk3D)
## #################################################################
## Input
## #################################################################
set(${PROJECT_NAME}_HEADERS
dtk3DView.h)
set(${PROJECT_NAME}_SOURCES
dtk3DView.cpp)
## #################################################################
## Build rules
## #################################################################
add_library(${PROJECT_NAME} SHARED
${${PROJECT_NAME}_SOURCES}
${${PROJECT_NAME}_HEADERS})
## ###################################################################
## 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} Widgets)
## ###################################################################
## 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)
## ###################################################################
## Target export
## ###################################################################
list(APPEND DTK_TARGETS ${PROJECT_NAME})
src/dtk3D/dtk3D 0 → 100644
View file @ 10ee12d1
#include "dtk3DView.h"
src/dtk3D/dtk3DView 0 → 100644
View file @ 10ee12d1
#include "dtk3DView.h"
src/dtk3D/dtk3DView.cpp 0 → 100644
View file @ 10ee12d1
/* dtk3DView.cpp ---
*
* Author: Julien Wintz
* Created: Fri Mar 22 09:41:43 2013 (+0100)
* Version:
* Last-Updated: Fri Mar 22 10:30:02 2013 (+0100)
* By: Julien Wintz
* Update #: 4
*/
/* Change Log:
*
*/
#include "dtk3DView.h"
class dtk3DViewPrivate
{
public:
};
dtk3DView::dtk3DView(QWindow *parent) : QGLView(parent), d(new dtk3DViewPrivate)
{
}
dtk3DView::~dtk3DView(void)
{
delete d;
d = NULL;
}
src/dtk3D/dtk3DView.h 0 → 100644
View file @ 10ee12d1
/* dtk3DView.h ---
*
* Author: Julien Wintz
* Created: Fri Mar 22 09:41:33 2013 (+0100)
* Version:
* Last-Updated: Fri Mar 22 11:39:17 2013 (+0100)
* By: Julien Wintz
* Update #: 19
*/
/* Change Log:
*
*/
#pragma once
#include <Qt3D/QGLView>
class dtk3DViewPrivate;
class dtk3DView : public QGLView
{
public:
dtk3DView(QWindow *parent = 0);
~dtk3DView(void);
private:
dtk3DViewPrivate *d;
};
src/dtkCore/CMakeLists.txt
View file @ 10ee12d1
......@@ -3,9 +3,9 @@
## Author: Julien Wintz
## Created: Fri Feb 8 16:49:52 2013 (+0100)
## Version:
## Last-Updated: Thu Feb 28 18:39:32 2013 (+0100)
## Last-Updated: Fri Mar 22 09:40:00 2013 (+0100)
## By: Julien Wintz
## Update #: 27
## Update #: 31
######################################################################
##
### Change Log:
......@@ -67,3 +67,9 @@ install(TARGETS ${PROJECT_NAME}
DESTINATION lib
COMPONENT core
EXPORT dtkDepends)
## ###################################################################
## Target export
## ###################################################################
list(APPEND DTK_TARGETS ${PROJECT_NAME})
src/dtkDistributed/CMakeLists.txt
View file @ 10ee12d1
......@@ -71,3 +71,9 @@ install(TARGETS ${PROJECT_NAME}
DESTINATION lib
COMPONENT distributed
EXPORT dtkDepends)
## ###################################################################
## Target export
## ###################################################################
list(APPEND DTK_TARGETS ${PROJECT_NAME})
src/dtkLog/CMakeLists.txt
View file @ 10ee12d1
......@@ -3,9 +3,9 @@
## Author: Julien Wintz
## Created: Mon Feb 11 19:23:24 2013 (+0100)
## Version:
## Last-Updated: Thu Feb 28 18:41:57 2013 (+0100)
## Last-Updated: Fri Mar 22 09:39:53 2013 (+0100)
## By: Julien Wintz
## Update #: 23
## Update #: 24
######################################################################
##
### Change Log:
......@@ -56,3 +56,9 @@ install(TARGETS ${PROJECT_NAME}
DESTINATION lib
COMPONENT log
EXPORT dtkDepends)
## ###################################################################
## Target export
## ###################################################################
list(APPEND DTK_TARGETS ${PROJECT_NAME})
src/dtkTest/dtkTest.h
View file @ 10ee12d1
......@@ -3,9 +3,9 @@
* Author: Julien Wintz
* Created: Mon Feb 4 15:02:54 2013 (+0100)
* Version:
* Last-Updated: Mon Feb 4 15:37:33 2013 (+0100)
* Last-Updated: Fri Mar 22 11:40:16 2013 (+0100)
* By: Julien Wintz
* Update #: 10
* Update #: 14
*/
/* Change Log:
......@@ -24,6 +24,14 @@
return QTest::qExec(&tc, argc, argv); \
}
#define DTKTEST_MAIN_GUI(TestMain, TestObject) \
int TestMain(int argc, char **argv) \
{ \
QGuiApplication app(argc, argv); \
TestObject tc; \
return QTest::qExec(&tc, argc, argv); \
}
#define DTKTEST_MAIN_NOGUI(TestMain, TestObject) \
int TestMain(int argc, char **argv) \
{ \
......
tst/CMakeLists.txt
View file @ 10ee12d1
......@@ -3,9 +3,9 @@
## Author: Julien Wintz
## Created: Mon Feb 4 12:19:46 2013 (+0100)
## Version:
## Last-Updated: Mon Feb 11 23:21:35 2013 (+0100)
## Last-Updated: Fri Mar 22 11:37:42 2013 (+0100)
## By: Julien Wintz
## Update #: 21
## Update #: 23
######################################################################
##
### Change Log:
......@@ -14,3 +14,4 @@
add_subdirectory(dtkLog)
add_subdirectory(dtkDistributed)
add_subdirectory(dtk3D)
tst/dtk3D/CMakeLists.txt 0 → 100644
View file @ 10ee12d1
### CMakeLists.txt ---
##
## Author: Julien Wintz
## Created: Fri Mar 22 10:30:51 2013 (+0100)
## Version:
## Last-Updated: Fri Mar 22 11:38:16 2013 (+0100)
## By: Julien Wintz
## Update #: 20
######################################################################
##
### Change Log:
##
######################################################################
project(dtk3DTest)
## ###################################################################
## Input
## ###################################################################
set(${PROJECT_NAME}_HEADERS
dtk3DViewTest.h)
set(${PROJECT_NAME}_SOURCES
dtk3DViewTest.cpp)
## ###################################################################
## Input - introspected
## ###################################################################
create_test_sourcelist(
${PROJECT_NAME}_SOURCES_TST
${PROJECT_NAME}.cpp
${${PROJECT_NAME}_SOURCES})
## ###################################################################
## Build rules
## ###################################################################
add_executable(${PROJECT_NAME}
${${PROJECT_NAME}_SOURCES_TST}
${${PROJECT_NAME}_SOURCES})
## ###################################################################
## Link rules
## ###################################################################
qt5_use_modules(${PROJECT_NAME} Core)
qt5_use_modules(${PROJECT_NAME} Test)
qt5_use_modules(${PROJECT_NAME} 3D)
target_link_libraries(${PROJECT_NAME} dtk3D)
## ###################################################################
## Test rules
## ###################################################################
add_test(dtk3DViewTest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/dtk3DTest dtk3DViewTest)
tst/dtk3D/dtk3DViewTest.cpp 0 → 100644
View file @ 10ee12d1
/* dtk3DViewTest.cpp ---
*
* Author: Julien Wintz
* Created: Fri Mar 22 11:35:55 2013 (+0100)
* Version:
* Last-Updated: Fri Mar 22 11:42:13 2013 (+0100)
* By: Julien Wintz
* Update #: 12
*/
/* Change Log:
*
*/
#include "dtk3DViewTest.h"
#include <dtk3D>
void dtk3DViewTestCase::initTestCase(void)
{
}
void dtk3DViewTestCase::init(void)
{
}
void dtk3DViewTestCase::testInstanciation(void)
{
dtk3DView view;
view.resize(800, 600);
view.show();
view.raise();
}
void dtk3DViewTestCase::cleanupTestCase(void)
{
}
void dtk3DViewTestCase::cleanup(void)
{
}
DTKTEST_MAIN_GUI(dtk3DViewTest, dtk3DViewTestCase)
tst/dtk3D/dtk3DViewTest.h 0 → 100644
View file @ 10ee12d1
/* dtk3DViewTest.h ---
*
* Author: Julien Wintz
* Created: Fri Mar 22 11:35:20 2013 (+0100)
* Version:
* Last-Updated: Fri Mar 22 11:42:21 2013 (+0100)
* By: Julien Wintz
* Update #: 3
*/
/* Change Log:
*
*/
#pragma once
#include <dtkTest>
class dtk3DViewTestCasePrivate;
class dtk3DViewTestCase : public QObject
{
Q_OBJECT
private slots:
void initTestCase(void);
void init(void);
private slots:
void testInstanciation(void);
private slots:
void cleanupTestCase(void);
void cleanup(void);
};
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment