Skip to content

Commit 059aae9

Browse files
malytomasmalytomas
committed
renames in assets manager and entities
1 parent 8726cb3 commit 059aae9

Some content is hidden

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

47 files changed

+331
-329
lines changed

‎sources/include/cage-core/assetContext.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,27 @@ namespace cage
1111

1212
struct CAGE_CORE_API AssetContext : private Immovable
1313
{
14-
detail::StringBase<64> textName;
14+
detail::StringBase<64> textId;
1515
Holder<void> customData;
1616
Holder<PointerRange<uint32>> dependencies;
1717
Holder<PointerRange<char>> compressedData;
1818
Holder<PointerRange<char>> originalData;
1919
Holder<void> assetHolder;
20-
const uint32 realName = 0;
20+
const uint32 assetId = 0;
2121
uint32 scheme = m;
2222

23-
AssetContext(uint32 realName) : realName(realName) {}
23+
AssetContext(uint32 assetId) : assetId(assetId) {}
2424
};
2525

26-
struct CAGE_CORE_API AssetScheme
26+
struct CAGE_CORE_API AssetsScheme
2727
{
2828
AssetDelegate fetch;
2929
AssetDelegate decompress;
3030
AssetDelegate load;
3131
uint32 threadIndex = m;
3232
uint32 typeHash = m;
3333

34-
AssetScheme();
34+
AssetsScheme();
3535
};
3636
}
3737

‎sources/include/cage-core/assetHeader.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ namespace cage
1212
char cageName[8] = "cageAss";
1313
uint32 version = 0;
1414
uint32 flags = 0;
15-
char textName[64] = {};
15+
char textId[64] = {};
1616
uint64 compressedSize = 0;
1717
uint64 originalSize = 0;
1818
uint32 unused_ = 0;
1919
uint16 scheme = m;
2020
uint16 dependenciesCount = 0;
2121

2222
AssetHeader() = default;
23-
explicit AssetHeader(const String &name, uint16 schemeIndex);
23+
explicit AssetHeader(const String &textId, uint16 schemeIndex);
2424

2525
// follows:
2626
// array of dependency names, each uint32

‎sources/include/cage-core/assetManager.h‎ renamed to ‎sources/include/cage-core/assetsManager.h‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,43 +8,43 @@ namespace cage
88
{
99
class File;
1010

11-
class CAGE_CORE_API AssetManager : private Immovable
11+
class CAGE_CORE_API AssetsManager : private Immovable
1212
{
1313
public:
1414
template<uint32 Scheme, class T>
15-
void defineScheme(const AssetScheme &value)
15+
void defineScheme(const AssetsScheme &value)
1616
{
1717
defineScheme_(detail::typeHash<T>(), Scheme, value);
1818
}
1919

2020
// begin thread-safe methods
2121

22-
void load(uint32 assetName);
23-
void unload(uint32 assetName);
24-
void reload(uint32 assetName);
22+
void load(uint32 assetId);
23+
void unload(uint32 assetId);
24+
void reload(uint32 assetId);
2525

26-
uint32 generateUniqueName();
26+
uint32 generateUniqueId();
2727

2828
template<uint32 Scheme, class T>
29-
void loadValue(uint32 assetName, Holder<T> &&value, const String &textId = "")
29+
void loadValue(uint32 assetId, Holder<T> &&value, const String &textId = "")
3030
{
3131
CAGE_ASSERT(detail::typeHash<T>() == schemeTypeHash_(Scheme))
32-
load_(Scheme, assetName, textId, std::move(value).template cast<void>());
32+
load_(Scheme, assetId, textId, std::move(value).template cast<void>());
3333
}
3434

3535
template<uint32 Scheme, class T>
36-
void loadCustom(uint32 assetName, const AssetScheme &customScheme, Holder<void> &&customData, const String &textId = "")
36+
void loadCustom(uint32 assetId, const AssetsScheme &customScheme, Holder<void> &&customData, const String &textId = "")
3737
{
3838
CAGE_ASSERT(detail::typeHash<T>() == schemeTypeHash_(Scheme))
39-
load_(Scheme, assetName, textId, customScheme, std::move(customData));
39+
load_(Scheme, assetId, textId, customScheme, std::move(customData));
4040
}
4141

4242
// returns null if the asset is not yet loaded, failed to load, or has different scheme
4343
template<uint32 Scheme, class T>
44-
Holder<T> get(uint32 assetName) const
44+
Holder<T> get(uint32 assetId) const
4545
{
4646
CAGE_ASSERT(detail::typeHash<T>() == schemeTypeHash_(Scheme))
47-
return get_(Scheme, assetName).template cast<T>();
47+
return get_(Scheme, assetId).template cast<T>();
4848
}
4949

5050
// end thread-safe methods
@@ -56,15 +56,15 @@ namespace cage
5656
bool processing() const;
5757
bool empty() const;
5858

59-
EventDispatcher<bool(uint32 requestName, String &foundName, Holder<File> &foundFile)> findAsset; // this event is called from loading threads
59+
EventDispatcher<bool(uint32 requestId, String &foundName, Holder<File> &foundFile)> findAsset; // this event is called from loading threads
6060

6161
private:
62-
void defineScheme_(uint32 typeHash, uint32 scheme, const AssetScheme &value);
63-
void load_(uint32 scheme, uint32 assetName, const String &textId, Holder<void> &&value);
64-
void load_(uint32 scheme, uint32 assetName, const String &textId, const AssetScheme &customScheme, Holder<void> &&customData);
65-
Holder<void> get_(uint32 scheme, uint32 assetName) const;
62+
void defineScheme_(uint32 typeHash, uint32 scheme, const AssetsScheme &value);
63+
void load_(uint32 scheme, uint32 assetId, const String &textId, Holder<void> &&value);
64+
void load_(uint32 scheme, uint32 assetId, const String &textId, const AssetsScheme &customScheme, Holder<void> &&customData);
65+
Holder<void> get_(uint32 scheme, uint32 assetId) const;
6666
uint32 schemeTypeHash_(uint32 scheme) const;
67-
friend class AssetOnDemand;
67+
friend class AssetsOnDemand;
6868
};
6969

7070
struct CAGE_CORE_API AssetManagerCreateConfig
@@ -75,14 +75,14 @@ namespace cage
7575
uint32 schemesMaxCount = 100; // 0..49 for engine and 50..99 for the game
7676
};
7777

