mirror of
https://github.com/leozide/leocad
synced 2025-01-20 22:26:45 +01:00
Include cleanup.
This commit is contained in:
parent
4d9113c1d0
commit
d5ccd6289f
25 changed files with 8 additions and 43 deletions
|
@ -7,7 +7,6 @@
|
||||||
#include <float.h>
|
#include <float.h>
|
||||||
#include "lc_file.h"
|
#include "lc_file.h"
|
||||||
#include "camera.h"
|
#include "camera.h"
|
||||||
#include "view.h"
|
|
||||||
#include "tr.h"
|
#include "tr.h"
|
||||||
#include "lc_application.h"
|
#include "lc_application.h"
|
||||||
#include "lc_context.h"
|
#include "lc_context.h"
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
#include "lc_array.h"
|
#include "lc_array.h"
|
||||||
|
|
||||||
class TiledRender;
|
class TiledRender;
|
||||||
class View;
|
|
||||||
|
|
||||||
#define LC_CAMERA_HIDDEN 0x0001
|
#define LC_CAMERA_HIDDEN 0x0001
|
||||||
#define LC_CAMERA_SIMPLE 0x0002
|
#define LC_CAMERA_SIMPLE 0x0002
|
||||||
|
|
|
@ -1,15 +1,11 @@
|
||||||
#include "lc_global.h"
|
#include "lc_global.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include "lc_application.h"
|
#include "lc_application.h"
|
||||||
#include "lc_colors.h"
|
|
||||||
#include "lc_library.h"
|
#include "lc_library.h"
|
||||||
#include "lc_profile.h"
|
#include "lc_profile.h"
|
||||||
#include "system.h"
|
|
||||||
#include "project.h"
|
#include "project.h"
|
||||||
#include "image.h"
|
|
||||||
#include "lc_mainwindow.h"
|
#include "lc_mainwindow.h"
|
||||||
#include "lc_shortcuts.h"
|
#include "lc_shortcuts.h"
|
||||||
#include "view.h"
|
|
||||||
|
|
||||||
lcApplication* g_App;
|
lcApplication* g_App;
|
||||||
|
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
#define _LC_APPLICATION_H_
|
#define _LC_APPLICATION_H_
|
||||||
|
|
||||||
#include "lc_array.h"
|
#include "lc_array.h"
|
||||||
#include "str.h"
|
|
||||||
|
|
||||||
class Project;
|
class Project;
|
||||||
class lcPiecesLibrary;
|
class lcPiecesLibrary;
|
||||||
|
class String;
|
||||||
|
|
||||||
enum lcLightingMode
|
enum lcLightingMode
|
||||||
{
|
{
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
#include "lc_array.h"
|
#include "lc_array.h"
|
||||||
#include "lc_math.h"
|
#include "lc_math.h"
|
||||||
#include "lc_colors.h"
|
#include "lc_colors.h"
|
||||||
|
#include "lc_mesh.h"
|
||||||
|
|
||||||
class lcScene
|
class lcScene
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
#include "lc_global.h"
|
#include "lc_global.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <memory.h>
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "lc_file.h"
|
#include "lc_file.h"
|
||||||
|
|
|
@ -43,9 +43,9 @@ int stricmp(const char* str1, const char* str2);
|
||||||
|
|
||||||
// Version number.
|
// Version number.
|
||||||
#define LC_VERSION_MAJOR 0
|
#define LC_VERSION_MAJOR 0
|
||||||
#define LC_VERSION_MINOR 82
|
#define LC_VERSION_MINOR 83
|
||||||
#define LC_VERSION_PATCH 2
|
#define LC_VERSION_PATCH 0
|
||||||
#define LC_VERSION_TEXT "0.82.2"
|
#define LC_VERSION_TEXT "0.83.0"
|
||||||
|
|
||||||
// Forward declarations.
|
// Forward declarations.
|
||||||
class Project;
|
class Project;
|
||||||
|
|
|
@ -7,13 +7,10 @@
|
||||||
#include "lc_texture.h"
|
#include "lc_texture.h"
|
||||||
#include "lc_category.h"
|
#include "lc_category.h"
|
||||||
#include "lc_application.h"
|
#include "lc_application.h"
|
||||||
#include "lc_mainwindow.h"
|
|
||||||
#include "lc_context.h"
|
#include "lc_context.h"
|
||||||
#include "lc_glextensions.h"
|
#include "lc_glextensions.h"
|
||||||
#include "lc_synth.h"
|
#include "lc_synth.h"
|
||||||
#include "project.h"
|
#include "project.h"
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <locale.h>
|
#include <locale.h>
|
||||||
#include <zlib.h>
|
#include <zlib.h>
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#ifndef _LC_MESH_H_
|
#ifndef _LC_MESH_H_
|
||||||
#define _LC_MESH_H_
|
#define _LC_MESH_H_
|
||||||
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include "lc_math.h"
|
#include "lc_math.h"
|
||||||
|
|
||||||
#define LC_MESH_FILE_ID LC_FOURCC('M', 'E', 'S', 'H')
|
#define LC_MESH_FILE_ID LC_FOURCC('M', 'E', 'S', 'H')
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
#include "lc_library.h"
|
#include "lc_library.h"
|
||||||
#include "lc_texture.h"
|
#include "lc_texture.h"
|
||||||
#include "lc_synth.h"
|
#include "lc_synth.h"
|
||||||
|
#include "lc_file.h"
|
||||||
#include "pieceinf.h"
|
#include "pieceinf.h"
|
||||||
#include "view.h"
|
#include "view.h"
|
||||||
#include "preview.h"
|
#include "preview.h"
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#ifndef _LC_MODEL_H_
|
#ifndef _LC_MODEL_H_
|
||||||
#define _LC_MODEL_H_
|
#define _LC_MODEL_H_
|
||||||
|
|
||||||
#include "lc_file.h"
|
|
||||||
#include "lc_math.h"
|
#include "lc_math.h"
|
||||||
#include "object.h"
|
#include "object.h"
|
||||||
#include "lc_commands.h"
|
#include "lc_commands.h"
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#include "lc_global.h"
|
#include "lc_global.h"
|
||||||
#include "lc_shortcuts.h"
|
#include "lc_shortcuts.h"
|
||||||
#include "lc_profile.h"
|
#include "lc_profile.h"
|
||||||
#include "system.h"
|
|
||||||
|
|
||||||
lcKeyboardShortcuts gKeyboardShortcuts;
|
lcKeyboardShortcuts gKeyboardShortcuts;
|
||||||
lcMouseShortcuts gMouseShortcuts;
|
lcMouseShortcuts gMouseShortcuts;
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
#include "lc_global.h"
|
#include "lc_global.h"
|
||||||
#include "lc_texture.h"
|
#include "lc_texture.h"
|
||||||
#include "lc_file.h"
|
|
||||||
#include "lc_application.h"
|
#include "lc_application.h"
|
||||||
#include "lc_library.h"
|
#include "lc_library.h"
|
||||||
#include "image.h"
|
#include "image.h"
|
||||||
|
|
|
@ -1,13 +1,10 @@
|
||||||
#include "lc_global.h"
|
#include "lc_global.h"
|
||||||
#include "lc_math.h"
|
#include "lc_math.h"
|
||||||
#include "lc_colors.h"
|
#include "lc_colors.h"
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "light.h"
|
#include "light.h"
|
||||||
#include "camera.h"
|
|
||||||
#include "view.h"
|
|
||||||
#include "lc_application.h"
|
#include "lc_application.h"
|
||||||
#include "lc_context.h"
|
#include "lc_context.h"
|
||||||
|
|
||||||
|
|
|
@ -4,8 +4,6 @@
|
||||||
#include "object.h"
|
#include "object.h"
|
||||||
#include "lc_math.h"
|
#include "lc_math.h"
|
||||||
|
|
||||||
class View;
|
|
||||||
|
|
||||||
#define LC_LIGHT_HIDDEN 0x0001
|
#define LC_LIGHT_HIDDEN 0x0001
|
||||||
#define LC_LIGHT_DISABLED 0x0002
|
#define LC_LIGHT_DISABLED 0x0002
|
||||||
#define LC_LIGHT_SPOT 0x0004
|
#define LC_LIGHT_SPOT 0x0004
|
||||||
|
|
|
@ -1,14 +1,12 @@
|
||||||
#include "lc_global.h"
|
#include "lc_global.h"
|
||||||
#include "lc_colors.h"
|
#include "lc_colors.h"
|
||||||
#include "lc_math.h"
|
#include "lc_math.h"
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include "minifig.h"
|
#include "minifig.h"
|
||||||
#include "pieceinf.h"
|
#include "pieceinf.h"
|
||||||
#include "project.h"
|
#include "project.h"
|
||||||
#include "lc_model.h"
|
#include "lc_model.h"
|
||||||
#include "system.h"
|
|
||||||
#include "lc_library.h"
|
#include "lc_library.h"
|
||||||
#include "lc_application.h"
|
#include "lc_application.h"
|
||||||
#include "lc_context.h"
|
#include "lc_context.h"
|
||||||
|
|
|
@ -1,15 +1,12 @@
|
||||||
#include "lc_global.h"
|
#include "lc_global.h"
|
||||||
#include "lc_mesh.h"
|
#include "lc_mesh.h"
|
||||||
#include "lc_colors.h"
|
#include "lc_colors.h"
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "pieceinf.h"
|
#include "pieceinf.h"
|
||||||
#include "piece.h"
|
#include "piece.h"
|
||||||
#include "group.h"
|
#include "group.h"
|
||||||
#include "project.h"
|
|
||||||
#include "lc_model.h"
|
|
||||||
#include "lc_file.h"
|
#include "lc_file.h"
|
||||||
#include "lc_application.h"
|
#include "lc_application.h"
|
||||||
#include "lc_library.h"
|
#include "lc_library.h"
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
#include "lc_model.h"
|
#include "lc_model.h"
|
||||||
#include "lc_context.h"
|
#include "lc_context.h"
|
||||||
#include "lc_synth.h"
|
#include "lc_synth.h"
|
||||||
#include "camera.h"
|
#include "lc_file.h"
|
||||||
#include <locale.h>
|
#include <locale.h>
|
||||||
|
|
||||||
PieceInfo::PieceInfo()
|
PieceInfo::PieceInfo()
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include "lc_math.h"
|
#include "lc_math.h"
|
||||||
#include "lc_array.h"
|
#include "lc_array.h"
|
||||||
#include "lc_mesh.h"
|
|
||||||
|
|
||||||
#define LC_PIECE_HAS_DEFAULT 0x01 // Piece has triangles using the default color
|
#define LC_PIECE_HAS_DEFAULT 0x01 // Piece has triangles using the default color
|
||||||
#define LC_PIECE_HAS_SOLID 0x02 // Piece has triangles using a solid color
|
#define LC_PIECE_HAS_SOLID 0x02 // Piece has triangles using a solid color
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
#include "project.h"
|
#include "project.h"
|
||||||
#include "lc_model.h"
|
#include "lc_model.h"
|
||||||
#include "pieceinf.h"
|
#include "pieceinf.h"
|
||||||
#include "system.h"
|
|
||||||
#include "lc_application.h"
|
#include "lc_application.h"
|
||||||
#include "lc_mainwindow.h"
|
#include "lc_mainwindow.h"
|
||||||
#include "lc_library.h"
|
#include "lc_library.h"
|
||||||
|
|
|
@ -3,11 +3,7 @@
|
||||||
#include "lc_mesh.h"
|
#include "lc_mesh.h"
|
||||||
#include <locale.h>
|
#include <locale.h>
|
||||||
#include "pieceinf.h"
|
#include "pieceinf.h"
|
||||||
#include "lc_texture.h"
|
|
||||||
#include "piece.h"
|
|
||||||
#include "camera.h"
|
#include "camera.h"
|
||||||
#include "light.h"
|
|
||||||
#include "group.h"
|
|
||||||
#include "project.h"
|
#include "project.h"
|
||||||
#include "image.h"
|
#include "image.h"
|
||||||
#include "lc_mainwindow.h"
|
#include "lc_mainwindow.h"
|
||||||
|
@ -15,6 +11,7 @@
|
||||||
#include "lc_library.h"
|
#include "lc_library.h"
|
||||||
#include "lc_application.h"
|
#include "lc_application.h"
|
||||||
#include "lc_profile.h"
|
#include "lc_profile.h"
|
||||||
|
#include "lc_file.h"
|
||||||
#include "preview.h"
|
#include "preview.h"
|
||||||
#include "lc_qmodellistdialog.h"
|
#include "lc_qmodellistdialog.h"
|
||||||
|
|
||||||
|
|
|
@ -26,10 +26,6 @@ enum LC_MOUSE_TRACK
|
||||||
LC_TRACK_RIGHT
|
LC_TRACK_RIGHT
|
||||||
};
|
};
|
||||||
|
|
||||||
class PieceInfo;
|
|
||||||
class View;
|
|
||||||
class Image;
|
|
||||||
|
|
||||||
class Project
|
class Project
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -1,12 +1,10 @@
|
||||||
#include "lc_global.h"
|
#include "lc_global.h"
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "lc_mainwindow.h"
|
#include "lc_mainwindow.h"
|
||||||
#include "project.h"
|
|
||||||
#include "camera.h"
|
#include "camera.h"
|
||||||
#include "view.h"
|
#include "view.h"
|
||||||
#include "system.h"
|
#include "system.h"
|
||||||
#include "tr.h"
|
#include "tr.h"
|
||||||
#include "lc_mesh.h"
|
|
||||||
#include "texfont.h"
|
#include "texfont.h"
|
||||||
#include "lc_texture.h"
|
#include "lc_texture.h"
|
||||||
#include "preview.h"
|
#include "preview.h"
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
#define _VIEW_H_
|
#define _VIEW_H_
|
||||||
|
|
||||||
#include "lc_glwidget.h"
|
#include "lc_glwidget.h"
|
||||||
#include "lc_model.h"
|
|
||||||
#include "camera.h"
|
#include "camera.h"
|
||||||
|
|
||||||
enum lcTrackButton
|
enum lcTrackButton
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
#include "lc_application.h"
|
#include "lc_application.h"
|
||||||
#include "lc_qupdatedialog.h"
|
#include "lc_qupdatedialog.h"
|
||||||
#include "lc_mainwindow.h"
|
#include "lc_mainwindow.h"
|
||||||
#include "view.h"
|
|
||||||
#include "project.h"
|
#include "project.h"
|
||||||
#include "lc_colors.h"
|
#include "lc_colors.h"
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
|
|
Loading…
Reference in a new issue