Skip to content

Commit fcd3847

Browse files
Merge pull request #416 from FlyAndNotDown/master
Feat: Misc Update
2 parents 46dec77 + f3ec7ee commit fcd3847

27 files changed

Lines changed: 2050 additions & 167 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
uses: conan-io/setup-conan@v1
5656

5757
- name: Config Conan Remote
58-
run: conan remote add explosion https://kindem.online/artifactory/api/conan/conan
58+
run: conan remote add explosion https://conan.kindem.online/artifactory/api/conan/conan
5959

6060
- name: Configure CMake
6161
run: cmake -B ${{github.workspace}}/build -G=Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCI=ON

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ ThirdParty/Lib
1717
ThirdParty/ConanRecipes/**/src
1818
ThirdParty/ConanRecipes/**/build
1919
ThirdParty/ConanRecipes/**/CMakeUserPresets.json
20+
!ThirdParty/ConanRecipes/build_recipes.py
21+
aqtinstall.log
22+
23+
# Claude
24+
CLAUDE.md
2025

2126
# Test Project
2227
TestProject/.idea

Engine/Source/Mirror/Include/Mirror/Mirror.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ namespace Mirror {
563563

564564
template <typename... Args> Any Construct(Args&&... args) const;
565565
template <typename... Args> Any New(Args&&... args) const;
566-
template <typename... Args> Any InplaceNew(Args&&... args) const;
566+
template <typename... Args> Any InplaceNew(void* ptr, Args&&... args) const;
567567

568568
const std::string& GetOwnerName() const;
569569
const Id& GetOwnerId() const;
@@ -3600,9 +3600,9 @@ namespace Mirror {
36003600
}
36013601

36023602
template <typename ... Args>
3603-
Any Constructor::InplaceNew(Args&&... args) const
3603+
Any Constructor::InplaceNew(void* ptr, Args&&... args) const
36043604
{
3605-
return InplaceNewDyn(ForwardAsArgList(std::forward<Args>(args)...));
3605+
return InplaceNewDyn(ptr, ForwardAsArgList(std::forward<Args>(args)...));
36063606
}
36073607

36083608
template <typename C>
@@ -3710,7 +3710,7 @@ namespace Mirror {
37103710
template <Common::CppEnum E>
37113711
bool EnumValue::Compare(const E& value) const
37123712
{
3713-
return Compare(ForwardAsArg(value));
3713+
return CompareDyn(ForwardAsArg(value));
37143714
}
37153715

37163716
template <Common::CppEnum E>

Engine/Source/Mirror/Include/Mirror/Registry.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -660,6 +660,7 @@ namespace Mirror {
660660

661661
Enum::ConstructParams params;
662662
params.id = inId;
663+
params.typeInfo = GetTypeInfo<T>();
663664

664665
Enum::typeToIdMap[typeId] = inId;
665666
return EnumRegistry<T>(EmplaceEnum(inId, std::move(params)));

Engine/Source/Mirror/Src/Mirror.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ namespace Mirror {
339339
Assert(!Empty() && !inOther.Empty() && arrayLength == inOther.arrayLength && rtti == inOther.rtti);
340340

341341
for (auto i = 0; i < ElementNum(); i++) {
342-
rtti->copyAssign(Data(i), inOther.Data(i));
342+
rtti->moveAssign(Data(i), inOther.Data(i));
343343
}
344344
}
345345

@@ -2224,7 +2224,7 @@ namespace Mirror {
22242224

22252225
void StdListView::ConstTraverse(const ElementTraverser& inTraverser) const
22262226
{
2227-
rtti->traverse(ref, inTraverser);
2227+
rtti->constTraverse(ref, inTraverser);
22282228
}
22292229

22302230
Any StdListView::EmplaceFront(const Argument& inTempObj) const
@@ -2555,16 +2555,18 @@ namespace Mirror {
25552555
StdVariantView::StdVariantView(const Any& inRef)
25562556
: ref(inRef)
25572557
{
2558+
Assert(ref.IsRef() && ref.CanAsTemplateView<StdVariantView>());
2559+
rtti = static_cast<const StdVariantRtti*>(ref.GetTemplateViewRtti());
25582560
}
25592561

25602562
size_t StdVariantView::TypeNum() const
25612563
{
2562-
return rtti->TypeNum();
2564+
return rtti->typeNum();
25632565
}
25642566

25652567
const TypeInfo* StdVariantView::TypeByIndex(size_t inIndex) const
25662568
{
2567-
return rtti->TypeByIndex(inIndex);
2569+
return rtti->typeByIndex(inIndex);
25682570
}
25692571

25702572
Any StdVariantView::CreateElement(size_t inIndex) const

0 commit comments

Comments
 (0)