Skip to content

Commit cf0e70e

Browse files
CoppeliaCoppelia
committedNov 11, 2019
CoppeliaSim initial commit
·
coppeliasim-v4.9.0-rev6coppeliasim-v4.0.0
1 parent 3c149d9 commit cf0e70e

File tree

357 files changed

+21134
-8507
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

357 files changed

+21134
-8507
lines changed
 

‎.gitignore

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ ui_qdlg*.h
77
Makefile
88
Makefile.Debug
99
Makefile.Release
10-
libv_rep.1.0.0.dylib
11-
libv_rep.1.0.dylib
12-
libv_rep.1.dylib
13-
libv_rep.dylib
14-
libv_rep.so
15-
libv_rep.so.1
16-
libv_rep.so.1.0
17-
libv_rep.so.1.0.0
10+
libcoppeliaSimLib.1.0.0.dylib
11+
libcoppeliaSimLib.1.0.dylib
12+
libcoppeliaSimLib.1.dylib
13+
libcoppeliaSimLib.dylib
14+
libcoppeliaSimLib.so
15+
libcoppeliaSimLib.so.1
16+
libcoppeliaSimLib.so.1.0
17+
libcoppeliaSimLib.so.1.0.0
1818
debug
1919
release
2020
mocinclude.opt

‎v_rep.pri ‎coppeliaSimLib.pri

+58-56
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
TARGET = v_rep
1+
TARGET = coppeliaSim
22
TEMPLATE = lib
33

44
CONFIG += shared debug_and_release
@@ -22,7 +22,7 @@ WITH_GUI {
2222
RESOURCES += $$PWD/toolbarFiles.qrc
2323
RESOURCES += $$PWD/variousImageFiles.qrc
2424
RESOURCES += $$PWD/iconFiles.qrc
25-
RESOURCES += $$PWD/imageFiles_vrep.qrc
25+
RESOURCES += $$PWD/imageFiles.qrc
2626
}
2727

