change ReatT to Double in generated api (#194)

Co-authored-by: Pierre-Thomas Meisels <[email protected]>
utopia-rise · Aug 2, 2020 · 9b62844 · 9b62844
1 parent 1dcde78
commit 9b62844
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/buildSrc/src/main/kotlin/godot/codegen/Argument.kt b/buildSrc/src/main/kotlin/godot/codegen/Argument.kt
@@ -37,7 +37,7 @@ class Argument @JsonCreator constructor(
             when (type) {
                 "Color", "Variant" -> "$type($defaultValue)"
                 "Boolean" -> defaultValue.toLowerCase()
-                "RealT" -> intToFloat(defaultValue)
+                "Double" -> intToFloat(defaultValue)
                 "Vector2", "Vector3", "Rect2" -> "$type${defaultValue.replace(",", ".0,")
                     .replace(")", ".0)")}"
                 "Dictionary", "Transform", "Transform2D", "VariantArray", "RID", "PoolVector2Array", "PoolStringArray",

diff --git a/buildSrc/src/main/kotlin/godot/codegen/ICall.kt b/buildSrc/src/main/kotlin/godot/codegen/ICall.kt
@@ -87,10 +87,7 @@ class ICall(
                 codeBlockBuilder.add(
                     "    val retVar = %M<%T>()\n",
                     MemberName("kotlinx.cinterop", "alloc"),
-                    ClassName(
-                        if (returnType == "RealT") "godot.internal.type" else "kotlinx.cinterop",
-                        "${returnType}Var"
-                    )
+                    ClassName("kotlinx.cinterop", "${returnType}Var")
                 )
             } else {
                 codeBlockBuilder.add(

diff --git a/buildSrc/src/main/kotlin/godot/codegen/TypeCast.kt b/buildSrc/src/main/kotlin/godot/codegen/TypeCast.kt
@@ -50,7 +50,7 @@ private val kotlinReservedNames = listOf(
     "object"
 )
 
-private val primitives = listOf("Long", "RealT", "Boolean", "Unit")
+private val primitives = listOf("Long", "Double", "Boolean", "Unit")
 
 fun String.escapeUnderscore(): String {
     if (this == "") return this
@@ -88,14 +88,12 @@ fun String.getPackage() =
             } else {
                 thisString = thisString.replace("::", ".").split(".")[0]
                 when {
-                    this == "RealT" -> "godot.internal.type"
                     thisString.isPrimitive() || thisString == "String" -> "kotlin"
                     thisString.isCoreType() -> "godot.core"
                     else -> "godot"
                 }
             }
         }
-        this == "RealT" -> "godot.internal.type"
         isPrimitive() || this == "String" -> "kotlin"
         isCoreType()  -> "godot.core"
         else -> "godot"
@@ -145,7 +143,7 @@ fun String.convertToSnakeCase(): String =
 fun String.convertTypeToKotlin(): String {
     return when {
         this == "int" -> "Long"
-        this == "float" -> "RealT"
+        this == "float" -> "Double"
         this == "bool" -> "Boolean"
         this == "void" -> "Unit"
         this == "Array" -> "VariantArray"
@@ -166,7 +164,7 @@ fun String.convertTypeForICalls(): String {
 
 fun String.defaultValue(): String = when (this) {
     "Long" -> "0"
-    "RealT" -> "0.0"
+    "Double" -> "0.0"
     "Boolean" -> "false"
     else -> throw Exception("$this is not a primitive type.")
 }