78-
CAGE_CORE_API Holder<AssetManager> newAssetManager(const AssetManagerCreateConfig &config);
78+
CAGE_CORE_API Holder<AssetsManager> newAssetsManager(const AssetManagerCreateConfig &config);
7979

8080
struct CAGE_CORE_API AssetPack
8181
{};
82-
CAGE_CORE_API AssetScheme genAssetSchemePack();
82+
CAGE_CORE_API AssetsScheme genAssetSchemePack();
8383
constexpr uint32 AssetSchemeIndexPack = 0;
8484

85-
CAGE_CORE_API AssetScheme genAssetSchemeRaw();
85+
CAGE_CORE_API AssetsScheme genAssetSchemeRaw();
8686
constexpr uint32 AssetSchemeIndexRaw = 1;
8787
}
8888

‎sources/include/cage-core/assetOnDemand.h‎ renamed to ‎sources/include/cage-core/assetsOnDemand.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55

66
namespace cage
77
{
8-
class AssetManager;
8+
class AssetsManager;
99

10-
class CAGE_CORE_API AssetOnDemand : private Immovable
10+
class CAGE_CORE_API AssetsOnDemand : private Immovable
1111
{
1212
public:
1313
// begin thread-safe methods
1414

1515
// returns null if the asset is not yet loaded or has different scheme
1616
template<uint32 Scheme, class T>
17-
Holder<T> get(uint32 assetName, bool autoLoad = true)
17+
Holder<T> get(uint32 assetId, bool autoLoad = true)
1818
{
1919
CAGE_ASSERT(detail::typeHash<T>() == schemeTypeHash_(Scheme))
20-
return get_(Scheme, assetName, autoLoad).template cast<T>();
20+
return get_(Scheme, assetId, autoLoad).template cast<T>();
2121
}
2222

2323
void process();
@@ -26,11 +26,11 @@ namespace cage
2626
// end thread-safe methods
2727

2828
private:
29-
Holder<void> get_(uint32 scheme, uint32 assetName, bool autoLoad);
29+
Holder<void> get_(uint32 scheme, uint32 assetId, bool autoLoad);
3030
uint32 schemeTypeHash_(uint32 scheme) const;
3131
};
3232

33-
CAGE_CORE_API Holder<AssetOnDemand> newAssetOnDemand(AssetManager *assets);
33+
CAGE_CORE_API Holder<AssetsOnDemand> newAssetsOnDemand(AssetsManager *assets);
3434
}
3535

3636
#endif // guard_assetsOnDemand_h_wesdxfc74j

‎sources/include/cage-core/collider.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ namespace cage
9191
CAGE_CORE_API Vec3 intersection(Line shape, const Collider *collider, Transform t);
9292
CAGE_CORE_API Vec3 intersection(Line shape, const Collider *collider, Transform t, uint32 &triangleIndex);
9393

94-
CAGE_CORE_API AssetScheme genAssetSchemeCollider();
94+
CAGE_CORE_API AssetsScheme genAssetSchemeCollider();
9595
constexpr uint32 AssetSchemeIndexCollider = 3;
9696
}
9797

‎sources/include/cage-core/core.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ namespace cage
127127
struct Cone;
128128
struct Frustum;
129129

130-
class AssetManager;
131-
struct AssetScheme;
130+
class AssetsManager;
131+
struct AssetsScheme;
132132

133133
// Immovable
134134

‎sources/include/cage-core/entities.h‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@ namespace cage
3434
Holder<PointerRange<EntityComponent *>> components() const;
3535
uint32 componentsCount() const;
3636

37-
Entity *createUnique(); // new entity with unique name
38-
Entity *createAnonymous(); // new entity with name = 0, accessible only with the pointer
39-
Entity *create(uint32 name); // must be non-zero
40-
Entity *tryGet(uint32 entityName) const; // return nullptr if it does not exist
41-
Entity *get(uint32 entityName) const; // throw if it does not exist
42-
Entity *getOrCreate(uint32 entityName);
43-
bool has(uint32 entityName) const;
37+
Entity *createUnique(); // new entity with unique id
38+
Entity *createAnonymous(); // new entity with id = 0, accessible only with the pointer
39+
Entity *create(uint32 entityId); // must be non-zero
40+
Entity *tryGet(uint32 entityId) const; // return nullptr if it does not exist
41+
Entity *get(uint32 entityId) const; // throw if it does not exist
42+
Entity *getOrCreate(uint32 entityId);
43+
[[deprecated]] bool has(uint32 entityId) const { return exists(entityId); }
44+
bool exists(uint32 entityId) const;
4445
PointerRange<Entity *const> entities() const;
4546
CAGE_FORCE_INLINE uint32 count() const { return numeric_cast<uint32>(entities().size()); }
4647

@@ -75,7 +76,8 @@ namespace cage
7576
{
7677
public:
7778
EntityManager *manager() const;
78-
uint32 name() const;
79+
[[deprecated]] uint32 name() const { return id(); }
80+
uint32 id() const;
7981

8082
CAGE_FORCE_INLINE void add(EntityComponent *component) { unsafeValue(component); }
8183
template<ComponentConcept T>
@@ -107,7 +109,6 @@ namespace cage
107109
template<ComponentConcept T>
108110
CAGE_FORCE_INLINE T &value(EntityComponent *component)
109111
{
110-
CAGE_ASSERT(component->manager() == manager());
111112
CAGE_ASSERT(component->typeIndex() == detail::typeIndex<T>());
112113
return *(T *)unsafeValue(component);
113114
}

‎sources/include/cage-core/skeletalAnimation.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace cage
3333

3434
CAGE_CORE_API Holder<SkeletalAnimation> newSkeletalAnimation();
3535

36-
CAGE_CORE_API AssetScheme genAssetSchemeSkeletalAnimation();
36+
CAGE_CORE_API AssetsScheme genAssetSchemeSkeletalAnimation();
3737
constexpr uint32 AssetSchemeIndexSkeletalAnimation = 6;
3838

3939
class CAGE_CORE_API SkeletonRig : private Immovable
@@ -58,7 +58,7 @@ namespace cage
5858

5959
CAGE_CORE_API Holder<SkeletonRig> newSkeletonRig();
6060

61-
CAGE_CORE_API AssetScheme genAssetSchemeSkeletonRig();
61+
CAGE_CORE_API AssetsScheme genAssetSchemeSkeletonRig();
6262
constexpr uint32 AssetSchemeIndexSkeletonRig = 5;
6363

6464
CAGE_CORE_API void animateSkin(const SkeletonRig *skeleton, const SkeletalAnimation *animation, Real coef, PointerRange<Mat4> output); // provides transformation matrices for skinning meshes

‎sources/include/cage-core/skeletalAnimationPreparator.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace cage
2121
void clear(); // thread safe
2222
};
2323

24-
CAGE_CORE_API Holder<SkeletalAnimationPreparatorCollection> newSkeletalAnimationPreparatorCollection(AssetManager *assets);
24+
CAGE_CORE_API Holder<SkeletalAnimationPreparatorCollection> newSkeletalAnimationPreparatorCollection(AssetsManager *assets);
2525
}
2626

2727
#endif

‎sources/include/cage-core/texts.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace cage
2929

3030
CAGE_CORE_API Holder<Texts> newTexts();
3131

32-
CAGE_CORE_API AssetScheme genAssetSchemeTexts();
32+
CAGE_CORE_API AssetsScheme genAssetSchemeTexts();
3333
constexpr uint32 AssetSchemeIndexTexts = 2;
3434

3535
CAGE_CORE_API void textsSetLanguages(PointerRange<const LanguageCode> languages);

0 commit comments

Comments
 (0)