2828
WITH_OPENGL {
@@ -61,10 +61,10 @@ WITH_SERIAL {
6161

6262
MSVC_VER = $$(VisualStudioVersion)
6363
equals(MSVC_VER,14.0){
64-
DEFINES += VREP_COMPILER_STR=\\\"MSVC2015\\\"
64+
DEFINES += SIM_COMPILER_STR=\\\"MSVC2015\\\"
6565
}
6666
equals(MSVC_VER,15.0){
67-
DEFINES += VREP_COMPILER_STR=\\\"MSVC2017\\\"
67+
DEFINES += SIM_COMPILER_STR=\\\"MSVC2017\\\"
6868
}
6969
}
7070

@@ -91,7 +91,7 @@ WITH_SERIAL {
9191
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-local-typedefs
9292
QMAKE_CXXFLAGS_WARN_ON += -Wno-narrowing
9393

94-
DEFINES += VREP_COMPILER_STR=\\\"GCC\\\"
94+
DEFINES += SIM_COMPILER_STR=\\\"GCC\\\"
9595
}
9696

9797
clang* {
@@ -119,7 +119,7 @@ clang* {
119119
QMAKE_CFLAGS += -mmacosx-version-min=10.7
120120
QMAKE_CXXFLAGS += -mmacosx-version-min=10.7
121121

122-
DEFINES += VREP_COMPILER_STR=\\\"Clang\\\"
122+
DEFINES += SIM_COMPILER_STR=\\\"Clang\\\"
123123
}
124124

125125
win32 {
@@ -128,15 +128,15 @@ win32 {
128128
LIBS += -lopengl32
129129
LIBS += -luser32
130130
LIBS += -lDbghelp
131-
DEFINES += WIN_VREP
131+
DEFINES += WIN_SIM
132132
}
133133

134134
macx {
135-
DEFINES += MAC_VREP
135+
DEFINES += MAC_SIM
136136
}
137137

138138
unix:!macx {
139-
DEFINES += LIN_VREP
139+
DEFINES += LIN_SIM
140140
}
141141

142142
INCLUDEPATH += $$BOOST_INCLUDEPATH
@@ -190,7 +190,7 @@ INCLUDEPATH += $$PWD/"sourceCode/customUserInterfaces"
190190
INCLUDEPATH += $$PWD/"sourceCode/undoRedo"
191191
INCLUDEPATH += $$PWD/"sourceCode/rendering"
192192
INCLUDEPATH += $$PWD/"../programming/include"
193-
INCLUDEPATH += $$PWD/"../programming/v_repMath"
193+
INCLUDEPATH += $$PWD/"../programming/simMath"
194194

195195
WITH_SERIAL {
196196
INCLUDEPATH += $$PWD/"sourceCode/communication/serialPort"
@@ -216,9 +216,9 @@ WITH_GUI {
216216
}
217217

218218
*-msvc* {
219-
QMAKE_CXXFLAGS += /FI $$PWD/"sourceCode/various/vrepMainHeader.h"
219+
QMAKE_CXXFLAGS += /FI $$PWD/"sourceCode/various/simMainHeader.h"
220220
} else {
221-
QMAKE_CXXFLAGS += -include $$PWD/"sourceCode/various/vrepMainHeader.h"
221+
QMAKE_CXXFLAGS += -include $$PWD/"sourceCode/various/simMainHeader.h"
222222
}
223223

224224
WITH_GUI {
@@ -258,7 +258,7 @@ WITH_GUI {
258258
$$PWD/ui/qdlgdummies.ui \
259259
$$PWD/ui/qdlgoctrees.ui \
260260
$$PWD/ui/qdlgpointclouds.ui \
261-
$$PWD/ui/qdlgscriptparameters.ui \
261+
$$PWD/ui/qdlguserparameters.ui \
262262
$$PWD/ui/qdlgforcesensors.ui \
263263
$$PWD/ui/qdlgprimitives.ui \
264264
$$PWD/ui/qdlgconvexdecomposition.ui \
@@ -318,22 +318,22 @@ WITH_GUI {
318318
$$PWD/ui/qdlgtranslationrotationcont.ui \
319319
}
320320

321-
HEADERS += $$PWD/../programming/v_repMath/mathDefines.h \
322-
$$PWD/../programming/v_repMath/Vector.h \
323-
$$PWD/../programming/v_repMath/MyMath.h \
324-
$$PWD/../programming/v_repMath/MMatrix.h \
325-
$$PWD/../programming/v_repMath/7Vector.h \
326-
$$PWD/../programming/v_repMath/6X6Matrix.h \
327-
$$PWD/../programming/v_repMath/6Vector.h \
328-
$$PWD/../programming/v_repMath/4X4Matrix.h \
329-
$$PWD/../programming/v_repMath/4X4FullMatrix.h \
330-
$$PWD/../programming/v_repMath/4Vector.h \
331-
$$PWD/../programming/v_repMath/3X3Matrix.h \
332-
$$PWD/../programming/v_repMath/3Vector.h \
333-
$$PWD/sourceCode/various/vrepMainHeader.h
334-
335-
HEADERS += $$PWD/../programming/include/v_repConst.h \
336-
$$PWD/../programming/include/v_repTypes.h \
321+
HEADERS += $$PWD/../programming/simMath/mathDefines.h \
322+
$$PWD/../programming/simMath/Vector.h \
323+
$$PWD/../programming/simMath/MyMath.h \
324+
$$PWD/../programming/simMath/MMatrix.h \
325+
$$PWD/../programming/simMath/7Vector.h \
326+
$$PWD/../programming/simMath/6X6Matrix.h \
327+
$$PWD/../programming/simMath/6Vector.h \
328+
$$PWD/../programming/simMath/4X4Matrix.h \
329+
$$PWD/../programming/simMath/4X4FullMatrix.h \
330+
$$PWD/../programming/simMath/4Vector.h \
331+
$$PWD/../programming/simMath/3X3Matrix.h \
332+
$$PWD/../programming/simMath/3Vector.h \
333+
$$PWD/sourceCode/various/simMainHeader.h
334+
335+
HEADERS += $$PWD/../programming/include/simConst.h \
336+
$$PWD/../programming/include/simTypes.h \
337337

338338
HEADERS += $$PWD/sourceCode/inverseKinematics/geomConstraintSolver/iKObject.h \
339339
$$PWD/sourceCode/inverseKinematics/geomConstraintSolver/iKObjCont.h \
@@ -476,7 +476,7 @@ HEADERS += $$PWD/sourceCode/pathPlanning_old/pathPlanningTask_old.h \
476476

477477
HEADERS += $$PWD/sourceCode/motionPlanning_old/motionPlanningTask_old.h \
478478

479-
HEADERS += $$PWD/sourceCode/luaScripting/luaScriptParameters.h \
479+
HEADERS += $$PWD/sourceCode/luaScripting/userParameters.h \
480480
$$PWD/sourceCode/luaScripting/luaScriptObject.h \
481481
$$PWD/sourceCode/luaScripting/outsideCommandQueueForScript.h \
482482
$$PWD/sourceCode/luaScripting/luaWrapper.h \
@@ -500,15 +500,16 @@ HEADERS += $$PWD/sourceCode/serialization/ser.h \
500500
$$PWD/sourceCode/serialization/huffman.h \
501501
$$PWD/sourceCode/serialization/tinyxml2.cpp \
502502

503-
HEADERS += $$PWD/sourceCode/strings/v_repStringTable.h \
504-
$$PWD/sourceCode/strings/v_repStringTable_openGl.h \
505-
$$PWD/sourceCode/strings/v_repStringTable_noTranslation.h \
503+
HEADERS += $$PWD/sourceCode/strings/simStringTable.h \
504+
$$PWD/sourceCode/strings/simStringTable_openGl.h \
505+
$$PWD/sourceCode/strings/simStringTable_noTranslation.h \
506506

507-
HEADERS += $$PWD/sourceCode/interfaces/v_rep.h \
508-
$$PWD/sourceCode/interfaces/v_rep_internal.h \
507+
HEADERS += $$PWD/sourceCode/interfaces/sim.h \
508+
$$PWD/sourceCode/interfaces/simInternal.h \
509509
$$PWD/sourceCode/interfaces/luaScriptFunctions.h \
510510
$$PWD/sourceCode/interfaces/pathPlanningInterface.h \
511511
$$PWD/sourceCode/interfaces/dummyClasses.h \
512+
$$PWD/sourceCode/interfaces/libLic.h \
512513

513514
HEADERS += $$PWD/sourceCode/interfaces/interfaceStack/interfaceStack.h \
514515
$$PWD/sourceCode/interfaces/interfaceStack/interfaceStackObject.h \
@@ -529,7 +530,7 @@ HEADERS += $$PWD/sourceCode/geometricAlgorithms/linMotionRoutines.h \
529530
$$PWD/sourceCode/geometricAlgorithms/edgeElement.h \
530531
$$PWD/sourceCode/geometricAlgorithms/algos.h \
531532

532-
HEADERS += $$PWD/sourceCode/various/vrepConfig.h \
533+
HEADERS += $$PWD/sourceCode/various/simConfig.h \
533534
$$PWD/sourceCode/various/gV.h \
534535
$$PWD/sourceCode/various/global.h \
535536
$$PWD/sourceCode/various/embeddedFonts.h \
@@ -600,7 +601,7 @@ WITH_QT {
600601
$$PWD/sourceCode/platform/wThread.h
601602

602603
HEADERS += $$PWD/sourceCode/various/simAndUiThreadSync.h \
603-
$$PWD/sourceCode/various/vrepQApp.h
604+
$$PWD/sourceCode/various/simQApp.h
604605
}
605606

606607
WITH_SERIAL {
@@ -658,7 +659,7 @@ WITH_GUI {
658659
$$PWD/sourceCode/gui/dialogs/qdlgdummies.h \
659660
$$PWD/sourceCode/gui/dialogs/qdlgoctrees.h \
660661
$$PWD/sourceCode/gui/dialogs/qdlgpointclouds.h \
661-
$$PWD/sourceCode/gui/dialogs/qdlgscriptparameters.h \
662+
$$PWD/sourceCode/gui/dialogs/qdlguserparameters.h \
662663
$$PWD/sourceCode/gui/dialogs/qdlgforcesensors.h \
663664
$$PWD/sourceCode/gui/dialogs/qdlgprimitives.h \
664665
$$PWD/sourceCode/gui/dialogs/qdlgconvexdecomposition.h \
@@ -722,7 +723,7 @@ WITH_GUI {
722723
$$PWD/sourceCode/gui/dialogs/other/toolDlgWrapper.h \
723724
$$PWD/sourceCode/gui/dialogs/other/dlgEx.h \
724725
$$PWD/sourceCode/gui/dialogs/other/dlgCont.h \
725-
$$PWD/sourceCode/gui/dialogs/other/qvrep_openglwidget.h \
726+
$$PWD/sourceCode/gui/dialogs/other/qsim_openglwidget.h \
726727

727728
HEADERS += $$PWD/sourceCode/gui/qtPropertyBrowserRelated/qtPropertyBrowserFiles/qtbuttonpropertybrowser.h \
728729
$$PWD/sourceCode/gui/qtPropertyBrowserRelated/qtPropertyBrowserFiles/qteditorfactory.h \
@@ -784,17 +785,17 @@ WITH_GUI {
784785
HEADERS += $$PWD/sourceCode/gui/libs/auxLibVideo.h \
785786
}
786787

787-
SOURCES += $$PWD/../programming/v_repMath/Vector.cpp \
788-
$$PWD/../programming/v_repMath/MyMath.cpp \
789-
$$PWD/../programming/v_repMath/MMatrix.cpp \
790-
$$PWD/../programming/v_repMath/7Vector.cpp \
791-
$$PWD/../programming/v_repMath/6X6Matrix.cpp \
792-
$$PWD/../programming/v_repMath/6Vector.cpp \
793-
$$PWD/../programming/v_repMath/4X4Matrix.cpp \
794-
$$PWD/../programming/v_repMath/4X4FullMatrix.cpp \
795-
$$PWD/../programming/v_repMath/4Vector.cpp \
796-
$$PWD/../programming/v_repMath/3X3Matrix.cpp \
797-
$$PWD/../programming/v_repMath/3Vector.cpp \
788+
SOURCES += $$PWD/../programming/simMath/Vector.cpp \
789+
$$PWD/../programming/simMath/MyMath.cpp \
790+
$$PWD/../programming/simMath/MMatrix.cpp \
791+
$$PWD/../programming/simMath/7Vector.cpp \
792+
$$PWD/../programming/simMath/6X6Matrix.cpp \
793+
$$PWD/../programming/simMath/6Vector.cpp \
794+
$$PWD/../programming/simMath/4X4Matrix.cpp \
795+
$$PWD/../programming/simMath/4X4FullMatrix.cpp \
796+
$$PWD/../programming/simMath/4Vector.cpp \
797+
$$PWD/../programming/simMath/3X3Matrix.cpp \
798+
$$PWD/../programming/simMath/3Vector.cpp \
798799

799800
SOURCES += $$PWD/sourceCode/inverseKinematics/geomConstraintSolver/iKObject.cpp \
800801
$$PWD/sourceCode/inverseKinematics/geomConstraintSolver/iKObjCont.cpp \
@@ -939,7 +940,7 @@ SOURCES += $$PWD/sourceCode/pathPlanning_old/pathPlanningTask_old.cpp \
939940

940941
SOURCES += $$PWD/sourceCode/motionPlanning_old/motionPlanningTask_old.cpp \
941942

942-
SOURCES += $$PWD/sourceCode/luaScripting/luaScriptParameters.cpp \
943+
SOURCES += $$PWD/sourceCode/luaScripting/userParameters.cpp \
943944
$$PWD/sourceCode/luaScripting/luaScriptObject.cpp \
944945
$$PWD/sourceCode/luaScripting/outsideCommandQueueForScript.cpp \
945946
$$PWD/sourceCode/luaScripting/luaWrapper.cpp \
@@ -963,10 +964,11 @@ SOURCES += $$PWD/sourceCode/serialization/ser.cpp \
963964
$$PWD/sourceCode/serialization/huffman.c \
964965
$$PWD/sourceCode/serialization/tinyxml2.cpp \
965966

966-
SOURCES += $$PWD/sourceCode/interfaces/v_rep.cpp \
967-
$$PWD/sourceCode/interfaces/v_rep_internal.cpp \
967+
SOURCES += $$PWD/sourceCode/interfaces/sim.cpp \
968+
$$PWD/sourceCode/interfaces/simInternal.cpp \
968969
$$PWD/sourceCode/interfaces/luaScriptFunctions.cpp \
969970
$$PWD/sourceCode/interfaces/pathPlanningInterface.cpp \
971+
$$PWD/sourceCode/interfaces/libLic.cpp \
970972

971973
SOURCES += $$PWD/sourceCode/interfaces/interfaceStack/interfaceStack.cpp \
972974
$$PWD/sourceCode/interfaces/interfaceStack/interfaceStackObject.cpp \
@@ -1055,7 +1057,7 @@ WITH_QT {
10551057
$$PWD/sourceCode/platform/wThread.cpp
10561058

10571059
SOURCES += $$PWD/sourceCode/various/simAndUiThreadSync.cpp \
1058-
$$PWD/sourceCode/various/vrepQApp.cpp
1060+
$$PWD/sourceCode/various/simQApp.cpp
10591061
}
10601062

10611063
WITH_SERIAL {
@@ -1114,7 +1116,7 @@ WITH_GUI {
11141116
$$PWD/sourceCode/gui/dialogs/qdlgdummies.cpp \
11151117
$$PWD/sourceCode/gui/dialogs/qdlgoctrees.cpp \
11161118
$$PWD/sourceCode/gui/dialogs/qdlgpointclouds.cpp \
1117-
$$PWD/sourceCode/gui/dialogs/qdlgscriptparameters.cpp \
1119+
$$PWD/sourceCode/gui/dialogs/qdlguserparameters.cpp \
11181120
$$PWD/sourceCode/gui/dialogs/qdlgforcesensors.cpp \
11191121
$$PWD/sourceCode/gui/dialogs/qdlgprimitives.cpp \
11201122
$$PWD/sourceCode/gui/dialogs/qdlgconvexdecomposition.cpp \
@@ -1194,7 +1196,7 @@ WITH_GUI {
11941196
$$PWD/sourceCode/gui/dialogs/other/toolDlgWrapper.cpp \
11951197
$$PWD/sourceCode/gui/dialogs/other/dlgEx.cpp \
11961198
$$PWD/sourceCode/gui/dialogs/other/dlgCont.cpp \
1197-
$$PWD/sourceCode/gui/dialogs/other/qvrep_openglwidget.cpp \
1199+
$$PWD/sourceCode/gui/dialogs/other/qsim_openglwidget.cpp \
11981200

11991201
SOURCES += $$PWD/sourceCode/gui/platform/vMessageBox.cpp \
12001202
$$PWD/sourceCode/gui/platform/vMenubar.cpp \

0 commit comments

Comments
 (0)
Please sign in to comment.