Merge pull request #10 from CarlBittendorf/dev

Dev
CarlBittendorf · Jul 23, 2021 · 79aa4c4 · 79aa4c4
2 parents 7079927 + dd8a644
commit 79aa4c4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "BVHFiles"
 uuid = "25714dd2-c69e-4994-8c66-7895118b2050"
 authors = ["Carl Bittendorf"]
-version = "0.2.0"
+version = "0.2.1"
 
 [deps]
 Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"

diff --git a/src/BVHGraphs.jl b/src/BVHGraphs.jl
@@ -37,6 +37,7 @@ Base.@kwdef mutable struct EProps
     offset::Vector{Float64} = zeros(Float64, 3)
 end
 
+
 """
     struct BVHGraph{T <: Integer} <: AbstractGraph{T}
 

diff --git a/src/transformation.jl b/src/transformation.jl
@@ -331,13 +331,13 @@ function replace_offset!(g::BVHGraph, h::BVHGraph, gv₊₁::Integer, T::Matrix{
 
         for f in frames(g)
             Rᵥ = rotation(g, gv, f)
-            rotation!(g, gv, f, B * Rᵥ)
+            rotation!(g, gv, f, Rᵥ * B)
 
             for n in outneighbors(g, gv)
 
                 if outneighbors(g, n) != []
                     Rᵥ₊₁ = rotation(g, n, f)
-                    rotation!(g, n, f, inv(Rᵥ) * inv(B) * Rᵥ * Rᵥ₊₁)
+                    rotation!(g, n, f, inv(B) * Rᵥ₊₁)
                 end
             end
         end

diff --git a/test/file.jl b/test/file.jl
@@ -71,9 +71,9 @@ using Flux
     scale!(7.0)
 
     d = load("DAZ3D.bvh") |>
-    zero! |>
-    add_frames!(240) |>
-    project!(g, T)
+        zero! |>
+        add_frames!(240) |>
+        project!(g, T)
 
     @test nframes(d) == nframes(g)
 end