From d938131ea0234600ea1743ae5132fbe9b1425d02 Mon Sep 17 00:00:00 2001 From: LunaTheFoxgirl Date: Sat, 14 May 2022 22:48:06 +0200 Subject: [PATCH] Move to inmath --- dub.sdl | 2 +- source/ft/adaptors/package.d | 1 + source/ft/adaptors/vmc.d | 2 +- source/ft/adaptors/vtsproto.d | 4 ++-- source/ft/data.d | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dub.sdl b/dub.sdl index 41dd3ee..6fb82ea 100644 --- a/dub.sdl +++ b/dub.sdl @@ -3,6 +3,6 @@ description "Face tracking integration for D" authors "Luna" copyright "Copyright © 2022, Luna" license "BSD 2-clause" -dependency "gl3n" version="~>1.4.1" +dependency "inmath" version="~>1.0.1" dependency "vmc-d" version="~>1.1.1" dependency "fghj" version="~>1.0.0" diff --git a/source/ft/adaptors/package.d b/source/ft/adaptors/package.d index e37a7fa..b662dbd 100644 --- a/source/ft/adaptors/package.d +++ b/source/ft/adaptors/package.d @@ -1,3 +1,4 @@ module ft.adaptors; +import ft.adaptor; public import ft.adaptors.vmc : VMCAdaptor; public import ft.adaptors.vtsproto : VTSAdaptor; \ No newline at end of file diff --git a/source/ft/adaptors/vmc.d b/source/ft/adaptors/vmc.d index 5f437cb..21346f4 100644 --- a/source/ft/adaptors/vmc.d +++ b/source/ft/adaptors/vmc.d @@ -4,7 +4,7 @@ import ft.data; import osc; import std.conv : to; import std.socket; -import gl3n.linalg; +import inmath.linalg; class VMCAdaptor : Adaptor { private: diff --git a/source/ft/adaptors/vtsproto.d b/source/ft/adaptors/vtsproto.d index ecdd608..db7f176 100644 --- a/source/ft/adaptors/vtsproto.d +++ b/source/ft/adaptors/vtsproto.d @@ -5,11 +5,11 @@ import std.conv : to; import std.socket; import fghj.serialization; import fghj; -import gl3n.linalg; +import inmath.linalg; import core.thread; import core.sync.mutex; import std.exception; -import gl3n.math; +import inmath.math; import std.stdio : writeln; struct VTSUDPDataRequest { diff --git a/source/ft/data.d b/source/ft/data.d index 6ba8bcd..7c767b4 100644 --- a/source/ft/data.d +++ b/source/ft/data.d @@ -1,5 +1,5 @@ module ft.data; -import gl3n.linalg; +import inmath.linalg; enum BlendshapeNames : string { eyeBlinkLeft = "eyeBlinkLeft",