Skip to content

Commit

Permalink
Merge pull request #344 from crertel/fix-1.16-warnings
Browse files Browse the repository at this point in the history 
Fix 1.16 warnings
  • Loading branch information
@crertel
crertel authored May 5, 2024
2 parents 8bc423f + 4f94341 commit bebae80
Show file tree
Hide file tree
Showing 16 changed files with 131 additions and 133 deletions.
4 changes: 2 additions & 2 deletions lib/scenic/graph/bounds.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,10 +337,10 @@ defmodule Scenic.Graph.Bounds do
# special case vertical lines so we don't divide by zero
sa =
case Vector2.normalize(v_c_start) do
{0.0, 1.0} ->
{+0.0, 1.0} ->
@tau_14

{0.0, -1.0} ->
{+0.0, -1.0} ->
-1 * @tau_14

{x, y} ->
Expand Down
200 changes: 100 additions & 100 deletions lib/scenic/math/matrix.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,40 +41,40 @@ defmodule Scenic.Math.Matrix do
@matrix_size 4 * 16

@matrix_zero <<
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native
>>

@matrix_identity <<
1.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
1.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
1.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
1.0::float-size(32)-native
>>

Expand Down Expand Up @@ -116,19 +116,19 @@ defmodule Scenic.Math.Matrix do
# <<
# v0x::float-size(32)-native,
# v0y::float-size(32)-native,
# 0.0::float-size(32)-native,
# 0.0::float-size(32)-native,
# +0.0::float-size(32)-native,
# +0.0::float-size(32)-native,
# v1x::float-size(32)-native,
# v1y::float-size(32)-native,
# 0.0::float-size(32)-native,
# 0.0::float-size(32)-native,
# 0.0::float-size(32)-native,
# 0.0::float-size(32)-native,
# +0.0::float-size(32)-native,
# +0.0::float-size(32)-native,
# +0.0::float-size(32)-native,
# +0.0::float-size(32)-native,
# 1.0::float-size(32)-native,
# 0.0::float-size(32)-native,
# 0.0::float-size(32)-native,
# 0.0::float-size(32)-native,
# 0.0::float-size(32)-native,
# +0.0::float-size(32)-native,
# +0.0::float-size(32)-native,
# +0.0::float-size(32)-native,
# +0.0::float-size(32)-native,
# 1.0::float-size(32)-native
# >>
# end
Expand All @@ -140,18 +140,18 @@ defmodule Scenic.Math.Matrix do
# v0x::float-size(32)-native,
# v0y::float-size(32)-native,
# v0z::float-size(32)-native,
# 0.0::float-size(32)-native,
# +0.0::float-size(32)-native,
# v1x::float-size(32)-native,
# v1y::float-size(32)-native,
# v1z::float-size(32)-native,
# 0.0::float-size(32)-native,
# +0.0::float-size(32)-native,
# v2x::float-size(32)-native,
# v2y::float-size(32)-native,
# v2z::float-size(32)-native,
# 0.0::float-size(32)-native,
# 0.0::float-size(32)-native,
# 0.0::float-size(32)-native,
# 0.0::float-size(32)-native,
# +0.0::float-size(32)-native,
# +0.0::float-size(32)-native,
# +0.0::float-size(32)-native,
# +0.0::float-size(32)-native,
# 1.0::float-size(32)-native
# >>
# end
Expand Down Expand Up @@ -200,26 +200,26 @@ defmodule Scenic.Math.Matrix do
"""
@spec build_translation(vector_2 :: Math.vector_2()) :: Math.matrix()
def build_translation(vector_2)
def build_translation({x, y}), do: do_build_translation({x, y, 0.0})
def build_translation({x, y}), do: do_build_translation({x, y, +0.0})
# def build_translation({x, y, z}), do: build_translation(x, y, z)
# def build_translation(x, y), do: build_translation(x, y, 0.0)
# def build_translation(x, y), do: build_translation(x, y, +0.0)
defp do_build_translation({x, y, z}) do
<<
1.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
x * 1.0::float-size(32)-native,
0.0::float-size(32)-native,
+0.0::float-size(32)-native,
1.0::float-size(32)-native,
0.0::float-size(32)-native,
+0.0::float-size(32)-native,
y * 1.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
1.0::float-size(32)-native,
z * 1.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
1.0::float-size(32)-native
>>
end
Expand All @@ -243,20 +243,20 @@ defmodule Scenic.Math.Matrix do
defp do_build_scale({x, y, z}) do
<<
x * 1.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
y * 1.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
z * 1.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
1.0::float-size(32)-native
>>
end
Expand Down Expand Up @@ -290,23 +290,23 @@ defmodule Scenic.Math.Matrix do
# sin = :math.sin( radians )
# <<
# 1.0 :: float-size(32)-native,
# 0.0 :: float-size(32)-native,
# 0.0 :: float-size(32)-native,
# 0.0 :: float-size(32)-native,
# +0.0 :: float-size(32)-native,
# +0.0 :: float-size(32)-native,
# +0.0 :: float-size(32)-native,

# 0.0 :: float-size(32)-native,
# +0.0 :: float-size(32)-native,
# cos :: float-size(32)-native,
# sin :: float-size(32)-native,
# 0.0 :: float-size(32)-native,
# +0.0 :: float-size(32)-native,

# 0.0 :: float-size(32)-native,
# +0.0 :: float-size(32)-native,
# -sin :: float-size(32)-native,
# cos :: float-size(32)-native,
# 0.0 :: float-size(32)-native,
# +0.0 :: float-size(32)-native,

# 0.0 :: float-size(32)-native,
# 0.0 :: float-size(32)-native,
# 0.0 :: float-size(32)-native,
# +0.0 :: float-size(32)-native,
# +0.0 :: float-size(32)-native,
# +0.0 :: float-size(32)-native,
# 1.0 :: float-size(32)-native
# >>
# end
Expand All @@ -316,23 +316,23 @@ defmodule Scenic.Math.Matrix do
# sin = :math.sin( radians )
# <<
# cos :: float-size(32)-native,
# 0.0 :: float-size(32)-native,
# +0.0 :: float-size(32)-native,
# sin :: float-size(32)-native,
# 0.0 :: float-size(32)-native,
# +0.0 :: float-size(32)-native,

# 0.0 :: float-size(32)-native,
# +0.0 :: float-size(32)-native,
# 1.0 :: float-size(32)-native,
# 0.0 :: float-size(32)-native,
# 0.0 :: float-size(32)-native,
# +0.0 :: float-size(32)-native,
# +0.0 :: float-size(32)-native,

# -sin :: float-size(32)-native,
# 0.0 :: float-size(32)-native,
# +0.0 :: float-size(32)-native,
# cos :: float-size(32)-native,
# 0.0 :: float-size(32)-native,
# +0.0 :: float-size(32)-native,

# 0.0 :: float-size(32)-native,
# 0.0 :: float-size(32)-native,
# 0.0 :: float-size(32)-native,
# +0.0 :: float-size(32)-native,
# +0.0 :: float-size(32)-native,
# +0.0 :: float-size(32)-native,
# 1.0 :: float-size(32)-native
# >>
# end
Expand All @@ -344,19 +344,19 @@ defmodule Scenic.Math.Matrix do
<<
cos::float-size(32)-native,
-sin::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
sin::float-size(32)-native,
cos::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
1.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
+0.0::float-size(32)-native,
1.0::float-size(32)-native
>>
end
Expand Down Expand Up @@ -579,14 +579,14 @@ defmodule Scenic.Math.Matrix do
Parameters:
* matrix_a: The first matrix
* matrix_b: The second matrix
* tolerance: Defines what close means. Defaults to: 0.000001
* tolerance: Defines what close means. Defaults to: +0.000001
Returns:
A boolean
"""
@spec close?(matrix_a :: Math.matrix(), matrix_a :: Math.matrix(), tolerance :: number) ::
boolean
def close?(matrix_a, matrix_b, tolerance \\ 0.000001)
def close?(matrix_a, matrix_b, tolerance \\ +0.000001)

