Skip to content

Commit a3935e6

Browse files
authored
Revert not instantiable class to not abstract with internal constructor (utopia-rise#876)
1 parent 8406bc9 commit a3935e6

File tree

94 files changed

+196
-183
lines changed

Some content is hidden

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

94 files changed

+196
-183
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,17 @@ class MemberRule : GodotApiRule<EnrichedClassTask>() {
6060
} else {
6161
if (clazz.isAbstract) {
6262
addModifiers(KModifier.ABSTRACT)
63+
} else if (!clazz.isInstantiable){
64+
primaryConstructor(
65+
FunSpec.constructorBuilder()
66+
.addModifiers(KModifier.INTERNAL)
67+
.build()
68+
).build()
69+
addModifiers(KModifier.OPEN)
6370
} else {
6471
addModifiers(KModifier.OPEN)
6572
}
73+
6674
generateClassConstructor(context)
6775
}
6876

kt/api-generator/src/main/kotlin/godot/codegen/models/enriched/EnrichedClass.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ class EnrichedClass(model: Class) : TypeGenerationTrait, DocumentedGenerationTra
3030
val properties = model.properties?.toEnriched() ?: listOf()
3131
val methods = model.methods?.toEnriched() ?: listOf()
3232

33-
val isAbstract = methods.any { it.isAbstract } || !model.isInstantiable
33+
val isAbstract = methods.any { it.isAbstract }
34+
val isInstantiable = model.isInstantiable
3435

3536
override var description = model.description
3637
val additionalImports = mutableSetOf<ClassName>()

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

Lines changed: 91 additions & 91 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import kotlin.jvm.JvmOverloads
5353
* processed by the [AnimationMixer].
5454
*/
5555
@GodotBaseType
56-
public abstract class AnimationMixer : Node() {
56+
public open class AnimationMixer internal constructor() : Node() {
5757
/**
5858
* Notifies when an animation list is changed.
5959
*/

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ import kotlin.jvm.JvmOverloads
2929
* An instance of this class can be obtained with [AudioServer.getBusEffectInstance].
3030
*/
3131
@GodotBaseType
32-
public abstract class AudioEffectSpectrumAnalyzerInstance : AudioEffectInstance() {
32+
public open class AudioEffectSpectrumAnalyzerInstance internal constructor() : AudioEffectInstance()
33+
{
3334
public override fun new(scriptIndex: Int): Unit {
3435
createNativeObject(74, scriptIndex)
3536
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ import kotlin.Unit
3030
* real-time.
3131
*/
3232
@GodotBaseType
33-
public abstract class AudioStreamGeneratorPlayback : AudioStreamPlaybackResampled() {
33+
public open class AudioStreamGeneratorPlayback internal constructor() :
34+
AudioStreamPlaybackResampled() {
3435
public override fun new(scriptIndex: Int): Unit {
3536
createNativeObject(83, scriptIndex)
3637
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import kotlin.Unit
2626
* clip.
2727
*/
2828
@GodotBaseType
29-
public abstract class AudioStreamPlaybackInteractive : AudioStreamPlayback() {
29+
public open class AudioStreamPlaybackInteractive internal constructor() : AudioStreamPlayback() {
3030
public override fun new(scriptIndex: Int): Unit {
3131
createNativeObject(89, scriptIndex)
3232
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import kotlin.Suppress
1212
import kotlin.Unit
1313

1414
@GodotBaseType
15-
public abstract class AudioStreamPlaybackPlaylist : AudioStreamPlayback() {
15+
public open class AudioStreamPlaybackPlaylist internal constructor() : AudioStreamPlayback() {
1616
public override fun new(scriptIndex: Int): Unit {
1717
createNativeObject(91, scriptIndex)
1818
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import kotlin.jvm.JvmOverloads
3434
* or [AudioStreamPlayer3D.getStreamPlayback] methods.
3535
*/
3636
@GodotBaseType
37-
public abstract class AudioStreamPlaybackPolyphonic : AudioStreamPlayback() {
37+
public open class AudioStreamPlaybackPolyphonic internal constructor() : AudioStreamPlayback() {
3838
public override fun new(scriptIndex: Int): Unit {
3939
createNativeObject(92, scriptIndex)
4040
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import kotlin.Suppress
1212
import kotlin.Unit
1313

1414
@GodotBaseType
15-
public abstract class AudioStreamPlaybackSynchronized : AudioStreamPlayback() {
15+
public open class AudioStreamPlaybackSynchronized internal constructor() : AudioStreamPlayback() {
1616
public override fun new(scriptIndex: Int): Unit {
1717
createNativeObject(94, scriptIndex)
1818
}

0 commit comments

Comments
 (0)