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

Integrate amethyst_renderer #7

Closed

omni-viral wants to merge 125 commits into ebkalderon:master from unknown repository

omni-viral commented Aug 15, 2017 •

edited

Edited 1 time

omni-viral edited Aug 15, 2017 (most recent)

Rebase "renderer" branch onto "develop"
MeshComponent, MaterialComponent, LightComponent
MechBuilder, TextureBuilder and MaterialBuilder can be Send + Sync + 'static now
Finishing MechBuilder and MaterialBuilder in RenderSystem
Populating Scene on each frame. Slow. Need rework here.
Examples fix

derekdreery and others added some commits Apr 25, 2017


      Add ecs resource for mouse movements

13f54c3


      Loading with serde, custom serialize for configurations

e372eb6


      Absolute paths in macro, no more need for imports to use it

c678bed


      Update to serde 0.9.6

a2157bc


      Remove amethyst_config from appveyor

4d5d64d


      Config macro documentation

952d90f


      Merge impl_config macro into the config macro

51f5049


      Documentation for directory and basic project structure

d192f07


      Debug for Project

029d3b6


      Clean up of project directory

62d4542


      Merge pull request #186 from derekdreery/inputhandler_mouse_move

Implement InputHandler for mouse movement

906b95c


      toml configuration files

54d5467


      Merge pull request #152 from Aceeri/project

Project module (Configuration rework)

a247def


      Core asset management

+ Adds a crate "amethyst-assets"
+ Example usage and README.md

This commit contains the core functionality
for asset management. This means that e.g.
formats or special syntax are to be done.

4a5c73e


      Rename Format::import to parse

