comparison: src/main.cpp
src/main.cpp
- changeset 1017
- fc1c13db9618
- parent 1014
- f0a8ecb6a357
- child 1018
- 49358df9495b
equal
deleted
inserted
replaced
| 1016:3b279b5e57d3 | 1017:fc1c13db9618 |
|---|---|
| 33 #include "crashCatcher.h" | 33 #include "crashCatcher.h" |
| 34 #include "ldpaths.h" | 34 #include "ldpaths.h" |
| 35 #include "documentmanager.h" | 35 #include "documentmanager.h" |
| 36 | 36 |
| 37 MainWindow* g_win = nullptr; | 37 MainWindow* g_win = nullptr; |
| 38 ConfigurationValueBag* Config = nullptr; | 38 Configuration* Config = nullptr; |
| 39 const Vertex Origin (0.0f, 0.0f, 0.0f); | 39 const Vertex Origin (0.0f, 0.0f, 0.0f); |
| 40 const Matrix IdentityMatrix ({1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f}); | 40 const Matrix IdentityMatrix ({1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f}); |
| 41 | 41 |
| 42 ConfigOption (bool FirstStart = true) | 42 ConfigOption (bool FirstStart = true) |
| 43 | 43 |
| 47 { | 47 { |
| 48 QApplication app (argc, argv); | 48 QApplication app (argc, argv); |
| 49 app.setOrganizationName (APPNAME); | 49 app.setOrganizationName (APPNAME); |
| 50 app.setApplicationName (APPNAME); | 50 app.setApplicationName (APPNAME); |
| 51 | 51 |
| 52 static ConfigurationValueBag configObject; | 52 static Configuration configObject; |
| 53 Config = &configObject; | 53 Config = &configObject; |
| 54 | 54 |
| 55 LDPaths* paths = new LDPaths; | 55 LDPaths* paths = new LDPaths; |
| 56 paths->checkPaths(); | 56 paths->checkPaths(); |
| 57 paths->deleteLater(); | 57 paths->deleteLater(); |
| 58 | 58 |
| 59 initCrashCatcher(); | 59 initCrashCatcher(); |
| 60 initColors(); | 60 initColors(); |
| 61 MainWindow* win = new MainWindow; | 61 MainWindow* win = new MainWindow(configObject); |
| 62 LoadPrimitives(); | 62 LoadPrimitives(); |
| 63 win->show(); | 63 win->show(); |
| 64 | 64 |
| 65 // Process the command line | 65 // Process the command line |
| 66 for (int arg = 1; arg < argc; ++arg) | 66 for (int arg = 1; arg < argc; ++arg) |
