-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
RID is no longer a native coretype (#689)
* Convert RID to a Kotlin coretype
- Loading branch information
Showing
11 changed files
with
38 additions
and
167 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 24 additions & 54 deletions
78
kt/godot-library/src/main/kotlin/godot/core/bridge/RID.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,88 +1,58 @@ | ||
| @file:Suppress("PackageDirectoryMismatch") | ||
|
|
||
| package godot.core | ||
| import godot.core.memory.MemoryManager | ||
| import godot.core.memory.TransferContext | ||
| import godot.util.VoidPtr | ||
|
|
||
| @Suppress("MemberVisibilityCanBePrivate") | ||
| class RID : NativeCoreType, Comparable<RID> { | ||
| class RID( | ||
| /** | ||
| * Returns the ID of the referenced low-level resource. | ||
| */ | ||
| val id: Long | ||
| ) : Comparable<RID> { | ||
|
|
||
| val id: Int | ||
| get() = getID() | ||
|
|
||
| //INTERNAL | ||
| internal constructor(_handle: VoidPtr) { | ||
| this._handle = _handle | ||
| } | ||
|
|
||
| //CONSTRUCTOR | ||
| constructor() { | ||
| _handle = Bridge.engine_call_constructor() | ||
| MemoryManager.registerNativeCoreType(this, VariantType._RID) | ||
| } | ||
| /** | ||
| * Constructs an empty RID with the invalid ID 0. | ||
| */ | ||
| constructor(): this(0L) | ||
|
|
||
| constructor(from: RID) { | ||
| _handle = Bridge.engine_call_constructor(from._handle) | ||
| MemoryManager.registerNativeCoreType(this, VariantType._RID) | ||
| } | ||
| /** | ||
| * Constructs a RID as a copy of the given RID. | ||
| */ | ||
| constructor(from: RID): this(from.id) | ||
|
|
||
| //API | ||
| /** | ||
| * Returns the ID of the referenced resource. | ||
| * Returns `true` if the RID is not `0`. | ||
| */ | ||
| fun getID(): Int { | ||
| Bridge.engine_call_getID(_handle) | ||
| return TransferContext.readReturnValue(VariantCaster.INT) as Int | ||
| } | ||
| fun isValid() = id != 0L | ||
|
|
||
| /** | ||
| * Returns `true` if the RID is not `0`. | ||
| * Returns `true` if the RID is `0`. | ||
| */ | ||
| fun isValid(): Boolean { | ||
| Bridge.engine_call_isValid(_handle) | ||
| return TransferContext.readReturnValue(VariantType.BOOL) as Boolean | ||
| } | ||
| fun isNull() = id == 0L | ||
|
|
||
| //UTILITIES | ||
| override fun compareTo(other: RID): Int { | ||
| TransferContext.writeArguments(VariantType._RID to other) | ||
| Bridge.engine_call_compareTo(_handle) | ||
| return when { | ||
| this == other -> 0 | ||
| TransferContext.readReturnValue(VariantType.BOOL) as Boolean -> -1 | ||
|
|
||
| else -> 1 | ||
| } | ||
| override fun compareTo(other: RID) = when { | ||
| this == other -> 0 | ||
| this.id < other.id -> -1 | ||
| else -> 1 | ||
| } | ||
|
|
||
| override fun equals(other: Any?): Boolean { | ||
| return when (other) { | ||
| is RID -> { | ||
| TransferContext.writeArguments(VariantType._RID to other) | ||
| Bridge.engine_call_equals(_handle) | ||
| TransferContext.readReturnValue(VariantType.BOOL) as Boolean | ||
| id == other.id | ||
| } | ||
|
|
||
| else -> false | ||
| } | ||
| } | ||
|
|
||
| override fun hashCode(): Int { | ||
| return _handle.hashCode() | ||
| return id.toInt() | ||
| } | ||
|
|
||
| override fun toString(): String { | ||
| return "RID($id)" | ||
| } | ||
|
|
||
| @Suppress("FunctionName") | ||
| private object Bridge { | ||
| external fun engine_call_constructor(): VoidPtr | ||
| external fun engine_call_constructor(from: VoidPtr): VoidPtr | ||
| external fun engine_call_getID(_handle: VoidPtr) | ||
| external fun engine_call_isValid(_handle: VoidPtr) | ||
| external fun engine_call_compareTo(_handle: VoidPtr) | ||
| external fun engine_call_equals(_handle: VoidPtr) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters