Skip to content

[Merged by Bors] - Port bevy_gltf to pipelined-rendering#2537

Closed
superdump wants to merge 2 commits intobevyengine:pipelined-renderingfrom
superdump:bevy_gltf2
Closed

[Merged by Bors] - Port bevy_gltf to pipelined-rendering#2537
superdump wants to merge 2 commits intobevyengine:pipelined-renderingfrom
superdump:bevy_gltf2

Conversation

@superdump
Copy link
Copy Markdown
Contributor

Objective

Port bevy_gltf to the pipelined-rendering branch.

Solution

crates/bevy_gltf has been copied and pasted into pipelined/bevy_gltf2 and modifications were made to work with the pipelined-rendering branch. Notably vertex tangents and vertex colours are not supported.

@alice-i-cecile alice-i-cecile added A-Assets Load files from disk to use for things like images, models, and sounds A-Rendering Drawing game state to the screen C-Feature A new feature, making something new possible labels Jul 24, 2021
@alice-i-cecile alice-i-cecile added this to the Bevy 0.6 milestone Jul 24, 2021
@cart cart force-pushed the pipelined-rendering branch from 05bd717 to 955c79f Compare July 24, 2021 23:51
@superdump
Copy link
Copy Markdown
Contributor Author

I did diff pipelined/bevy_gltf2 against crates/bevy_gltf to try to catch changes since the original branch was made. There were a few including the addition of the Apache 2.0 license.

@cart
Copy link
Copy Markdown
Member

cart commented Jul 29, 2021

bors r+

@cart
Copy link
Copy Markdown
Member

cart commented Jul 29, 2021

bors r-

@bors
Copy link
Copy Markdown
Contributor

bors bot commented Jul 29, 2021

Canceled.

@cart
Copy link
Copy Markdown
Member

cart commented Jul 29, 2021

bors r+

@cart
Copy link
Copy Markdown
Member

cart commented Jul 29, 2021

Haha CI demands that you add the new pipelined gltf example to the "examples" readme.

@bors
Copy link
Copy Markdown
Contributor

bors bot commented Jul 29, 2021

Canceled.

@cart
Copy link
Copy Markdown
Member

cart commented Jul 29, 2021

bors r+

bors bot pushed a commit that referenced this pull request Jul 29, 2021
# Objective

Port bevy_gltf to the pipelined-rendering branch.

## Solution

crates/bevy_gltf has been copied and pasted into pipelined/bevy_gltf2 and modifications were made to work with the pipelined-rendering branch. Notably vertex tangents and vertex colours are not supported.

Co-authored-by: Carter Anderson <[email protected]>
@bors
Copy link
Copy Markdown
Contributor

bors bot commented Jul 29, 2021

Canceled.

@cart
Copy link
Copy Markdown
Member

cart commented Jul 29, 2021

bors r+

bors bot pushed a commit that referenced this pull request Jul 29, 2021
# Objective

Port bevy_gltf to the pipelined-rendering branch.

## Solution

crates/bevy_gltf has been copied and pasted into pipelined/bevy_gltf2 and modifications were made to work with the pipelined-rendering branch. Notably vertex tangents and vertex colours are not supported.

Co-authored-by: Carter Anderson <[email protected]>
@bors
Copy link
Copy Markdown
Contributor

bors bot commented Jul 29, 2021

Timed out.

@cart
Copy link
Copy Markdown
Member

cart commented Jul 30, 2021

bors retry

bors bot pushed a commit that referenced this pull request Jul 30, 2021
# Objective

Port bevy_gltf to the pipelined-rendering branch.

## Solution

crates/bevy_gltf has been copied and pasted into pipelined/bevy_gltf2 and modifications were made to work with the pipelined-rendering branch. Notably vertex tangents and vertex colours are not supported.

Co-authored-by: Carter Anderson <[email protected]>
@bors
Copy link
Copy Markdown
Contributor

bors bot commented Jul 30, 2021

Build failed:

@cart
Copy link
Copy Markdown
Member

cart commented Jul 30, 2021

bors r+

bors bot pushed a commit that referenced this pull request Jul 30, 2021
# Objective

Port bevy_gltf to the pipelined-rendering branch.

## Solution

crates/bevy_gltf has been copied and pasted into pipelined/bevy_gltf2 and modifications were made to work with the pipelined-rendering branch. Notably vertex tangents and vertex colours are not supported.
@bors
Copy link
Copy Markdown
Contributor

bors bot commented Jul 30, 2021

Build failed:

@cart
Copy link
Copy Markdown
Member

cart commented Jul 30, 2021

bors r+

bors bot pushed a commit that referenced this pull request Jul 30, 2021
# Objective

Port bevy_gltf to the pipelined-rendering branch.

## Solution

crates/bevy_gltf has been copied and pasted into pipelined/bevy_gltf2 and modifications were made to work with the pipelined-rendering branch. Notably vertex tangents and vertex colours are not supported.
@cart
Copy link
Copy Markdown
Member

cart commented Jul 30, 2021

Added the clippy fixes from main to pipelined-rendering. Hopefully this works now!

@bors
Copy link
Copy Markdown
Contributor

bors bot commented Jul 30, 2021

Build failed:

@cart
Copy link
Copy Markdown
Member

cart commented Jul 30, 2021

This is what I get for being lazy and not just running rustup + testing locally 😄

@cart
Copy link
Copy Markdown
Member

cart commented Jul 30, 2021

bors r+

bors bot pushed a commit that referenced this pull request Jul 30, 2021
# Objective

Port bevy_gltf to the pipelined-rendering branch.

## Solution

crates/bevy_gltf has been copied and pasted into pipelined/bevy_gltf2 and modifications were made to work with the pipelined-rendering branch. Notably vertex tangents and vertex colours are not supported.

Co-authored-by: Carter Anderson <[email protected]>
@bors
Copy link
Copy Markdown
Contributor

bors bot commented Jul 30, 2021

Pull request successfully merged into pipelined-rendering.

Build succeeded:

@bors bors bot changed the title Port bevy_gltf to pipelined-rendering [Merged by Bors] - Port bevy_gltf to pipelined-rendering Jul 30, 2021
@bors bors bot closed this Jul 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-Assets Load files from disk to use for things like images, models, and sounds A-Rendering Drawing game state to the screen C-Feature A new feature, making something new possible

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants