Commit graph

347 commits

Author SHA1 Message Date
Carter Anderson
4435d536e8 change clear color 2020-03-29 01:52:06 -07:00
Carter Anderson
f814695b00 everything is a plugin! 2020-03-29 01:49:35 -07:00
Carter Anderson
3d261f72de move plugin to app module 2020-03-29 01:15:47 -07:00
Carter Anderson
e2393de97c move plugin to core 2020-03-29 01:04:27 -07:00
Carter Anderson
45d4f25a93 WinitPlugin 2020-03-29 00:53:47 -07:00
Carter Anderson
ec84a33b43 everything is a plugin
... well almost everything
2020-03-28 23:18:33 -07:00
Carter Anderson
5db5f6de9c batched draw target works! embrace the "log" crate 2020-03-28 20:33:11 -07:00
Carter Anderson
2d0bff97a8 Handle::from_untyped 2020-03-28 14:51:24 -07:00
Carter Anderson
ed9eb88835 only create wgpu swap chain when surface is ready 2020-03-28 13:57:41 -07:00
Carter Anderson
26ff878469 add default diagnostics wait time 2020-03-28 13:55:55 -07:00
Carter Anderson
38a808db84 change diagnostics formatting 2020-03-28 13:42:16 -07:00
Carter Anderson
78de2fe2a1 fix dynamic uniforms and unit tests 2020-03-27 22:41:45 -07:00
Carter Anderson
a7704fda31 make winit optional and vsync configurable 2020-03-27 17:43:03 -07:00
Carter Anderson
93bf728475 new Diagnostics system 2020-03-27 15:03:47 -07:00
Carter Anderson
0073f4a58b refactor pipeline compilation into PipelineCompiler 2020-03-26 23:40:25 -07:00
Carter Anderson
d1db46ef54 begin bind group rework
global and local bind groups are set up the same way (RenderResourceAssignments).  bind groups are reused whenever possible
2020-03-26 01:57:36 -07:00
Carter Anderson
0316efc909 add core Window resource 2020-03-25 21:27:32 -07:00
Carter Anderson
c2545fd161 RenderResourceSetId 2020-03-25 19:20:52 -07:00
Carter Anderson
aec817c533 Rename BindGroup to BindGroupDescriptor. Add BindGroupDescriptorId 2020-03-25 18:17:48 -07:00
Carter Anderson
47ef339e7b remove BindGroupInfo 2020-03-25 17:40:14 -07:00
Carter Anderson
64cd924413 refactor render resource assignments 2020-03-25 17:31:59 -07:00
Carter Anderson
e523dc92d8 shader_def: use to_upper instead of to_screaming_snake 2020-03-25 13:24:17 -07:00
Carter Anderson
4d17763c85 finish new uniform resource provider staging buffer. dynamic uniforms work again. both dynamic and non-dynamic uniforms perform better than the previous implementation. 2020-03-24 19:17:41 -07:00
Carter Anderson
c71b886165 begin rewrite of UniformResourceProvider (no instancing or dynamic uniform support yet) 2020-03-24 13:50:40 -07:00
Carter Anderson
55745b0812 renderable owns render resource assignments. refactor shader assignment logic. renderers are responsible for intializing during updates. 2020-03-22 18:22:35 -07:00
Carter Anderson
55130bbe1c remove field_infos from UniformInfoIter 2020-03-22 13:14:34 -07:00
Carter Anderson
08cd5964a4 get_field_info is now static 2020-03-22 13:08:20 -07:00
Carter Anderson
0e18c4b70b fix render graph lifetimes 2020-03-22 13:05:50 -07:00
Carter Anderson
a0fa4d2d79 cargo fmt 2020-03-22 11:06:08 -07:00
Carter Anderson
eaff311a80 simplify render graph builder interface 2020-03-22 03:06:08 -07:00
Carter Anderson
c6d7402318 add bevy_derive to prelude 2020-03-22 01:33:53 -07:00
Carter Anderson
8c201dcbc5 fix LocalToWorld vertex buffer attribute names 2020-03-22 01:13:45 -07:00
Carter Anderson
cfc7aae413 better batch iteration (no allocations + abstracted out) 2020-03-22 01:06:38 -07:00
Carter Anderson
c9aec26f88 CommandBufferBuilder and setup systems 2020-03-21 22:35:57 -07:00
Carter Anderson
d2e160d44a refactor cameras. add defaults 2020-03-21 21:55:33 -07:00
Carter Anderson
fb496a6172 validate VertexBufferDescriptors and fill in blanks when possible 2020-03-21 21:10:58 -07:00
Carter Anderson
a4eed18800 RenderGraph is now a Resource. RenderGraph owns vertex buffer descriptors. Assorted cleanup 2020-03-21 19:57:59 -07:00
Carter Anderson
7660b8bf3f batched resource creation, vertex buffer macro 2020-03-21 18:12:30 -07:00
Carter Anderson
a55053cf14 Refactor / cleanup buffer metadata. Fix dynamic uniforms 2020-03-20 19:32:59 -07:00
Carter Anderson
ae0d5abf45 use RenderResourceAssignments in place of Entity 2020-03-20 17:49:29 -07:00
Carter Anderson
f90205a40d RenderResourceAssignmentsProvider / unique ids 2020-03-20 17:15:56 -07:00
Carter Anderson
71d091e10c entities with renderable.is_instanced are now removed from normal rendering 2020-03-20 16:58:21 -07:00
Carter Anderson
cbba656f16 replace appbuilder::new() with app::build() 2020-03-20 16:35:19 -07:00
Carter Anderson
43e69484ba migrate entity render resources to RenderResourceAssignments 2020-03-20 14:17:50 -07:00
Carter Anderson
9881f64715 cargo fmt 2020-03-20 12:47:33 -07:00
Carter Anderson
ae72c2cdb0 Refactor and integrate AssetBatcher. Add AssignedBatchesDrawTarget shim 2020-03-19 17:57:07 -07:00
Carter Anderson
99983b40a5 AssetBatcher 2020-03-19 13:21:55 -07:00
Carter Anderson
1e1980bf4d support tags in entity archetypes 2020-03-18 16:06:33 -07:00
Carter Anderson
04590de678 separate albedo color and make it required
I worked really hard to make ColorSource work, but sadly we need color to be instanceable and making it optional would add too much complexity. Maybe at some point in the future we can add it back. On the plus side, albedo color now modulates the albedo texture
2020-03-17 22:02:01 -07:00
Carter Anderson
d9663d740b AsUniforms provide VertexBufferDescriptor. Initial macro work 2020-03-17 18:25:27 -07:00
Carter Anderson
28fb0fdfc8 Reflect Vertex Buffer Attributes
Must follow VertexBufferDescriptorName_AttributeName format

