Skip to content

Commit

Permalink
Update clone scripts to support libClang 18
Browse files Browse the repository at this point in the history 
It's the default library in Ubuntu 24.04 LTS
  • Loading branch information
@darksylinc
darksylinc committed Dec 29, 2024
1 parent dacf494 commit 57ac34f
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 31 deletions.
14 changes: 7 additions & 7 deletions OgreMain/src/OgreParticleSystem.autogen.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ void ParticleSystem::_cloneFrom( const ParticleSystem *_original )
this->mBoundsAutoUpdate = original->mBoundsAutoUpdate;
this->mBoundsUpdateTime = original->mBoundsUpdateTime;
this->mUpdateRemainTime = original->mUpdateRemainTime;
this->mResourceGroupName = original->mResourceGroupName;
this->mMaterialName = original->mMaterialName;
this->mIsRendererConfigured = original->mIsRendererConfigured;
this->mMaterial = original->mMaterial;
this->mDefaultWidth = original->mDefaultWidth;
this->mDefaultHeight = original->mDefaultHeight;
this->mSpeedFactor = original->mSpeedFactor;
Expand All @@ -31,13 +34,6 @@ void ParticleSystem::_cloneFrom( const ParticleSystem *_original )
this->mParticleEmitterRootNode = original->mParticleEmitterRootNode;
this->mTranslateParticleDirectionIntoWorldSpace =
original->mTranslateParticleDirectionIntoWorldSpace;
this->mRenderer = original->mRenderer;
this->mCullIndividual = original->mCullIndividual;
this->mPoolSize = original->mPoolSize;
this->mEmittedEmitterPoolSize = original->mEmittedEmitterPoolSize;
this->mResourceGroupName = original->mResourceGroupName;
this->mMaterialName = original->mMaterialName;
this->mMaterial = original->mMaterial;
this->mActiveParticles = original->mActiveParticles;
this->mFreeParticles = original->mFreeParticles;
this->mParticlePool = original->mParticlePool;
Expand All @@ -46,6 +42,10 @@ void ParticleSystem::_cloneFrom( const ParticleSystem *_original )
this->mActiveEmittedEmitters = original->mActiveEmittedEmitters;
this->mEmitters = original->mEmitters;
this->mAffectors = original->mAffectors;
this->mRenderer = original->mRenderer;
this->mCullIndividual = original->mCullIndividual;
this->mRendererType = original->mRendererType;
this->mPoolSize = original->mPoolSize;
this->mEmittedEmitterPoolSize = original->mEmittedEmitterPoolSize;
this->mOrigin = original->mOrigin;
}
16 changes: 8 additions & 8 deletions OgreMain/src/ParticleSystem/OgreEmitter2Clone.autogen.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,19 @@ void EmitterDefData::_cloneFrom( const EmitterDefData *_original )
const EmitterDefData *original = static_cast<const EmitterDefData *>( _original );
this->mDimensions = original->mDimensions;
this->mParent = original->mParent;
this->mPosition = original->mPosition;
this->mEmissionRate = original->mEmissionRate;
this->mDirection = original->mDirection;
this->mUp = original->mUp;
this->mUseDirPositionRef = original->mUseDirPositionRef;
this->mDirPositionRef = original->mDirPositionRef;
this->mAngle = original->mAngle;
this->mMinSpeed = original->mMinSpeed;
this->mMaxSpeed = original->mMaxSpeed;
this->mMinTTL = original->mMinTTL;
this->mMaxTTL = original->mMaxTTL;
this->mColourRangeStart = original->mColourRangeStart;
this->mColourRangeEnd = original->mColourRangeEnd;
this->mEnabled = original->mEnabled;
this->mStartTime = original->mStartTime;
this->mDurationMin = original->mDurationMin;
Expand All @@ -22,14 +29,7 @@ void EmitterDefData::_cloneFrom( const EmitterDefData *_original )
this->mRepeatDelayMax = original->mRepeatDelayMax;
this->mRepeatDelayRemain = original->mRepeatDelayRemain;
this->mRemainder = original->mRemainder;
this->mEmitted = original->mEmitted;
this->mPosition = original->mPosition;
this->mDirection = original->mDirection;
this->mUp = original->mUp;
this->mDirPositionRef = original->mDirPositionRef;
this->mAngle = original->mAngle;
this->mColourRangeStart = original->mColourRangeStart;
this->mColourRangeEnd = original->mColourRangeEnd;
this->mName = original->mName;
this->mEmittedEmitter = original->mEmittedEmitter;
this->mEmitted = original->mEmitted;
}
21 changes: 12 additions & 9 deletions Other/clone_datablock/clone_datablock.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,23 @@

import argparse
import clang.cindex
import io;
import os;
import io
import os
import sys
#import hashlib
# import hashlib

if not sys.platform.startswith("win32"):
from ctypes.util import find_library


def setup_clang(library):
if library == None:
# LibClang shared library default search paths
if sys.platform.startswith("win32"):
clang.cindex.Config.set_library_path("C:/Program Files/LLVM/bin")
else:
clang.cindex.Config.set_library_file( find_library('clang-10') )
#clang.cindex.Config.set_library_path("/usr/lib")
clang.cindex.Config.set_library_file(find_library('clang-18'))
# clang.cindex.Config.set_library_path("/usr/lib")
else:
clang.cindex.Config.set_library_file(library)

