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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
uses: conan-io/setup-conan@v1

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

- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -G=Ninja -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCI=ON
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ ThirdParty/Lib
ThirdParty/ConanRecipes/**/src
ThirdParty/ConanRecipes/**/build
ThirdParty/ConanRecipes/**/CMakeUserPresets.json
!ThirdParty/ConanRecipes/build_recipes.py
aqtinstall.log

# Claude
CLAUDE.md

# Test Project
TestProject/.idea
Expand Down
8 changes: 4 additions & 4 deletions Engine/Source/Mirror/Include/Mirror/Mirror.h
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ namespace Mirror {

template <typename... Args> Any Construct(Args&&... args) const;
template <typename... Args> Any New(Args&&... args) const;
template <typename... Args> Any InplaceNew(Args&&... args) const;
template <typename... Args> Any InplaceNew(void* ptr, Args&&... args) const;

const std::string& GetOwnerName() const;
const Id& GetOwnerId() const;
Expand Down Expand Up @@ -3600,9 +3600,9 @@ namespace Mirror {
}

template <typename ... Args>
Any Constructor::InplaceNew(Args&&... args) const
Any Constructor::InplaceNew(void* ptr, Args&&... args) const
{
return InplaceNewDyn(ForwardAsArgList(std::forward<Args>(args)...));
return InplaceNewDyn(ptr, ForwardAsArgList(std::forward<Args>(args)...));
}

template <typename C>
Expand Down Expand Up @@ -3710,7 +3710,7 @@ namespace Mirror {
template <Common::CppEnum E>
bool EnumValue::Compare(const E& value) const
{
return Compare(ForwardAsArg(value));
return CompareDyn(ForwardAsArg(value));
}

template <Common::CppEnum E>
Expand Down
1 change: 1 addition & 0 deletions Engine/Source/Mirror/Include/Mirror/Registry.h
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,7 @@ namespace Mirror {

Enum::ConstructParams params;
params.id = inId;
params.typeInfo = GetTypeInfo<T>();

Enum::typeToIdMap[typeId] = inId;
return EnumRegistry<T>(EmplaceEnum(inId, std::move(params)));
Expand Down
10 changes: 6 additions & 4 deletions Engine/Source/Mirror/Src/Mirror.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ namespace Mirror {
Assert(!Empty() && !inOther.Empty() && arrayLength == inOther.arrayLength && rtti == inOther.rtti);

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

Expand Down Expand Up @@ -2224,7 +2224,7 @@ namespace Mirror {

void StdListView::ConstTraverse(const ElementTraverser& inTraverser) const
{
rtti->traverse(ref, inTraverser);
rtti->constTraverse(ref, inTraverser);
}

Any StdListView::EmplaceFront(const Argument& inTempObj) const
Expand Down Expand Up @@ -2555,16 +2555,18 @@ namespace Mirror {
StdVariantView::StdVariantView(const Any& inRef)
: ref(inRef)
{
Assert(ref.IsRef() && ref.CanAsTemplateView<StdVariantView>());
rtti = static_cast<const StdVariantRtti*>(ref.GetTemplateViewRtti());
}

size_t StdVariantView::TypeNum() const
{
return rtti->TypeNum();
return rtti->typeNum();
}

const TypeInfo* StdVariantView::TypeByIndex(size_t inIndex) const
{
return rtti->TypeByIndex(inIndex);
return rtti->typeByIndex(inIndex);
}

Any StdVariantView::CreateElement(size_t inIndex) const
Expand Down
Loading
Loading