I_VertexBufferDescriptorName_AttributeName indicates that an attribute is instanced

Currently all attributes must be defined in shaders or offsets will be incorrect.
2020-03-17 13:20:54 -07:00
Carter Anderson
62d1e710a5 rename vertex_buffer to instanceable 2020-03-16 12:15:51 -07:00
Carter Anderson
0ba48ed83a use dynamic uniforms by default for Handle<T> 2020-03-16 01:49:31 -07:00
Carter Anderson
5d99f3a7e8 Add Handle<T> support to uniform resource provider. Use Handle<StandardMaterial> instead of StandardMaterial 2020-03-16 00:45:28 -07:00
Carter Anderson
1332630fa3 tweaks 2020-03-15 01:12:56 -07:00
Carter Anderson
4d92ef0119 zero copy uniform bytes 2020-03-14 18:32:33 -07:00
Carter Anderson
63f40589e3 begin instancing work 2020-03-14 12:58:22 -07:00
Carter Anderson
56e79d5225 reorganize texture and mesh 2020-03-14 12:56:37 -07:00
Carter Anderson
0c3e83452d remove empty buffer warning because its too noisey 2020-03-11 18:19:02 -07:00
Carter Anderson
ad654a3c25 add fps printer system to diagnostics mod 2020-03-11 01:44:46 -07:00
Carter Anderson
41e15a2d90 make wgpu renderer optional 2020-03-10 22:20:49 -07:00
Carter Anderson
64b897016c swap out remaining wgpu references 2020-03-10 21:57:57 -07:00
Carter Anderson
7342f96174 named pipelines (makes custom shaders easier) 2020-03-10 02:46:27 -07:00
Carter Anderson
fb4752532b rename pipelinebuilder.build() to finish() 2020-03-10 02:16:01 -07:00
Carter Anderson
cfaee577e7 move bind type 2020-03-10 02:10:44 -07:00
Carter Anderson
d08b243317 cargo fmt 2020-03-10 01:52:28 -07:00
Carter Anderson
4eaf730b8a add default draw target impl 2020-03-10 01:51:59 -07:00
Carter Anderson
1ac33b1477 add default resource provider impls 2020-03-10 01:51:06 -07:00
Carter Anderson
aca17f15b7 start moving away from wgpu types 2020-03-10 00:53:07 -07:00
Carter Anderson
99cdf56e7d add Color type 2020-03-09 23:43:40 -07:00
Carter Anderson
aa09e93980 reorganize render modules 2020-03-09 23:08:09 -07:00
Carter Anderson
440d883322 use static dispatch in add_resource_provider 2020-03-09 12:07:16 -07:00
Carter Anderson
7d3f271cfa fix resources name 2020-03-09 11:56:45 -07:00
Carter Anderson
fc5d8061d5 cargo fmt 2020-03-09 02:08:44 -07:00
Carter Anderson
e4550aaab2 tweak add_children 2020-03-09 02:08:27 -07:00
Carter Anderson
8eec5653b6 rename add_archetype to add_entity 2020-03-09 02:02:17 -07:00
Carter Anderson
a790332505 better parenting ergonomics in world builder 2020-03-09 02:00:59 -07:00
Carter Anderson
f6dd6a5ca9 fix parenting example, add missing transform components, add parenting to world builder 2020-03-09 01:31:15 -07:00
Carter Anderson
6ef1c099ff upgrade bevy_legion / re-apply fork 2020-03-09 00:47:58 -07:00
Carter Anderson
9355a53980 upgrade legion (breaks plugins) 2020-03-08 23:19:07 -07:00
Carter Anderson
c5f781b4e5 fix ui draw target 2020-03-08 20:27:07 -07:00
Carter Anderson
e0a1a83bc9 create entities as a separate step before starting a render pass 2020-03-08 20:06:59 -07:00
Carter Anderson
cadea8deb0 Break up wgpu renderer 2020-03-08 19:26:50 -07:00
Carter Anderson
85c880e754 upgrade wgpu. work around new wgpu lifetimes (this was painful) 2020-03-05 00:55:34 -08:00
Carter Anderson
8beed27c0e wgpu resources are separated 2020-03-05 00:55:34 -08:00
Carter Anderson
b64f51d10b try breaking out wgpu resources 2020-03-05 00:55:34 -08:00
Carter Anderson
baac7ff296 add png image loading and enable transparency 2020-03-02 20:33:46 -08:00
Carter Anderson
22be0b3366 reset uniform count on each update (oops) 2020-03-02 08:32:15 -08:00
Carter Anderson
ca563ea1b3 fix uniform providers with different field sets 2020-03-02 00:19:28 -08:00
Carter Anderson
5154320f70 textures work! 2020-03-01 17:48:37 -08:00
Carter Anderson
8d3026899d more texture work 2020-03-01 10:22:58 -08:00
Carter Anderson
9e5f4aeefc implement Copy for Handle 2020-02-23 23:50:44 -08:00
Carter Anderson
1a4bd98434 more texture work 2020-02-23 23:41:48 -08:00
Carter Anderson
79c900bc2d RenderResource ids 2020-02-23 21:13:03 -08:00
Carter Anderson
f84e71d051 cargo fmt 2020-02-22 15:02:01 -08:00
Carter Anderson
7eb99f3eb5 finish uniform names refactor 2020-02-22 15:01:11 -08:00
Carter Anderson
ba1f48f743 start working out field bind type info 2020-02-22 12:42:40 -08:00
Carter Anderson
65284fcacb more work on texture bindings 2020-02-21 00:15:24 -08:00
Carter Anderson
fb61204d53 start working out how AsUNiforms works with textures 2020-02-20 21:52:45 -08:00
Carter Anderson
4eaae0f815 add texture and sampler shader reflection 2020-02-19 00:24:59 -08:00
Carter Anderson
2f1a0cb4a4 macros are now fully screaming snake 2020-02-18 22:59:33 -08:00
Carter Anderson
8a10c06ad5 add texture to frag shader. fix weird macro name collision bug 2020-02-18 20:26:02 -08:00
Carter Anderson
a1b9e3a7a5 add shader_def to albedo ColorSource and auto import trait in macro 2020-02-18 19:08:17 -08:00
Carter Anderson
b809b22589 add ColorSource and remove test macro from StandardMaterial 2020-02-18 09:16:34 -08:00
Carter Anderson
f820e4207c add macro example to custom_shader 2020-02-18 09:06:24 -08:00
Carter Anderson
e0e0e41c33 Add "standard config" to pipeline builder 2020-02-17 20:43:50 -08:00
Carter Anderson
ad7acb111a fix custom_shader example 2020-02-17 20:23:00 -08:00
Carter Anderson
6cf981c610 use full path in macro references 2020-02-17 19:53:48 -08:00
Carter Anderson
a76b40bbb4 Fix pipeline name 2020-02-17 19:15:28 -08:00
Carter Anderson
57f798c0bd cleanup 2020-02-17 19:06:12 -08:00
Carter Anderson
6f376b5f3f remove old render graph 2020-02-17 18:36:31 -08:00
Carter Anderson
acebeb924c shader reflection for dynamic uniforms 2020-02-17 16:33:46 -08:00
Carter Anderson
2fe9710c04 Shader reflection works for everything but dynamic uniforms 2020-02-17 14:12:10 -08:00
Carter Anderson
c29a6f7dd2 more shader reflection 2020-02-16 20:35:44 -08:00
Carter Anderson
8698dcea25 start work on shader reflection 2020-02-16 12:12:55 -08:00
Carter Anderson
c208945833 add assigned meshes render target
dynamic compiling w/ entity-specifc macros works!
2020-02-15 22:17:24 -08:00
Carter Anderson
56e5414b63 only update pipelines when macros change. better handle debug print 2020-02-15 19:00:30 -08:00
Carter Anderson
26588d0c41 make pipelines cloneable and draw_target a part of render_graph 2020-02-15 17:08:46 -08:00
Carter Anderson
4de039eb71 Make PipelineDescriptor an Asset that references Handle<Shader> 2020-02-15 16:28:17 -08:00
Carter Anderson
478d475219 more shader assignment work 2020-02-15 13:58:40 -08:00
Carter Anderson
e38d3be0e3 move wgpu shader code out of Shader 2020-02-13 09:17:18 -08:00
Carter Anderson
7759fdefac collect uniform shader_defs in preparation for on-demand shader compiling 2020-02-12 17:58:58 -08:00
Carter Anderson
edf57c0dd3 rename entitybuilder to worldbuilder 2020-02-11 19:39:10 -08:00
Carter Anderson
649e1b113f add world.insert passthrough to entitybuilder 2020-02-11 19:37:48 -08:00
Carter Anderson
f24a274a2a add renderable to render related queries 2020-02-11 19:09:05 -08:00
Carter Anderson
7cdc2351ba add default to MeshEntity 2020-02-11 18:29:39 -08:00
Carter Anderson
eedec80e89 add shader def fields / proc macro 2020-02-10 19:26:04 -08:00
Carter Anderson
4a12d16307 add uniform field attribute 2020-02-09 21:41:51 -08:00
Carter Anderson
c1bac8869e move uniforms around 2020-02-09 18:09:54 -08:00
Carter Anderson
5b48de96db Add Uniforms proc macro 2020-02-09 18:04:18 -08:00
Carter Anderson
a721f3595d rustfmt: use field init shorthand 2020-02-09 11:43:45 -08:00
Carter Anderson
76d5f6057c add rustfmt.toml and set merge_imports to true 2020-02-09 11:42:26 -08:00
Carter Anderson
5306fa36fa break up shader mod 2020-02-08 17:17:07 -08:00
Carter Anderson
428bb985c4 move mesh draw target to draw target folder 2020-02-08 15:42:07 -08:00
Carter Anderson
ebcb925d6f remove broken import 2020-02-08 15:31:38 -08:00
Carter Anderson
c604843b54 move uniform resource provider to resource provider folder 2020-02-08 15:07:57 -08:00
Carter Anderson
8f1c9e9333 remove super 2020-02-07 23:18:53 -08:00
Carter Anderson
3b0b40a79d cargo fmt 2020-02-07 23:17:51 -08:00
Carter Anderson
f68909ac00 reorganize 2020-02-07 23:15:35 -08:00
Carter Anderson
88ecc9ed43 port ui over to new render graph 2020-02-07 22:42:30 -08:00
Carter Anderson
be1a878943 fix forward flat depth 2020-02-06 08:56:44 -08:00
Carter Anderson
aab7034e99 FrameTexture resource providers 2020-02-05 18:59:09 -08:00
Carter Anderson
8c831845f9 initial texture support 2020-02-05 17:50:56 -08:00
Carter Anderson
6d0661d299 fix lights 2020-02-05 11:02:53 -08:00
Carter Anderson
489580f688 port forward lighting and add struct + array uniforms 2020-02-05 09:59:36 -08:00
Carter Anderson
380e59ee23 begin porting over lighting 2020-02-04 23:14:13 -08:00
Carter Anderson
48e8967acc use staging buffer and add command encoder for resize events 2020-02-04 22:07:02 -08:00
Carter Anderson
c3a388b1b9 add some perf notes 2020-02-04 18:48:42 -08:00
Carter Anderson
b32c80ceba add todo 2020-02-04 09:41:05 -08:00
Carter Anderson
dff18f78db slightly optimize UniformResourceProvider 2020-02-04 09:39:23 -08:00