Skip to content

Commit f3959ac

Browse files
authored
Enhancement/remove script indexes (#891)
* enh: replace named script index by use of script ptr * enh: Remove unuseful source_scripts vector in JvmScriptManager * chore: Modify graal jni config * enh: Make scriptClassCache private in TypeManager
1 parent 7291f1e commit f3959ac

911 files changed

Lines changed: 2000 additions & 2312 deletions

File tree

Some content is hidden

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

kt/api-generator/src/main/kotlin/godot/codegen/generation/rule/ClassRule.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ class MemberRule : GodotApiRule<EnrichedClassTask>() {
104104
addFunction(
105105
FunSpec.builder("new")
106106
.addModifiers(KModifier.OVERRIDE)
107-
.addParameter("scriptIndex", Int::class)
107+
.addParameter("scriptPtr", VOID_PTR)
108108
.returns(Unit::class)
109109
.addStatement(
110-
"createNativeObject(${context.getNextEngineClassIndex()}, scriptIndex)"
110+
"createNativeObject(${context.getNextEngineClassIndex()}, scriptPtr)"
111111
)
112112
.build()
113113
)
@@ -118,7 +118,7 @@ class MemberRule : GodotApiRule<EnrichedClassTask>() {
118118
addFunction(
119119
FunSpec.builder("new")
120120
.addModifiers(KModifier.OVERRIDE)
121-
.addParameter("scriptIndex", Int::class)
121+
.addParameter("scriptPtr", VOID_PTR)
122122
.returns(Unit::class)
123123
.addStatement(
124124
"getSingleton(${context.getNextSingletonIndex()})"

kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AESContext.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import godot.core.PackedByteArray
1616
import godot.core.VariantParser.LONG
1717
import godot.core.VariantParser.NIL
1818
import godot.core.VariantParser.PACKED_BYTE_ARRAY
19-
import kotlin.Int
2019
import kotlin.Long
2120
import kotlin.Suppress
2221
import kotlin.Unit
@@ -101,8 +100,8 @@ import kotlin.jvm.JvmOverloads
101100
*/
102101
@GodotBaseType
103102
public open class AESContext : RefCounted() {
104-
public override fun new(scriptIndex: Int): Unit {
105-
createNativeObject(2, scriptIndex)
103+
public override fun new(scriptPtr: VoidPtr): Unit {
104+
createNativeObject(2, scriptPtr)
106105
}
107106

108107
/**

kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AStar2D.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import godot.core.Vector2
2323
import kotlin.Boolean
2424
import kotlin.Double
2525
import kotlin.Float
26-
import kotlin.Int
2726
import kotlin.Long
2827
import kotlin.NotImplementedError
2928
import kotlin.Suppress
@@ -51,8 +50,8 @@ public open class AStar2D : RefCounted() {
5150
setNeighborFilterEnabled(value)
5251
}
5352

54-
public override fun new(scriptIndex: Int): Unit {
55-
createNativeObject(3, scriptIndex)
53+
public override fun new(scriptPtr: VoidPtr): Unit {
54+
createNativeObject(3, scriptPtr)
5655
}
5756

5857
/**

kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AStar3D.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import godot.core.Vector3
2323
import kotlin.Boolean
2424
import kotlin.Double
2525
import kotlin.Float
26-
import kotlin.Int
2726
import kotlin.Long
2827
import kotlin.NotImplementedError
2928
import kotlin.Suppress
@@ -115,8 +114,8 @@ public open class AStar3D : RefCounted() {
115114
setNeighborFilterEnabled(value)
116115
}
117116

118-
public override fun new(scriptIndex: Int): Unit {
119-
createNativeObject(4, scriptIndex)
117+
public override fun new(scriptPtr: VoidPtr): Unit {
118+
createNativeObject(4, scriptPtr)
120119
}
121120

122121
/**

kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AStarGrid2D.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ public open class AStarGrid2D : RefCounted() {
220220
setDiagonalMode(value)
221221
}
222222

223-
public override fun new(scriptIndex: Int): Unit {
224-
createNativeObject(5, scriptIndex)
223+
public override fun new(scriptPtr: VoidPtr): Unit {
224+
createNativeObject(5, scriptPtr)
225225
}
226226

227227
/**

kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AcceptDialog.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import godot.core.VariantParser.NIL
1818
import godot.core.VariantParser.OBJECT
1919
import godot.core.VariantParser.STRING
2020
import kotlin.Boolean
21-
import kotlin.Int
2221
import kotlin.String
2322
import kotlin.Suppress
2423
import kotlin.Unit
@@ -111,8 +110,8 @@ public open class AcceptDialog : Window() {
111110
setAutowrap(value)
112111
}
113112

114-
public override fun new(scriptIndex: Int): Unit {
115-
createNativeObject(6, scriptIndex)
113+
public override fun new(scriptPtr: VoidPtr): Unit {
114+
createNativeObject(6, scriptPtr)
116115
}
117116

118117
/**

kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AimModifier3D.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public open class AimModifier3D : BoneConstraint3D() {
4141
setSettingCount(value)
4242
}
4343

44-
public override fun new(scriptIndex: Int): Unit {
45-
createNativeObject(7, scriptIndex)
44+
public override fun new(scriptPtr: VoidPtr): Unit {
45+
createNativeObject(7, scriptPtr)
4646
}
4747

4848
/**

kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimatableBody2D.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import godot.common.interop.VoidPtr
1313
import godot.core.VariantParser.BOOL
1414
import godot.core.VariantParser.NIL
1515
import kotlin.Boolean
16-
import kotlin.Int
1716
import kotlin.Suppress
1817
import kotlin.Unit
1918
import kotlin.jvm.JvmName
@@ -42,8 +41,8 @@ public open class AnimatableBody2D : StaticBody2D() {
4241
setSyncToPhysics(value)
4342
}
4443

45-
public override fun new(scriptIndex: Int): Unit {
46-
createNativeObject(8, scriptIndex)
44+
public override fun new(scriptPtr: VoidPtr): Unit {
45+
createNativeObject(8, scriptPtr)
4746
}
4847

4948
public final fun setSyncToPhysics(enable: Boolean): Unit {

kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimatableBody3D.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import godot.common.interop.VoidPtr
1313
import godot.core.VariantParser.BOOL
1414
import godot.core.VariantParser.NIL
1515
import kotlin.Boolean
16-
import kotlin.Int
1716
import kotlin.Suppress
1817
import kotlin.Unit
1918
import kotlin.jvm.JvmName
@@ -42,8 +41,8 @@ public open class AnimatableBody3D : StaticBody3D() {
4241
setSyncToPhysics(value)
4342
}
4443

45-
public override fun new(scriptIndex: Int): Unit {
46-
createNativeObject(9, scriptIndex)
44+
public override fun new(scriptPtr: VoidPtr): Unit {
45+
createNativeObject(9, scriptPtr)
4746
}
4847

4948
public final fun setSyncToPhysics(enable: Boolean): Unit {

kt/godot-library/godot-api-library/src/main/kotlin/godot/api/AnimatedSprite2D.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,8 @@ public open class AnimatedSprite2D : Node2D() {
202202
setFlipV(value)
203203
}
204204

205-
public override fun new(scriptIndex: Int): Unit {
206-
createNativeObject(10, scriptIndex)
205+
public override fun new(scriptPtr: VoidPtr): Unit {
206+
createNativeObject(10, scriptPtr)
207207
}
208208

209209
/**

0 commit comments

Comments
 (0)