Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 7 additions & 15 deletions config.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#ifndef COMMON_H
#define COMMON_H
#ifndef CONFIG_H
#define CONFIG_H

#include <QDir>
#include <QFontMetrics>
#include <QString>

const QString gContent("content");
const QString gCache("cache");
Expand Down Expand Up @@ -39,16 +38,9 @@ const QString gStatic(".a");
const QString gPrefix("lib");
const QString gApplication("");
#endif
static const QString gMimeContent("text/content");
static const QString gMimeObject("text/object");
static const QString gMimeComponent("text/component");
const QString gMimeContent("text/content");
const QString gMimeObject("text/object");
const QString gMimeComponent("text/component");

const QString gDefaultFont("Helvetica Neue");

const int gFontSize = 12;

const QFont gFont(gDefaultFont, gFontSize);
const QFontMetrics gMetrics(gFont);

#endif // COMMON_H
#endif // CONFIG_H

33 changes: 14 additions & 19 deletions engine/includes/editor/assetmanager.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,17 @@

#include <systems/resourcesystem.h>

class QFileSystemWatcher;
class QAbstractItemModel;

class ProjectSettings;

class CodeBuilder;

class BaseAssetProvider;

class ENGINE_EXPORT AssetManager : public QObject {
Q_OBJECT

public:
typedef QMap<QString, AssetConverter *> ConverterMap;
typedef QMap<QString, QAbstractItemModel *> ClassMap;
typedef QMap<QString, AssetConverterSettings *> SettingsMap;

public:
Expand Down Expand Up @@ -70,7 +68,8 @@ class ENGINE_EXPORT AssetManager : public QObject {

AssetConverter *getConverter(const QString &source);

ConverterMap converters() const;
QStringList templates() const;

QList<CodeBuilder *> builders() const;

bool pushToImport(AssetConverterSettings *settings);
Expand Down Expand Up @@ -101,43 +100,39 @@ public slots:
protected slots:
void onPerform();

void onFileChanged(const QString &path, bool force = false);

void onDirectoryChanged(const QString &path, bool force = false);

private:
AssetManager();
~AssetManager();

static AssetManager *m_instance;

protected:
friend class BaseAssetProvider;

ConverterMap m_converters;

ResourceSystem::DictionaryMap &m_indices;
QList<CodeBuilder *> m_builders;

SettingsMap m_converterSettings;

VariantMap m_paths;
QSet<QString> m_labels;

QFileSystemWatcher *m_dirWatcher;
QFileSystemWatcher *m_fileWatcher;

QList<AssetConverterSettings *> m_importQueue;

ProjectSettings *m_projectManager;
QHash<QString, QImage> m_defaultIcons;

QTimer *m_timer;
BaseAssetProvider *m_assetProvider;

QList<CodeBuilder *> m_builders;
ResourceSystem::DictionaryMap &m_indices;

SettingsMap m_converterSettings;
ProjectSettings *m_projectManager;

QHash<QString, QImage> m_defaultIcons;
QTimer *m_timer;

bool m_noIcons;

protected:
void cleanupBundle();
void dumpBundle();

void convert(AssetConverterSettings *settings);
Expand Down
37 changes: 37 additions & 0 deletions engine/includes/editor/baseassetprovider.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#ifndef BASEASSETPROVIDER_H
#define BASEASSETPROVIDER_H

#include <QObject>

#include <engine.h>

class QFileSystemWatcher;

class ENGINE_EXPORT BaseAssetProvider : public QObject {
public:
BaseAssetProvider();

~BaseAssetProvider();

void init();

void renameResource(const QString &source, const QString &destination);
void removeResource(const QString &source);
void duplicateResource(const QString &source);

void cleanupBundle();

protected:
bool copyRecursively(const QString &sourceFolder, const QString &destFolder);

public slots:
void onFileChanged(const QString &path, bool force = false);

void onDirectoryChanged(const QString &path, bool force = false);

private:
QFileSystemWatcher *m_dirWatcher;
QFileSystemWatcher *m_fileWatcher;
};

#endif // BASEASSETPROVIDER_H
Loading
Loading