97a2c45


      Input rebind patch (#247)

* Add input rebinding

* Correct lots of typos.

* Rewrite axis_value to be cleaner.

* Add _released functions to compliment _down functions.

* Remove outdated inline comment

* Rename functions to be less confusing.

* Add missing doc comments

1cc906d


      Fix input in pong example

df11b83


      Merge pull request #251 from omni-viral/pong_input

Fix input in pong example

cac6ca7


      Convert to specs v0.9 (#250)

* specs v0.9 compiled

* examples on specs v.0.9

* docs on specs v0.9

* Remove adding default system . Add  to . Fix formatting and commenting issues

* Sort imports. Remove unncesessary

* TransformSystem is not thread-local. Sorting stuff

* Add direct access to World

4e3d397


      Remove unnecessary unsafe Sync impl in Pong example

459c3de


      Separate lifetimes for Application

Expose InputHandler types

037cd79


      Merge pull request #253 from Aceeri/clean

Lifetimes for Application and Exposing InputHandler types


      Nearly there

bfca4f6


      Remove license files

f64fc70


      Use amethyst_assets as crate name

4430d88


      Reexport specs BoxedErr

3db07f5


      Fix Future::wait

20bd059


      Rename functions of Asset

This commit renames asset_loaded to cache
and cached to retrieve.

f56beee


      No nightly support (#254)

* Update readme

Add language to indicate we don't officially support nightly or beta branches of Rust.

* Update README.md

* Update CONTRIBUTING.md

* Change language to be a bit less harsh.

221982e


      Rename AssetFutureInner to AssetFutureCell

c4c3146


      Fix doc comment

aeb1358


      Make assets path relative to CARGO_MANIFEST_DIR

791018d


      Improve documentation

d4dde98


      Change axis behaviour from button down to pressed (#256)

c36359c


      Move config back into amethyst_config (#255)

* Move config back into its original crate so it can be used outside of amethyst

* Fix up documentation and examples for newer macro

* Travis develop branch specifier, alphabetical order for subcrates

e7cd9ff


      Address Eyal Kalderon's comments

5bd9b3c


      Merge branch 'develop' into assets

438e6fe


      Merge pull request #244 from torkleyy/assets

Core asset management

1b897a1


      Move config to root folder

ef532b6


      Input rebinding phase 2

b4f10c4

ebkalderon and others added some commits Apr 18, 2017


      Filter out disabled stages before applying pass

bbe9990


      Correct pass doc comments

5c75550


      Expand module comment in lib.rs

fe7223c


      Correct module comment in pipe/mod.rs

06bed5b


      Update dependencies, add cam.rs

Add several static methods to Rgba

Allow color::Rgba to be used in constant buffers

Rename encoder.rs to enc.rs, update Encoder type

Allow light types to be uploaded as constant buffers

Add &Scene to PostprocFn, add LightIter and MeshIter to Scene type

Derive Serialize, Deserialize for TextureBuilder

1d722a7


      Minor reformatting

3c4d774


      Update to winit 0.6 and glutin 0.8

b06916a


      Fix renderer examples, remove gfx_device module, hide some build meth…

…ods, test runtime PSO

0001dca


      Fix renderer examples, remove gfx_device module, hide some build meth…

…ods, test runtime PSO

cb0897d


      Update deps, add prelude.rs, add rust-derivative, add SystemExt trait…

…, basic Event and EventsIter code

3f54d04


      Reorganize according to #191, minor reformatting

b2d4704


      Add hidden Engine::new() ctor, tweak handle_event() match style, fix …

…state.rs tests

5eb2c0d


      Use Cargo workspace commands in .travis.yml

0f4714a


      Fix erroneous example in renderer docs, derive Copy for Time

a53aa88


      Remove extra import in pso.rs, hide MeshBuilder::build() and TextureB…

…uilder::build() methods

5c39b49


      Update renderer examples, add extra Into for ClearTarget pass

3aebf31


      Hide build() in stage.rs and target.rs, use to_string() and not from()

7cec9ee


      Hook up BlitBuffer pass prototype, fix profiler feature, adjust .giti…

…gnore

674949a


      Fix broken amethyst_renderer example, disable simd feature for cgmath

56a9e34


      Disable cgmath simd (b/c nightly), use derivative in renderer, add Ra…

…wGlobal to Effect, change EffectBuilder

9827be1


      Do not re-export thread_profiler crate

c7c026b


      Update hello_world.md

27971d1


      Use Arc<ThreadPool>, add dedicated RendererBuilder

e8c3f71


      Use pub(crate) and revise builder method names

39f156d


      Correct 'value' to 'map' in doc comment

25049ff


      Define Model, fix erroneous par_iter() usage, use pub(crate) in Material

f86db21


      Correct mixed indentation in pso.rs

ff4f442


      Update deps, remove unused types, add ShaderModel, add metal.rs, fix …

…spacing

51b6226


      Update doc comment in lib.rs

7038aeb


      Rendering stuff (#3)

* New DrawFlat pass. Example sphere works with DrawFlat

* Three pass kinds. Prep, Main and Post

* Implement some physically based rendering

* Revert unnecessary change

* Correct DrawFlat. Use size of vertex type from parameter.
Fix sphere example. Clear draw buffer.
Remove unnecessary 'use's

* Add new vertex format 'PosNormTangTex' which holds tangent vector along with normal.

* Correct default normal texture

* Accept tangent vector in shaders

* Correct fresnel calculation in pbm.glsl

* Use normal map in pbm.glsl
Use PosNormTangTex in material example

* Improve vertex attribute query by 'WithField' trait

* Make linking easier for users of 'Effect'

* Bound in 'Slice' instance in MeshBuilder::finish

* Fix data linking

* Move parts of shader algorithm into functions

* Apply passes in stage in sequence they were added. Use next slice of encoders for each pass (reusing last encoder from previous slice)

* Apply all parallelable passes with single for_each

* A little refactoring.

791ed4a


      Rebase on develop, more renderer refactoring

733d3c4


      Boost performance of examples, fix broken doc tests, tweak encoders_r…

…equired, use iterators in Stage::apply

11d936d


      Use collect(), add more doc comments, add enable/disable methods, ref…

…ormatting

33e40f4


      Fix over-eager collect() bug

5ac0222


      Minor formatting tweaks, more doc comments.

05dd2ed


      Make RendererBuilder and EffectBuilder non-consuming

b1874ad


      Integrate amethyst_renderer

46c8f8e


      Fix pong example

89c1be5

ebkalderon/amethyst forked from amethyst/amethyst

Integrate amethyst_renderer #7

omni-viral commented Aug 15, 2017 •

edited

Edited 1 time

omni-viral edited Aug 15, 2017 (most recent)

derekdreery and others added some commits Apr 25, 2017

ebkalderon and others added some commits Apr 18, 2017

omni-viral closed this Aug 15, 2017

omni-viral deleted the omni-viral:renderer_rebase branch Aug 15, 2017

ebkalderon/amethyst forked from amethyst/amethyst

Join GitHub today

Integrate amethyst_renderer #7

Conversation

omni-viral commented Aug 15, 2017 • edited Edited 1 time omni-viral edited Aug 15, 2017 (most recent)

derekdreery and others added some commits Apr 25, 2017

ebkalderon and others added some commits Apr 18, 2017

omni-viral closed this Aug 15, 2017

omni-viral deleted the omni-viral:renderer_rebase branch Aug 15, 2017

omni-viral commented Aug 15, 2017 •

edited

Edited 1 time

omni-viral edited Aug 15, 2017 (most recent)