-
Notifications
You must be signed in to change notification settings - Fork 2
background_image example in python #46
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
Merged
+141
−17
Merged
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
a2d296e
add image method to python lib
catilac d7f0235
Add custom asset path for python
catilac caaf028
Get absolute path of directory of sketch being run
catilac 27e78b9
Set asset directory and load assets from there
catilac 493f08e
ohhh okay unary tuple hey girl
catilac 9d86cd6
Config HashMap
catilac 2a2e1fa
Pass config arg in FFI layer
catilac 5adb785
Clippy. also wow rust is cool
catilac fdc9aee
Remove duplicate assets folder
catilac bd30e88
Remove unnecessary cfg conditionals for Config and pass ::default()
catilac a019405
Make `Config` a bevy Resource; remove python feature
catilac 44dcfa6
update init in processing_ffi
catilac 0d361a9
[pyo3] get_asset_root helper method
catilac a27312f
set PROCESSING_ASSET_ROOT with justfile
catilac ae433dd
Check for PROCESSING_ASSET_ROOT when running python
catilac File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| from processing import * | ||
|
|
||
| def setup(): | ||
| size(800, 600) | ||
|
|
||
| def draw(): | ||
| background(220) | ||
| image("images/logo.png") | ||
|
|
||
|
|
||
| # TODO: this should happen implicitly on module load somehow | ||
| run() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| //! Options object for configuring various aspects of libprocessing. | ||
| //! | ||
| //! To add a new Config just add a new enum with associated value | ||
|
|
||
| use bevy::prelude::Resource; | ||
| use std::collections::HashMap; | ||
|
|
||
| #[derive(Clone, Hash, Eq, PartialEq)] | ||
| pub enum ConfigKey { | ||
| AssetRootPath, | ||
| } | ||
|
|
||
| // TODO: Consider Box<dyn Any> instead of String | ||
| #[derive(Resource)] | ||
| pub struct Config { | ||
| map: HashMap<ConfigKey, String>, | ||
| } | ||
|
|
||
| impl Clone for Config { | ||
| fn clone(&self) -> Self { | ||
| Config { | ||
| map: self.map.clone(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl Config { | ||
| pub fn new() -> Self { | ||
| // TODO consider defaults | ||
| Config { | ||
| map: HashMap::new(), | ||
| } | ||
| } | ||
|
|
||
| pub fn get(&self, k: ConfigKey) -> Option<&String> { | ||
| self.map.get(&k) | ||
| } | ||
|
|
||
| pub fn set(&mut self, k: ConfigKey, v: String) { | ||
| self.map.insert(k, v); | ||
| } | ||
| } | ||
|
|
||
| impl Default for Config { | ||
| fn default() -> Self { | ||
| Self::new() | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| pub use bevy::prelude::default; | ||
| pub use processing_render::{render::command::DrawCommand, *}; | ||
| pub use processing_render::{config::*, render::command::DrawCommand, *}; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This name (
"assets_directory") might be confusing for contributors coming from bevy (as that's canonicallyassets/) but I can't think of a better name off the top of my head.