def close?(<<_::binary-size(@matrix_size)>> = a, <<_::binary-size(@matrix_size)>> = b, t)
when is_float(t) do
Expand Down Expand Up @@ -790,7 +790,7 @@ defmodule Scenic.Math.Matrix do
@spec invert(matrix :: Math.matrix()) :: Math.matrix()
def invert(matrix) do
case nif_determinant(matrix) do
0.0 ->
+0.0 ->
:err_zero_determinant

det ->
Expand Down
2 changes: 1 addition & 1 deletion lib/scenic/math/vector_2.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ defmodule Scenic.Math.Vector2 do

def normalize({ax, ay}) do
case Vector2.length({ax, ay}) do
0.0 ->
+0.0 ->
{ax, ay}

len ->
Expand Down
2 changes: 1 addition & 1 deletion lib/scenic/scene.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ defmodule Scenic.Scene do

def request_input(%Scene{viewport: vp, pid: pid, module: module}, inputs) when is_list(inputs) do
unless Kernel.function_exported?(module, :handle_input, 3) do
Logger.warn("Requesting input for #{inspect inputs} - #{module}.handle_input/3 not implemented")
Logger.warning("Requesting input for #{inspect inputs} - #{module}.handle_input/3 not implemented")
end
ViewPort.Input.request(vp, inputs, pid: pid)
end
Expand Down
Loading

0 comments on commit bebae80

Please sign in to comment.