Expand All @@ -42,15 +43,16 @@ def parse_classdecl(cursor, classname, classmembers, baseclassname):
elif children.kind == clang.cindex.CursorKind.CXX_BASE_SPECIFIER:
base_class = children.get_definition()
for base_children in base_class.get_children():
if base_children.displayname == "cloneImpl(Ogre::HlmsDatablock *)":
baseclassname.append( base_class.spelling )
if base_children.displayname == "cloneImpl(Ogre::HlmsDatablock *)" \
or base_children.displayname == "cloneImpl(HlmsDatablock *)":
baseclassname.append(base_class.spelling)
break
except ValueError:
pass


def parse_fielddecl(cursor, classname, classmembers):
cursortype = cursor.type;
cursortype = cursor.type
if cursortype.kind == clang.cindex.TypeKind.TYPEDEF:
cursortype = cursortype.get_canonical()

Expand All @@ -63,7 +65,8 @@ def parse_fielddecl(cursor, classname, classmembers):
if cursortype.element_type.kind == clang.cindex.TypeKind.CONSTANTARRAY:
# Bidimensional C-style array
# @todo Add support for multidimensional C-style array
size = (cursortype.element_count, cursortype.element_type.element_count)
size = (cursortype.element_count,
cursortype.element_type.element_count)
else:
# C-style array
size = (cursortype.element_count, )
Expand Down
2 changes: 1 addition & 1 deletion Other/clone_datablock/clone_particle_affectors.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def setup_clang(library):
if sys.platform.startswith("win32"):
clang.cindex.Config.set_library_path("C:/Program Files/LLVM/bin")
else:
clang.cindex.Config.set_library_file(find_library('clang-10'))
clang.cindex.Config.set_library_file(find_library('clang-18'))
# clang.cindex.Config.set_library_path("/usr/lib")
else:
clang.cindex.Config.set_library_file(library)
Expand Down
2 changes: 1 addition & 1 deletion Other/clone_datablock/clone_particle_emitters.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def setup_clang(library):
if sys.platform.startswith("win32"):
clang.cindex.Config.set_library_path("C:/Program Files/LLVM/bin")
else:
clang.cindex.Config.set_library_file(find_library('clang-10'))
clang.cindex.Config.set_library_file(find_library('clang-18'))
# clang.cindex.Config.set_library_path("/usr/lib")
else:
clang.cindex.Config.set_library_file(library)
Expand Down
2 changes: 1 addition & 1 deletion Other/clone_datablock/clone_particle_systems2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def setup_clang(library):
if sys.platform.startswith("win32"):
clang.cindex.Config.set_library_path("C:/Program Files/LLVM/bin")
else:
clang.cindex.Config.set_library_file(find_library('clang-10'))
clang.cindex.Config.set_library_file(find_library('clang-18'))
# clang.cindex.Config.set_library_path("/usr/lib")
else:
clang.cindex.Config.set_library_file(library)
Expand Down
8 changes: 4 additions & 4 deletions PlugIns/ParticleFX2/src/OgreAllAffectorsClone.autogen.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ void ColourFaderAffector2FX2::_cloneFrom( const ParticleAffector2 *_original )
OGRE_ASSERT_HIGH( dynamic_cast<const ColourFaderAffector2FX2 *>( _original ) );

const ColourFaderAffector2FX2 *original = static_cast<const ColourFaderAffector2FX2 *>( _original );
this->mStateChangeVal = original->mStateChangeVal;
this->mColourAdj1 = original->mColourAdj1;
this->mColourAdj2 = original->mColourAdj2;
this->mMinColour = original->mMinColour;
this->mMaxColour = original->mMaxColour;
this->mStateChangeVal = original->mStateChangeVal;
}

//-----------------------------------------------------------------------------
Expand All @@ -44,8 +44,8 @@ void ColourImageAffector2::_cloneFrom( const ParticleAffector2 *_original )

const ColourImageAffector2 *original = static_cast<const ColourImageAffector2 *>( _original );
this->mColourData = original->mColourData;
this->mInitialized = original->mInitialized;
this->mColourImageName = original->mColourImageName;
this->mInitialized = original->mInitialized;
}

//-----------------------------------------------------------------------------
Expand All @@ -67,9 +67,9 @@ void DeflectorPlaneAffector2::_cloneFrom( const ParticleAffector2 *_original )
OGRE_ASSERT_HIGH( dynamic_cast<const DeflectorPlaneAffector2 *>( _original ) );

const DeflectorPlaneAffector2 *original = static_cast<const DeflectorPlaneAffector2 *>( _original );
this->mBounce = original->mBounce;
this->mPlanePoint = original->mPlanePoint;
this->mPlaneNormal = original->mPlaneNormal;
this->mBounce = original->mBounce;
}

//-----------------------------------------------------------------------------
Expand All @@ -90,8 +90,8 @@ void LinearForceAffector2::_cloneFrom( const ParticleAffector2 *_original )
OGRE_ASSERT_HIGH( dynamic_cast<const LinearForceAffector2 *>( _original ) );

const LinearForceAffector2 *original = static_cast<const LinearForceAffector2 *>( _original );
this->mForceApplication = original->mForceApplication;
this->mForceVector = original->mForceVector;
this->mForceApplication = original->mForceApplication;
}

//-----------------------------------------------------------------------------
Expand Down

0 comments on commit 57ac34f

Please sign in to comment.