Fix compiler warnings about dot imports
This commit is contained in:
parent
0ad22b7b7c
commit
a8021301bf
22 changed files with 45 additions and 45 deletions
|
|
@ -3,7 +3,7 @@
|
||||||
import hashes
|
import hashes
|
||||||
|
|
||||||
import vector3
|
import vector3
|
||||||
import internal.godotinternaltypes, internal.godotstrings
|
import internal/godotinternaltypes, internal/godotstrings
|
||||||
import godotcoretypes, gdnativeapi
|
import godotcoretypes, gdnativeapi
|
||||||
|
|
||||||
proc initAABB*(pos, size: Vector3): AABB {.inline.} =
|
proc initAABB*(pos, size: Vector3): AABB {.inline.} =
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Copyright 2018 Xored Software, Inc.
|
# Copyright 2018 Xored Software, Inc.
|
||||||
|
|
||||||
import hashes
|
import hashes
|
||||||
import internal.godotinternaltypes, internal.godotarrays
|
import internal/godotinternaltypes, internal/godotarrays
|
||||||
|
|
||||||
type
|
type
|
||||||
Array* = ref object
|
Array* = ref object
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
# Copyright 2018 Xored Software, Inc.
|
# Copyright 2018 Xored Software, Inc.
|
||||||
|
|
||||||
import hashes
|
import hashes
|
||||||
import internal.godotinternaltypes, internal.godotdictionaries,
|
import internal/godotinternaltypes, internal/godotdictionaries,
|
||||||
internal.godotvariants, internal.godotstrings
|
internal/godotvariants, internal/godotstrings
|
||||||
|
|
||||||
type
|
type
|
||||||
Dictionary* = ref object
|
Dictionary* = ref object
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,8 @@
|
||||||
|
|
||||||
import hashes
|
import hashes
|
||||||
|
|
||||||
import internal.godotinternaltypes, internal.godotnodepaths,
|
import internal/godotinternaltypes, internal/godotnodepaths,
|
||||||
internal.godotstrings
|
internal/godotstrings
|
||||||
|
|
||||||
type
|
type
|
||||||
NodePath* = ref object
|
NodePath* = ref object
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ import hashes
|
||||||
|
|
||||||
import vector3
|
import vector3
|
||||||
|
|
||||||
import internal.godotinternaltypes, internal.godotstrings
|
import internal/godotinternaltypes, internal/godotstrings
|
||||||
import godotcoretypes, gdnativeapi
|
import godotcoretypes, gdnativeapi
|
||||||
|
|
||||||
proc initPlane*(a, b, c, d: float32): Plane {.inline.} =
|
proc initPlane*(a, b, c, d: float32): Plane {.inline.} =
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,8 @@
|
||||||
import hashes
|
import hashes
|
||||||
|
|
||||||
import godotcoretypes
|
import godotcoretypes
|
||||||
import internal.godotinternaltypes, internal.godotpoolarrays,
|
import internal/godotinternaltypes, internal/godotpoolarrays,
|
||||||
internal.godotstrings
|
internal/godotstrings
|
||||||
import vector2, vector3, colors
|
import vector2, vector3, colors
|
||||||
|
|
||||||
template definePoolArrayBase(T, GodotT, DataT, fieldName, newProcName,
|
template definePoolArrayBase(T, GodotT, DataT, fieldName, newProcName,
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
import hashes
|
import hashes
|
||||||
|
|
||||||
import internal.godotinternaltypes, internal.godotstrings
|
import internal/godotinternaltypes, internal/godotstrings
|
||||||
import godotcoretypes, gdnativeapi
|
import godotcoretypes, gdnativeapi
|
||||||
|
|
||||||
proc initQuat*(x, y, z, w: float32): Quat {.inline.} =
|
proc initQuat*(x, y, z, w: float32): Quat {.inline.} =
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
import hashes
|
import hashes
|
||||||
|
|
||||||
import vector2
|
import vector2
|
||||||
import internal.godotinternaltypes, internal.godotstrings
|
import internal/godotinternaltypes, internal/godotstrings
|
||||||
import godotcoretypes, gdnativeapi
|
import godotcoretypes, gdnativeapi
|
||||||
|
|
||||||
{.push stackTrace: off.}
|
{.push stackTrace: off.}
|
||||||
|
|
@ -150,4 +150,4 @@ proc abs*(self: Rect2): Rect2 {.inline, noinit.} =
|
||||||
proc `==`*(a, b: Rect2): bool {.inline, noinit.} =
|
proc `==`*(a, b: Rect2): bool {.inline, noinit.} =
|
||||||
a.position == b.position and a.size == b.size
|
a.position == b.position and a.size == b.size
|
||||||
|
|
||||||
{.pop.} # stackTrace: off
|
{.pop.} # stackTrace: off
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
import hashes
|
import hashes
|
||||||
|
|
||||||
import godotcoretypes, internal.godotinternaltypes, gdnativeapi
|
import godotcoretypes, internal/godotinternaltypes, gdnativeapi
|
||||||
|
|
||||||
proc initRID*(): RID {.inline.} =
|
proc initRID*(): RID {.inline.} =
|
||||||
getGDNativeAPI().ridNew(result)
|
getGDNativeAPI().ridNew(result)
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
import hashes, vector2
|
import hashes, vector2
|
||||||
|
|
||||||
import internal.godotinternaltypes, internal.godotstrings
|
import internal/godotinternaltypes, internal/godotstrings
|
||||||
import godotcoretypes, gdnativeapi
|
import godotcoretypes, gdnativeapi
|
||||||
|
|
||||||
proc initTransform2D*(): Transform2D {.inline.} =
|
proc initTransform2D*(): Transform2D {.inline.} =
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
import hashes
|
import hashes
|
||||||
|
|
||||||
import internal.godotinternaltypes, internal.godotstrings
|
import internal/godotinternaltypes, internal/godotstrings
|
||||||
import godotcoretypes, gdnativeapi
|
import godotcoretypes, gdnativeapi
|
||||||
import basis, vector3
|
import basis, vector3
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
import tables, hashes
|
import tables, hashes
|
||||||
|
|
||||||
import godotcoretypes
|
import godotcoretypes
|
||||||
import internal.godotinternaltypes, internal.godotvariants,
|
import internal/godotinternaltypes, internal/godotvariants,
|
||||||
internal.godotstrings, internal.godotdictionaries,
|
internal/godotstrings, internal/godotdictionaries,
|
||||||
internal.godotarrays
|
internal/godotarrays
|
||||||
|
|
||||||
type
|
type
|
||||||
Variant* = ref object
|
Variant* = ref object
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
import math, godotbase, hashes
|
import math, godotbase, hashes
|
||||||
|
|
||||||
import internal.godotinternaltypes, internal.godotstrings
|
import internal/godotinternaltypes, internal/godotstrings
|
||||||
import godotcoretypes, gdnativeapi
|
import godotcoretypes, gdnativeapi
|
||||||
|
|
||||||
{.push stackTrace: off.}
|
{.push stackTrace: off.}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# Copyright 2018 Xored Software, Inc.
|
# Copyright 2018 Xored Software, Inc.
|
||||||
|
|
||||||
import internal.godotinternaltypes, core.godotcoretypes, macros
|
import internal/godotinternaltypes, core/godotcoretypes, macros
|
||||||
|
|
||||||
type
|
type
|
||||||
ColorData* {.byref.} = object
|
ColorData* {.byref.} = object
|
||||||
|
|
|
||||||
|
|
@ -1,18 +1,18 @@
|
||||||
# Copyright 2018 Xored Software, Inc.
|
# Copyright 2018 Xored Software, Inc.
|
||||||
|
|
||||||
import core.godotbase, godotinternal
|
import core/godotbase, godotinternal
|
||||||
import core.godotcoretypes
|
import core/godotcoretypes
|
||||||
import core.vector2, core.rect2, core.vector3, core.transform2d, core.planes,
|
import core/vector2, core/rect2, core/vector3, core/transform2d, core/planes,
|
||||||
core.quats
|
core/quats
|
||||||
import core.aabb, core.basis, core.transforms, core.colors, core.nodepaths,
|
import core/aabb, core/basis, core/transforms, core/colors, core/nodepaths,
|
||||||
core.rids
|
core/rids
|
||||||
import core.dictionaries, core.arrays, core.poolarrays, core.variants
|
import core/dictionaries, core/arrays, core/poolarrays, core/variants
|
||||||
|
|
||||||
import nim.godotmacros, nim.godotnim
|
import nim/godotmacros, nim/godotnim
|
||||||
|
|
||||||
export godotbase, godotcoretypes, vector2, rect2, vector3, transform2d, planes,
|
export godotbase, godotcoretypes, vector2, rect2, vector3, transform2d, planes,
|
||||||
quats, aabb, basis, transforms, colors, nodepaths, rids, dictionaries,
|
quats, aabb, basis, transforms, colors, nodepaths, rids, dictionaries,
|
||||||
arrays, poolarrays, variants
|
arrays, poolarrays, variants
|
||||||
export godotmacros, godotnim
|
export godotmacros, godotnim
|
||||||
|
|
||||||
export GodotPropertyHint, GodotPropertyUsage
|
export GodotPropertyHint, GodotPropertyUsage
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
import streams, json, os, strutils, times, sets, tables, options
|
import streams, json, os, strutils, times, sets, tables, options
|
||||||
import sequtils, algorithm
|
import sequtils, algorithm
|
||||||
import compiler.ast, compiler.renderer, compiler.idents, compiler.astalgo
|
import compiler/ast, compiler/renderer, compiler/idents, compiler/astalgo
|
||||||
|
|
||||||
when (NimMajor, NimMinor, NimPatch) >= (0, 19, 0):
|
when (NimMajor, NimMinor, NimPatch) >= (0, 19, 0):
|
||||||
var gic* = newIdentCache()
|
var gic* = newIdentCache()
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
# Copyright 2018 Xored Software, Inc.
|
# Copyright 2018 Xored Software, Inc.
|
||||||
|
|
||||||
import internal.godotinternaltypes, internal.godotarrays,
|
import internal/godotinternaltypes, internal/godotarrays,
|
||||||
internal.godotnodepaths, internal.godotpoolarrays, internal.godotstrings,
|
internal/godotnodepaths, internal/godotpoolarrays, internal/godotstrings,
|
||||||
internal.godotvariants, internal.godotdictionaries
|
internal/godotvariants, internal/godotdictionaries
|
||||||
|
|
||||||
import gdnativeapi
|
import gdnativeapi
|
||||||
export godotinternaltypes, godotarrays, godotnodepaths, godotpoolarrays,
|
export godotinternaltypes, godotarrays, godotnodepaths, godotpoolarrays,
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# Copyright (c) 2018 Xored Software, Inc.
|
# Copyright (c) 2018 Xored Software, Inc.
|
||||||
|
|
||||||
import godotinternaltypes, gdnativeapi, core.godotcoretypes
|
import godotinternaltypes, gdnativeapi, core/godotcoretypes
|
||||||
|
|
||||||
proc len*(self: GodotArray): cint {.inline.} =
|
proc len*(self: GodotArray): cint {.inline.} =
|
||||||
getGDNativeAPI().arraySize(self)
|
getGDNativeAPI().arraySize(self)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Copyright (c) 2018 Xored Software, Inc.
|
# Copyright (c) 2018 Xored Software, Inc.
|
||||||
|
|
||||||
import godotinternaltypes, gdnativeapi
|
import godotinternaltypes, gdnativeapi
|
||||||
import core.godotcoretypes
|
import core/godotcoretypes
|
||||||
|
|
||||||
template genPoolArrayAPI(ArrayT, initIdent, DataT,
|
template genPoolArrayAPI(ArrayT, initIdent, DataT,
|
||||||
newProc, newCopyProc, newWithArrayProc, appendProc,
|
newProc, newCopyProc, newWithArrayProc, appendProc,
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# Copyright 2018 Xored Software, Inc.
|
# Copyright 2018 Xored Software, Inc.
|
||||||
|
|
||||||
import core.godotcoretypes, godotinternaltypes, gdnativeapi
|
import core/godotcoretypes, godotinternaltypes, gdnativeapi
|
||||||
|
|
||||||
proc getType*(p: GodotVariant): VariantType {.inline.} =
|
proc getType*(p: GodotVariant): VariantType {.inline.} =
|
||||||
getGDNativeAPI().variantGetType(p)
|
getGDNativeAPI().variantGetType(p)
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
# Copyright 2018 Xored Software, Inc.
|
# Copyright 2018 Xored Software, Inc.
|
||||||
|
|
||||||
import macros, tables, typetraits, strutils, sets, sequtils, options
|
import macros, tables, typetraits, strutils, sets, sequtils, options
|
||||||
import godotinternal, internal.godotvariants
|
import godotinternal, internal/godotvariants
|
||||||
import godotnim, core.variants
|
import godotnim, core/variants
|
||||||
|
|
||||||
type
|
type
|
||||||
VarDecl = ref object
|
VarDecl = ref object
|
||||||
|
|
|
||||||
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
import tables, typetraits, macros, unicode, strutils, sets
|
import tables, typetraits, macros, unicode, strutils, sets
|
||||||
import gdnativeapi
|
import gdnativeapi
|
||||||
import core.godotcoretypes, core.godotbase
|
import core/godotcoretypes, core/godotbase
|
||||||
import core.vector2, core.rect2,
|
import core/vector2, core/rect2,
|
||||||
core.vector3, core.transform2d,
|
core/vector3, core/transform2d,
|
||||||
core.planes, core.quats, core.aabb,
|
core/planes, core/quats, core/aabb,
|
||||||
core.basis, core.transforms, core.colors,
|
core/basis, core/transforms, core/colors,
|
||||||
core.nodepaths, core.rids, core.dictionaries,
|
core/nodepaths, core/rids, core/dictionaries,
|
||||||
core.arrays, core.poolarrays, core.variants
|
core/arrays, core/poolarrays, core/variants
|
||||||
import godotinternal
|
import godotinternal
|
||||||
|
|
||||||
## This module defines ``NimGodotObject`` and ``toVariant``/``fromVariant``
|
## This module defines ``NimGodotObject`` and ``toVariant``/``fromVariant``
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue