Skip to content

Commit

Permalink
Update to 4.3 (#560)
Browse files Browse the repository at this point in the history
* Add initial support for 4.3, based on b9e022302aa4a5d97f8b25a1db809e64b46b6f96

* Remove warning

* Update 4.3 branch with new changes, couple of new data types in the class system, and a new built-in variant for Vector4

* Add two new 4.3 methods

* Update API to June 28, 2024 Godot: e052a53bb6a810ca5c01b037fc8993a52bd4e338

* Fix the 4.3 build after the last API bump

* Compatibility

* Xcode is not very clever, it tries to build the generator for iOS

* Until we get a new libgodot, make this non-fatal

* Bring a new libgodot-4.3

* Undo workaround

* Godot 4.3 replaced the Clipper library, these changes mimic the upstream changes: 8a28f816d011d86a2f7cbbe6aaa97ac616f7596a
  • Loading branch information
migueldeicaza authored Oct 5, 2024
1 parent e29f317 commit 5f114bb
Show file tree
Hide file tree
Showing 16 changed files with 47,543 additions and 25,465 deletions.
3 changes: 2 additions & 1 deletion Generator/Generator/TypeHelpers.swift
Original file line number Diff line number Diff line change
Expand Up @@ -436,9 +436,10 @@ func builtinTypecode (_ name: String) -> String {
case "PackedStringArray": return "GDEXTENSION_VARIANT_TYPE_PACKED_STRING_ARRAY"
case "PackedVector2Array": return "GDEXTENSION_VARIANT_TYPE_PACKED_VECTOR2_ARRAY"
case "PackedVector3Array": return "GDEXTENSION_VARIANT_TYPE_PACKED_VECTOR3_ARRAY"
case "PackedVector4Array": return "GDEXTENSION_VARIANT_TYPE_PACKED_VECTOR4_ARRAY"
case "PackedColorArray": return "GDEXTENSION_VARIANT_TYPE_PACKED_COLOR_ARRAY"
default:
fatalError()
fatalError("Missing handler for \(name)")
}
}

