Skip to content

Commit 2b633eb

Browse files
ju6geju6ge
committed
only classes need dll export interface?
1 parent 9e232c4 commit 2b633eb

File tree

10 files changed

+110
-110
lines changed

10 files changed

+110
-110
lines changed

‎include/SceneWidget.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -79,21 +79,21 @@ class TOOLKIT_DLLAPI SceneWidget : public QWidget {
7979

8080
// adding an object will expect that all controll of memory is handed to this class meaning
8181
// that you don't have to care about freeing the memory again
82-
TOOLKIT_DLLAPI void addSceneObject(Qt3DCore::QEntity *scene_obj);
83-
TOOLKIT_DLLAPI void removeSceneObject(Qt3DCore::QEntity *scene_obj);
84-
TOOLKIT_DLLAPI void addSceneObjectToGroup(Qt3DCore::QEntity* scene_obj, QString group_name);
85-
TOOLKIT_DLLAPI void removeSceneObjectFromGroup(Qt3DCore::QEntity* scene_obj, QString group_name);
82+
void addSceneObject(Qt3DCore::QEntity *scene_obj);
83+
void removeSceneObject(Qt3DCore::QEntity *scene_obj);
84+
void addSceneObjectToGroup(Qt3DCore::QEntity* scene_obj, QString group_name);
85+
void removeSceneObjectFromGroup(Qt3DCore::QEntity* scene_obj, QString group_name);
8686

87-
TOOLKIT_DLLAPI Qt3DRender::QCamera* getCameraObj();
88-
TOOLKIT_DLLAPI void setCameraLens(Qt3DRender::QCameraLens::ProjectionType projection);
87+
Qt3DRender::QCamera* getCameraObj();
88+
void setCameraLens(Qt3DRender::QCameraLens::ProjectionType projection);
8989

90-
TOOLKIT_DLLAPI Qt3DCore::QEntity* getSceneRoot() { return scene_root; }
91-
TOOLKIT_DLLAPI QColor getDefaultClearColor() { return default_clear_color; }
90+
Qt3DCore::QEntity* getSceneRoot() { return scene_root; }
91+
QColor getDefaultClearColor() { return default_clear_color; }
9292

93-
TOOLKIT_DLLAPI int getWidth() { return width; }
94-
TOOLKIT_DLLAPI int getHeight() { return height; }
93+
int getWidth() { return width; }
94+
int getHeight() { return height; }
9595

96-
TOOLKIT_DLLAPI Qt3DRender::QRenderCaptureReply* requestFrameCapture();
96+
Qt3DRender::QRenderCaptureReply* requestFrameCapture();
9797

9898
protected:
9999
void resizeEvent(QResizeEvent *event);

‎include/Timeline.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@ class TOOLKIT_DLLAPI ToolkitTimeline : public QWidget, public Ui::Timeline {
1818
public:
1919
ToolkitTimeline(QWidget* parent);
2020

21-
TOOLKIT_DLLAPI void setMaxTime(float max_time);
22-
TOOLKIT_DLLAPI float getMaxTime() { return max_time; }
23-
TOOLKIT_DLLAPI float getCurrentTime() { return current_time; }
24-
TOOLKIT_DLLAPI void setCurrentTime(float current_time, bool stop_playing=false);
25-
TOOLKIT_DLLAPI void reset();
21+
void setMaxTime(float max_time);
22+
float getMaxTime() { return max_time; }
23+
float getCurrentTime() { return current_time; }
24+
void setCurrentTime(float current_time, bool stop_playing=false);
25+
void reset();
2626

2727
public slots:
28-
TOOLKIT_DLLAPI void speedChanged(double speed);
29-
TOOLKIT_DLLAPI void togglePlaying();
28+
void speedChanged(double speed);
29+
void togglePlaying();
3030

31-
TOOLKIT_DLLAPI void sliderMoved(int pos);
32-
TOOLKIT_DLLAPI void sliderPressed();
33-
TOOLKIT_DLLAPI void sliderReleased();
31+
void sliderMoved(int pos);
32+
void sliderPressed();
33+
void sliderReleased();
3434

35-
TOOLKIT_DLLAPI void tick(float dt);
35+
void tick(float dt);
3636

37-
TOOLKIT_DLLAPI void reset_timeline();
37+
void reset_timeline();
3838

3939
signals:
4040
//signal always sends absolute time so that all listeners can update accordingly

‎include/ToolkitApp.h‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,36 +50,36 @@ class TOOLKIT_DLLAPI ToolkitApp : public QMainWindow
5050
public:
5151
ToolkitSettings toolkit_settings;
5252

53-
TOOLKIT_DLLAPI ToolkitApp(QWidget *parent = 0);
54-
TOOLKIT_DLLAPI std::vector<RBDLModelWrapper*>* getLoadedModels();
53+
ToolkitApp(QWidget *parent = 0);
54+
std::vector<RBDLModelWrapper*>* getLoadedModels();
5555

56-
TOOLKIT_DLLAPI RBDLModelWrapper* selectModel(ModelFilter filter);
56+
RBDLModelWrapper* selectModel(ModelFilter filter);
5757

58-
TOOLKIT_DLLAPI void addView(QString name, QWidget *view_widget, Qt::DockWidgetArea area=Qt::RightDockWidgetArea, bool show_tilte = true);
59-
TOOLKIT_DLLAPI void deleteView(QString name);
58+
void addView(QString name, QWidget *view_widget, Qt::DockWidgetArea area=Qt::RightDockWidgetArea, bool show_tilte = true);
59+
void deleteView(QString name);
6060

61-
TOOLKIT_DLLAPI void addFileAction(QAction* file_action);
61+
void addFileAction(QAction* file_action);
6262

63-
TOOLKIT_DLLAPI QMenu* getMenu(std::string menu_name);
64-
TOOLKIT_DLLAPI void deleteMenu(QMenu* menu);
63+
QMenu* getMenu(std::string menu_name);
64+
void deleteMenu(QMenu* menu);
6565

66-
TOOLKIT_DLLAPI void addCmdOption(QCommandLineOption &option, std::function<void(QCommandLineParser&)>);
67-
TOOLKIT_DLLAPI void parseCmd(QApplication& app);
66+
void addCmdOption(QCommandLineOption &option, std::function<void(QCommandLineParser&)>);
67+
void parseCmd(QApplication& app);
6868

69-
TOOLKIT_DLLAPI void showWarningDialog(QString warning_msg);
69+
void showWarningDialog(QString warning_msg);
7070

71-
TOOLKIT_DLLAPI static void showExceptionDialog(std::exception& e);
71+
static void showExceptionDialog(std::exception& e);
7272

73-
TOOLKIT_DLLAPI ToolkitTimeline* getToolkitTimeline() { return timeline; }
74-
TOOLKIT_DLLAPI SceneWidget* getSceneObj() { return main_display; }
73+
ToolkitTimeline* getToolkitTimeline() { return timeline; }
74+
SceneWidget* getSceneObj() { return main_display; }
7575

7676
public slots:
77-
TOOLKIT_DLLAPI void action_reload_files();
78-
TOOLKIT_DLLAPI void action_load_model();
77+
void action_reload_files();
78+
void action_load_model();
7979

80-
TOOLKIT_DLLAPI void model_visual_update(Qt3DCore::QEntity* visual);
80+
void model_visual_update(Qt3DCore::QEntity* visual);
8181

82-
TOOLKIT_DLLAPI void loadModel(const QString &model_file);
82+
void loadModel(const QString &model_file);
8383

8484
signals:
8585
void reload();

‎include/ToolkitSettings.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,18 @@ class TOOLKIT_DLLAPI ToolkitSettings : public QObject{
4545
public:
4646
ToolkitSettings();
4747

48-
TOOLKIT_DLLAPI QVariant value(const QString &key);
49-
TOOLKIT_DLLAPI QMetaType::Type type(const QString &key);
50-
TOOLKIT_DLLAPI void setValue(const QString &key, const QVariant &value);
51-
TOOLKIT_DLLAPI void setType(const QString &key, const QVariant infer_from_value);
48+
QVariant value(const QString &key);
49+
QMetaType::Type type(const QString &key);
50+
void setValue(const QString &key, const QVariant &value);
51+
void setType(const QString &key, const QVariant infer_from_value);
5252

53-
TOOLKIT_DLLAPI QString group() { return settings.group(); }
53+
QString group() { return settings.group(); }
5454

55-
TOOLKIT_DLLAPI void beginGroup(QString group);
56-
TOOLKIT_DLLAPI void endGroup();
55+
void beginGroup(QString group);
56+
void endGroup();
5757

58-
TOOLKIT_DLLAPI QStringList childKeys() { return settings.childKeys(); }
59-
TOOLKIT_DLLAPI QStringList childGroups() { return settings.childGroups(); }
58+
QStringList childKeys() { return settings.childKeys(); }
59+
QStringList childGroups() { return settings.childGroups(); }
6060

6161
private:
6262
QSettings settings;
@@ -67,7 +67,7 @@ class TOOLKIT_DLLAPI ToolkitSettings : public QObject{
6767
void settings_changed();
6868

6969
public slots:
70-
TOOLKIT_DLLAPI void editSettings();
70+
void editSettings();
7171
};
7272

7373
#endif

‎include/rbdl_wrapper.h‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -76,32 +76,32 @@ class TOOLKIT_DLLAPI RBDLModelWrapper : public QObject {
7676
void clear();
7777
virtual void load(QString model_file) = 0;
7878
public:
79-
TOOLKIT_DLLAPI static RBDLModelWrapper* loadFromFile(QString model_file);
79+
static RBDLModelWrapper* loadFromFile(QString model_file);
8080

8181

8282
RigidBodyDynamics::Model* rbdl_model;
8383

8484
RBDLModelWrapper();
85-
TOOLKIT_DLLAPI void build3DEntity(ModelInfo&, std::vector<SegmentVisualInfo>&);
85+
void build3DEntity(ModelInfo&, std::vector<SegmentVisualInfo>&);
8686

87-
TOOLKIT_DLLAPI QString getFileName() { return QFileInfo(model_file).baseName(); }
88-
TOOLKIT_DLLAPI std::string getModelType() { return model_type; }
89-
TOOLKIT_DLLAPI QString getModelFile();
90-
TOOLKIT_DLLAPI int getModelDof();
91-
TOOLKIT_DLLAPI Qt3DCore::QEntity* getRenderObj() { return model_root; }
92-
TOOLKIT_DLLAPI Qt3DCore::QEntity* getSegmentEntity(std::string segment_name, bool create=false);
87+
QString getFileName() { return QFileInfo(model_file).baseName(); }
88+
std::string getModelType() { return model_type; }
89+
QString getModelFile();
90+
int getModelDof();
91+
Qt3DCore::QEntity* getRenderObj() { return model_root; }
92+
Qt3DCore::QEntity* getSegmentEntity(std::string segment_name, bool create=false);
9393

94-
TOOLKIT_DLLAPI void addStaticVisual(std::string segment_name, Qt3DCore::QEntity *visual);
95-
TOOLKIT_DLLAPI void updateKinematics(RigidBodyDynamics::Math::VectorNd Q);
94+
void addStaticVisual(std::string segment_name, Qt3DCore::QEntity *visual);
95+
void updateKinematics(RigidBodyDynamics::Math::VectorNd Q);
9696

97-
TOOLKIT_DLLAPI void reload();
97+
void reload();
9898

9999
//takes ownership of extension -> only delete via model not where it was created
100-
TOOLKIT_DLLAPI void addExtension(WrapperExtension* extension);
100+
void addExtension(WrapperExtension* extension);
101101
//void deleteExtension(std::string name);
102-
TOOLKIT_DLLAPI bool hasExtension(std::string name);
103-
TOOLKIT_DLLAPI const std::vector<std::string>& loadedExtensions() { return extension_names; }
104-
TOOLKIT_DLLAPI WrapperExtension* getExtension(std::string name);
102+
bool hasExtension(std::string name);
103+
const std::vector<std::string>& loadedExtensions() { return extension_names; }
104+
WrapperExtension* getExtension(std::string name);
105105

106106
public slots:
107107
void model_update(float current_time);

‎src/SceneWidget.cc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void SceneWidget::resizeEvent(QResizeEvent *event) {
8787
setCameraLens(camera->lens()->projectionType());
8888
}
8989

90-
TOOLKIT_DLLAPI void SceneWidget::setCameraLens(QCameraLens::ProjectionType projection) {
90+
void SceneWidget::setCameraLens(QCameraLens::ProjectionType projection) {
9191
//std::cout << width << " " << height << std::endl;
9292
camera->lens()->setProjectionType(projection);
9393
if (projection == QCameraLens::PerspectiveProjection) {
@@ -112,7 +112,7 @@ TOOLKIT_DLLAPI void SceneWidget::setCameraLens(QCameraLens::ProjectionType proje
112112
}
113113
}
114114

115-
TOOLKIT_DLLAPI void SceneWidget::addSceneObject(Qt3DCore::QEntity *scene_obj) {
115+
void SceneWidget::addSceneObject(Qt3DCore::QEntity *scene_obj) {
116116
//qDebug() << scene_obj->dynamicPropertyNames();
117117
scene_obj->setParent(scene_root);
118118

@@ -133,7 +133,7 @@ TOOLKIT_DLLAPI void SceneWidget::addSceneObject(Qt3DCore::QEntity *scene_obj) {
133133
}
134134
}
135135

136-
TOOLKIT_DLLAPI void SceneWidget::addSceneObjectToGroup(QEntity* scene_obj, QString group_name) {
136+
void SceneWidget::addSceneObjectToGroup(QEntity* scene_obj, QString group_name) {
137137
bool found = false;
138138
for(auto it=scene_obj_grouping[group_name].begin(); it<scene_obj_grouping[group_name].end(); it++) {
139139
if (*it == scene_obj) {
@@ -162,7 +162,7 @@ TOOLKIT_DLLAPI void SceneWidget::addSceneObjectToGroup(QEntity* scene_obj, QStri
162162
}
163163
}
164164

165-
TOOLKIT_DLLAPI void SceneWidget::removeSceneObjectFromGroup(QEntity* scene_obj, QString group_name) {
165+
void SceneWidget::removeSceneObjectFromGroup(QEntity* scene_obj, QString group_name) {
166166
for(auto it=scene_obj_grouping[group_name].begin(); it<scene_obj_grouping[group_name].end(); it++) {
167167
if (*it == scene_obj) {
168168
scene_obj_grouping[group_name].erase(it);
@@ -171,7 +171,7 @@ TOOLKIT_DLLAPI void SceneWidget::removeSceneObjectFromGroup(QEntity* scene_obj,
171171
}
172172
}
173173

174-
TOOLKIT_DLLAPI void SceneWidget::removeSceneObject(Qt3DCore::QEntity *scene_obj) {
174+
void SceneWidget::removeSceneObject(Qt3DCore::QEntity *scene_obj) {
175175
scene_obj->setParent((Qt3DCore::QEntity*) nullptr);
176176

177177
QVariant obj_grouping = scene_obj->property("Scene.ObjGroup");
@@ -204,15 +204,15 @@ void SceneWidget::frame_action_repeater(float dt) {
204204
emit frame_sync_signal(dt);
205205
}
206206

207-
TOOLKIT_DLLAPI QCamera* SceneWidget::getCameraObj() {
207+
QCamera* SceneWidget::getCameraObj() {
208208
return camera;
209209
}
210210

211211
void SceneWidget::update_orthographic_scale() {
212212
setCameraLens(camera->lens()->projectionType());
213213
}
214214

215-
TOOLKIT_DLLAPI void SceneWidget::setClearColor(QColor color){
215+
void SceneWidget::setClearColor(QColor color){
216216
qt3d_view->defaultFrameGraph()->setClearColor(color);
217217
}
218218

@@ -237,7 +237,7 @@ void SceneWidget::setOffscreenRender(QObject* surface) {
237237
}
238238
}
239239

240-
TOOLKIT_DLLAPI Qt3DRender::QRenderCaptureReply* SceneWidget::requestFrameCapture() {
240+
Qt3DRender::QRenderCaptureReply* SceneWidget::requestFrameCapture() {
241241
if (render_capture == nullptr) {
242242
render_capture = new QRenderCapture();
243243
qt3d_view->activeFrameGraph()->setParent(render_capture);

‎src/Timeline.cc‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,42 +28,42 @@ ToolkitTimeline::ToolkitTimeline(QWidget *parent) : speed_factor(1.0),
2828
connect(TimelineVertSlider, SIGNAL(sliderReleased()), this, SLOT(sliderReleased()));
2929
}
3030

31-
TOOLKIT_DLLAPI void ToolkitTimeline::reset() {
31+
void ToolkitTimeline::reset() {
3232
max_time = 0.;
3333
current_time = 0.;
3434
playing = false;
3535
speed_factor = 1.0;
3636
}
3737

38-
TOOLKIT_DLLAPI void ToolkitTimeline::setMaxTime(float max) {
38+
void ToolkitTimeline::setMaxTime(float max) {
3939
float old_max = max_time;
4040
max_time = std::max(max, max_time);
4141

4242
if (old_max != max_time)
4343
emit maxTimeChanged(max_time);
4444
}
4545

46-
TOOLKIT_DLLAPI void ToolkitTimeline::togglePlaying() {
46+
void ToolkitTimeline::togglePlaying() {
4747
if (max_time > 0.) {
4848
playing = !playing;
4949
was_playing = playing;
5050
}
5151
}
5252

53-
TOOLKIT_DLLAPI void ToolkitTimeline::sliderPressed() {
53+
void ToolkitTimeline::sliderPressed() {
5454
playing = false;
5555
}
5656

57-
TOOLKIT_DLLAPI void ToolkitTimeline::sliderReleased() {
57+
void ToolkitTimeline::sliderReleased() {
5858
playing = was_playing;
5959
}
6060

61-
TOOLKIT_DLLAPI void ToolkitTimeline::sliderMoved(int pos) {
61+
void ToolkitTimeline::sliderMoved(int pos) {
6262
float p = (float)pos / (float)slider_granularity;
6363
setCurrentTime( max_time * p);
6464
}
6565

66-
TOOLKIT_DLLAPI void ToolkitTimeline::setCurrentTime(float current, bool stop_playing) {
66+
void ToolkitTimeline::setCurrentTime(float current, bool stop_playing) {
6767
if (stop_playing) {
6868
playing = false;
6969
}
@@ -81,7 +81,7 @@ TOOLKIT_DLLAPI void ToolkitTimeline::setCurrentTime(float current, bool stop_pla
8181
emit timeChanged(current_time);
8282
}
8383

84-
TOOLKIT_DLLAPI void ToolkitTimeline::tick(float dt) {
84+
void ToolkitTimeline::tick(float dt) {
8585
if (max_time <= 0. || !playing ) {
8686
//do not do anything if max time is smaller or equal to zero
8787
//or if animation is halted
@@ -92,11 +92,11 @@ TOOLKIT_DLLAPI void ToolkitTimeline::tick(float dt) {
9292
setCurrentTime(current_time);
9393
}
9494

95-
TOOLKIT_DLLAPI void ToolkitTimeline::speedChanged(double speed) {
95+
void ToolkitTimeline::speedChanged(double speed) {
9696
speed_factor = speed;
9797
}
9898

99-
TOOLKIT_DLLAPI void ToolkitTimeline::reset_timeline() {
99+
void ToolkitTimeline::reset_timeline() {
100100
max_time = 0.;
101101
setCurrentTime(0.);
102102
playing = false;

0 commit comments

Comments
 (0)