Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the code for LÖVE 11 #2

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Basic forward model rendering. Start here.
![](https://raw.githubusercontent.com/excessive/love3d-demos/master/screenshots/forward.png)

## Deferred
Basic deferred rendering. All information needed for shading is renderd into
Basic deferred rendering. All information needed for shading is rendered into
buffers before combining at the end. Useful for various effects.

![](https://raw.githubusercontent.com/excessive/love3d-demos/master/screenshots/deferred.png)
Expand Down
8 changes: 4 additions & 4 deletions libs/cpml/modules/mat4.lua
Original file line number Diff line number Diff line change
Expand Up @@ -645,10 +645,10 @@ end
-- @treturn table vec4s
function mat4.to_vec4s(a)
return {
{ a[1], a[2], a[3], a[4] },
{ a[5], a[6], a[7], a[8] },
{ a[9], a[10], a[11], a[12] },
{ a[13], a[14], a[15], a[16] }
{ a[1], a[5], a[9], a[13] },
{ a[2], a[6], a[10], a[14] },
{ a[3], a[7], a[11], a[15] },
{ a[4], a[8], a[12], a[16] }
Copy link
Member

@shakesoda shakesoda Sep 30, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the correct fix here is actually just changing the arguments to shader:send to indicate that it is transposed - this should also be introduced as a variant of the to_vec4s function in upstream though (or it should take a transpose bool argument)

}
end

Expand Down
2 changes: 1 addition & 1 deletion libs/iqm/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ local function load_data(file)

-- Make sure it's a valid IQM file
if not is_buffer then
assert(love.filesystem.isFile(file), ("File %s not found"):format(file))
assert(love.filesystem.getInfo(file, "file"), string.format("File %s not found", file))
assert(check_magic(love.filesystem.read(file, 16)))
end

Expand Down
29 changes: 0 additions & 29 deletions libs/love3d/LICENSE.md

This file was deleted.

Loading