4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ targets.append(
#if true
let libgodot_tests = Target.binaryTarget(
name: "libgodot_tests",
url: "https://github.com/migueldeicaza/SwiftGodotKit/releases/download/v4.1.99/libgodot.xcframework.zip",
checksum: "c8ddf62be6c00eacc36bd2dafe8d424c0b374833efe80546f6ee76bd27cee84e"
url: "https://github.com/migueldeicaza/SwiftGodotKit/releases/download/4.3.4/libgodot.xcframework.zip",
checksum: "865ea17ad3e20caab05b3beda35061f57143c4acf0e4ad2684ddafdcc6c4f199"
)
#else
let libgodot_tests = Target .binaryTarget(
Expand Down
52 changes: 49 additions & 3 deletions Plugins/CodeGeneratorPlugin/plugin.swift
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ let knownBuiltin = [
"PackedStringArray.swift",
"PackedVector2Array.swift",
"PackedVector3Array.swift",
"PackedVector4Array.swift",
"Plane.swift",
"Projection.swift",
"Quaternion.swift",
Expand Down Expand Up @@ -147,6 +148,7 @@ let known = [
"AudioEffectEQ21.swift",
"AudioEffectEQ6.swift",
"AudioEffectFilter.swift",
"AudioEffectHardLimiter.swift",
"AudioEffectHighPassFilter.swift",
"AudioEffectHighShelfFilter.swift",
"AudioEffectInstance.swift",
Expand All @@ -164,22 +166,30 @@ let known = [
"AudioEffectStereoEnhance.swift",
"AudioListener2D.swift",
"AudioListener3D.swift",
"AudioSample.swift",
"AudioSamplePlayback.swift",
"AudioServer.swift",
"AudioStream.swift",
"AudioStreamGenerator.swift",
"AudioStreamGeneratorPlayback.swift",
"AudioStreamInteractive.swift",
"AudioStreamMP3.swift",
"AudioStreamMicrophone.swift",
"AudioStreamOggVorbis.swift",
"AudioStreamPlayback.swift",
"AudioStreamPlaybackInteractive.swift",
"AudioStreamPlaybackOggVorbis.swift",
"AudioStreamPlaybackPlaylist.swift",
"AudioStreamPlaybackPolyphonic.swift",
"AudioStreamPlaybackResampled.swift",
"AudioStreamPlaybackSynchronized.swift",
"AudioStreamPlayer.swift",
"AudioStreamPlayer2D.swift",
"AudioStreamPlayer3D.swift",
"AudioStreamPlaylist.swift",
"AudioStreamPolyphonic.swift",
"AudioStreamRandomizer.swift",
"AudioStreamSynchronized.swift",
"AudioStreamWAV.swift",
"BackBufferCopy.swift",
"BaseButton.swift",
Expand Down Expand Up @@ -242,6 +252,8 @@ let known = [
"ColorPicker.swift",
"ColorPickerButton.swift",
"ColorRect.swift",
"Compositor.swift",
"CompositorEffect.swift",
"CompressedCubemap.swift",
"CompressedCubemapArray.swift",
"CompressedTexture2D.swift",
Expand Down Expand Up @@ -311,8 +323,9 @@ let known = [
"EditorResourceTooltipPlugin.swift",
"EditorSceneFormatImporter.swift",
"EditorSceneFormatImporterBlend.swift",
"EditorSceneFormatImporterFBX.swift",
"EditorSceneFormatImporterFBX2GLTF.swift",
"EditorSceneFormatImporterGLTF.swift",
"EditorSceneFormatImporterUFBX.swift",
"EditorScenePostImport.swift",
"EditorScenePostImportPlugin.swift",
"EditorScript.swift",
Expand All @@ -330,6 +343,8 @@ let known = [
"EngineProfiler.swift",
"Environment.swift",
"Expression.swift",
"FBXDocument.swift",
"FBXState.swift",
"FastNoiseLite.swift",
"FileAccess.swift",
"FileDialog.swift",
Expand All @@ -340,6 +355,7 @@ let known = [
"Font.swift",
"FontFile.swift",
"FontVariation.swift",
"FramebufferCacheRD.swift",
"GDExtension.swift",
"GDExtensionManager.swift",
"GDScript.swift",
Expand Down Expand Up @@ -381,6 +397,7 @@ let known = [
"GradientTexture2D.swift",
"GraphEdit.swift",
"GraphElement.swift",
"GraphFrame.swift",
"GraphNode.swift",
"GridContainer.swift",
"GridMap.swift",
Expand Down Expand Up @@ -484,6 +501,7 @@ let known = [
"MultiplayerSpawner.swift",
"MultiplayerSynchronizer.swift",
"Mutex.swift",
"NativeMenu.swift",
"NavigationAgent2D.swift",
"NavigationAgent3D.swift",
"NavigationLink2D.swift",
Expand Down Expand Up @@ -525,6 +543,10 @@ let known = [
"OpenXRAction.swift",
"OpenXRActionMap.swift",
"OpenXRActionSet.swift",
"OpenXRCompositionLayer.swift",
"OpenXRCompositionLayerCylinder.swift",
"OpenXRCompositionLayerEquirect.swift",
"OpenXRCompositionLayerQuad.swift",
"OpenXRExtensionWrapperExtension.swift",
"OpenXRHand.swift",
"OpenXRIPBinding.swift",
Expand All @@ -545,6 +567,7 @@ let known = [
"Panel.swift",
"PanelContainer.swift",
"PanoramaSkyMaterial.swift",
"Parallax2D.swift",
"ParallaxBackground.swift",
"ParallaxLayer.swift",
"ParticleProcessMaterial.swift",
Expand All @@ -555,6 +578,7 @@ let known = [
"Performance.swift",
"PhysicalBone2D.swift",
"PhysicalBone3D.swift",
"PhysicalBoneSimulator3D.swift",
"PhysicalSkyMaterial.swift",
"PhysicsBody2D.swift",
"PhysicsBody3D.swift",
Expand Down Expand Up @@ -640,12 +664,18 @@ let known = [
"RegExMatch.swift",
"RemoteTransform2D.swift",
"RemoteTransform3D.swift",
"RenderingDevice.swift",
"RenderingServer.swift",
"RenderData.swift",
"RenderDataExtension.swift",
"RenderDataRD.swift",
"RenderSceneBuffers.swift",
"RenderSceneBuffersConfiguration.swift",
"RenderSceneBuffersExtension.swift",
"RenderSceneBuffersRD.swift",
"RenderSceneData.swift",
"RenderSceneDataExtension.swift",
"RenderSceneDataRD.swift",
"RenderingDevice.swift",
"RenderingServer.swift",
"Resource.swift",
"ResourceFormatLoader.swift",
"ResourceFormatSaver.swift",
Expand Down Expand Up @@ -715,6 +745,7 @@ let known = [
"SkeletonModification2DStackHolder.swift",
"SkeletonModification2DTwoBoneIK.swift",
"SkeletonModificationStack2D.swift",
"SkeletonModifier3D.swift",
"SkeletonProfile.swift",
"SkeletonProfileHumanoid.swift",
"Skin.swift",
Expand All @@ -737,6 +768,7 @@ let known = [
"StandardMaterial3D.swift",
"StaticBody2D.swift",
"StaticBody3D.swift",
"StatusIndicator.swift",
"StreamPeer.swift",
"StreamPeerBuffer.swift",
"StreamPeerExtension.swift",
Expand Down Expand Up @@ -785,6 +817,7 @@ let known = [
"Thread.swift",
"TileData.swift",
"TileMap.swift",
"TileMapLayer.swift",
"TileMapPattern.swift",
"TileSet.swift",
"TileSetAtlasSource.swift",
Expand All @@ -806,6 +839,7 @@ let known = [
"UPNP.swift",
"UPNPDevice.swift",
"UndoRedo.swift",
"UniformSetCacheRD.swift",
"VBoxContainer.swift",
"VFlowContainer.swift",
"VScrollBar.swift",
Expand Down Expand Up @@ -853,6 +887,7 @@ let known = [
"VisualShaderNodeFloatFunc.swift",
"VisualShaderNodeFloatOp.swift",
"VisualShaderNodeFloatParameter.swift",
"VisualShaderNodeFrame.swift",
"VisualShaderNodeFresnel.swift",
"VisualShaderNodeGlobalExpression.swift",
"VisualShaderNodeGroupBase.swift",
Expand Down Expand Up @@ -884,6 +919,7 @@ let known = [
"VisualShaderNodeProximityFade.swift",
"VisualShaderNodeRandomRange.swift",
"VisualShaderNodeRemap.swift",
"VisualShaderNodeReroute.swift",
"VisualShaderNodeResizableBase.swift",
"VisualShaderNodeRotationByAxis.swift",
"VisualShaderNodeSDFRaymarch.swift",
Expand Down Expand Up @@ -956,15 +992,25 @@ let known = [
"X509Certificate.swift",
"XMLParser.swift",
"XRAnchor3D.swift",
"XRBodyModifier3D.swift",
"XRBodyTracker.swift",
"XRCamera3D.swift",
"XRController3D.swift",
"XRControllerTracker.swift",
"XRFaceModifier3D.swift",
"XRFaceTracker.swift",
"XRHandModifier3D.swift",
"XRHandTracker.swift",
"XRInterface.swift",
"XRInterfaceExtension.swift",
"XRNode3D.swift",
"XROrigin3D.swift",
"XRPose.swift",
"XRPositionalTracker.swift",
"XRServer.swift",
"XRTracker.swift",
"XRVRS.swift",
"ZIPPacker.swift",
"ZIPReader.swift",

]
Loading

0 comments on commit 5f114bb

Please sign in to comment.