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.

Sign up for GitHub

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

Jump to bottom

[Merged by Bors] - Move import_path definitions into shader source #3976

Closed
wants to merge 1 commit into from
Closed

[Merged by Bors] - Move import_path definitions into shader source #3976

wants to merge 1 commit into from

Conversation

cart
Copy link
Member

@cart cart commented Feb 18, 2022

This enables shaders to (optionally) define their import path inside their source. This has a number of benefits:

  1. enables users to define their own custom paths directly in their assets
  2. moves the import path "close" to the asset instead of centralized in the plugin definition, which seems "better" to me.
  3. makes "internal hot shader reloading" way more reasonable (see [Merged by Bors] - Internal Asset Hot Reloading #3966)
  4. logically opens the door to importing "parts" of a shader by defining "import_path blocks".
#define_import_path bevy_pbr::mesh_struct

struct Mesh {
    model: mat4x4<f32>;
    inverse_transpose_model: mat4x4<f32>;
    // 'flags' is a bit field indicating various options. u32 is 32 bits so we have up to 32 options.
    flags: u32;
};

let MESH_FLAGS_SHADOW_RECEIVER_BIT: u32 = 1u;

@cart cart added the A-Rendering Drawing game state to the screen label Feb 18, 2022
@github-actions github-actions bot added the S-Needs-Triage This issue needs to be labelled label Feb 18, 2022
@cart cart mentioned this pull request Feb 18, 2022
Closed
@cart cart removed the S-Needs-Triage This issue needs to be labelled label Feb 18, 2022
@cart
Copy link
Member Author

cart commented Feb 18, 2022

bors r+

bors bot pushed a commit that referenced this pull request Feb 18, 2022
@cart
Move import_path definitions into shader source (#3976)
e9f52b9 
This enables shaders to (optionally) define their import path inside their source. This has a number of benefits:

1. enables users to define their own custom paths directly in their assets
2. moves the import path "close" to the asset instead of centralized in the plugin definition, which seems "better" to me. 
3. makes "internal hot shader reloading" way more reasonable (see #3966)
4. logically opens the door to importing "parts" of a shader by defining "import_path blocks".

```rust
#define_import_path bevy_pbr::mesh_struct

struct Mesh {
    model: mat4x4<f32>;
    inverse_transpose_model: mat4x4<f32>;
    // 'flags' is a bit field indicating various options. u32 is 32 bits so we have up to 32 options.
    flags: u32;
};

let MESH_FLAGS_SHADOW_RECEIVER_BIT: u32 = 1u;
```
@bors
Copy link
Contributor

bors bot commented Feb 18, 2022

Pull request successfully merged into main.

Build succeeded:

@bors bors bot changed the title Move import_path definitions into shader source [Merged by Bors] - Move import_path definitions into shader source Feb 18, 2022
@bors bors bot closed this Feb 18, 2022
molikto pushed a commit to molikto/bevy that referenced this pull request Feb 20, 2022
@cart @molikto
Move import_path definitions into shader source (bevyengine#3976)
5de2f29 
This enables shaders to (optionally) define their import path inside their source. This has a number of benefits:

1. enables users to define their own custom paths directly in their assets
2. moves the import path "close" to the asset instead of centralized in the plugin definition, which seems "better" to me. 
3. makes "internal hot shader reloading" way more reasonable (see bevyengine#3966)
4. logically opens the door to importing "parts" of a shader by defining "import_path blocks".

```rust
#define_import_path bevy_pbr::mesh_struct

struct Mesh {
    model: mat4x4<f32>;
    inverse_transpose_model: mat4x4<f32>;
    // 'flags' is a bit field indicating various options. u32 is 32 bits so we have up to 32 options.
    flags: u32;
};

let MESH_FLAGS_SHADOW_RECEIVER_BIT: u32 = 1u;
```
kurtkuehnert pushed a commit to kurtkuehnert/bevy that referenced this pull request Mar 6, 2022
@cart
Move import_path definitions into shader source (bevyengine#3976)
0f4c765 
This enables shaders to (optionally) define their import path inside their source. This has a number of benefits:

1. enables users to define their own custom paths directly in their assets
2. moves the import path "close" to the asset instead of centralized in the plugin definition, which seems "better" to me. 
3. makes "internal hot shader reloading" way more reasonable (see bevyengine#3966)
4. logically opens the door to importing "parts" of a shader by defining "import_path blocks".

```rust
#define_import_path bevy_pbr::mesh_struct

struct Mesh {
    model: mat4x4<f32>;
    inverse_transpose_model: mat4x4<f32>;
    // 'flags' is a bit field indicating various options. u32 is 32 bits so we have up to 32 options.
    flags: u32;
};

let MESH_FLAGS_SHADOW_RECEIVER_BIT: u32 = 1u;
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@superdump superdump superdump approved these changes

Assignees
No one assigned
Labels
A-Rendering Drawing game state to the screen
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@cart @superdump