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.

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

4 -> 5 #330

Merged
merged 12 commits into from
Jun 4, 2021
Merged

4 -> 5 #330

merged 12 commits into from
Jun 4, 2021

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Jun 3, 2021

➡️ Forward port

Port ign-rendering4 to ign-rendering5

Branch comparison: ign-rendering5...ign-rendering4

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

WilliamLewww and others added 12 commits March 30, 2021 20:16
* update texture size

Signed-off-by: Ian Chen <[email protected]>

* set cap to 1024

Signed-off-by: Ian Chen <[email protected]>

* set min tex size

Signed-off-by: Ian Chen <[email protected]>
* update test

Signed-off-by: Ian Chen <[email protected]>

* reenable macos test

Signed-off-by: Ian Chen <[email protected]>

* fix typo

Signed-off-by: Ian Chen <[email protected]>
* Added example for custom shaders with different uniform types

Signed-off-by: William Lew <[email protected]>

* Added buffer shader parameter

Signed-off-by: William Lew <[email protected]>

* Added ogre uniform buffer update

Signed-off-by: William Lew <[email protected]>

* Fixed uninitialized variables

Signed-off-by: William Lew <[email protected]>

* Added matrix uniform update

Signed-off-by: William Lew <[email protected]>

* Fixed shader paths

Signed-off-by: William Lew <[email protected]>

* Added command line argument to pick version of Ogre (#277)

Signed-off-by: WilliamLewww <[email protected]>
Signed-off-by: William Lew <[email protected]>

* Fixed C-style cast and formatting issues

Signed-off-by: William Lew <[email protected]>

* Changed raw pointer buffer to shared pointer buffer

Signed-off-by: William Lew <[email protected]>

* Specified uniform buffer to be a word buffer

Signed-off-by: William Lew <[email protected]>

* Fixed codecheck errors

Signed-off-by: William Lew <[email protected]>

* Added documentation for word buffer

Signed-off-by: William Lew <[email protected]>

* Added tests for word buffer shader parameter

Signed-off-by: William Lew <[email protected]>

* Fixed updating int uniform buffer

Signed-off-by: William Lew <[email protected]>

* Added tests for int and float uniform buffers

Signed-off-by: William Lew <[email protected]>

* Updated example to show different types of uniforms

Signed-off-by: William Lew <[email protected]>

* Apply suggestions from code review

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: William Lew <[email protected]>

* Apply style suggestions

Signed-off-by: William Lew <[email protected]>

* Removed support for engines other than OGRE1

Signed-off-by: William Lew <[email protected]>

* Changed "WordBuffer" to "Buffer"

Signed-off-by: William Lew <[email protected]>

* Removed raw pointer when getting buffer

Signed-off-by: William Lew <[email protected]>

* Added windows support

Signed-off-by: William Lew <[email protected]>

* Fixed code check formatting issues

Signed-off-by: William Lew <[email protected]>

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>

Co-authored-by: Ian Chen <[email protected]>
* Include MoveTo Helper class to ign-rendering

Signed-off-by: ahcorde <[email protected]>

* make linters happy

Signed-off-by: ahcorde <[email protected]>

* Added feedback

Signed-off-by: ahcorde <[email protected]>

* Added MoveToHelper test

Signed-off-by: ahcorde <[email protected]>

* Added feedback

Signed-off-by: ahcorde <[email protected]>

* timeout as arg

Signed-off-by: ahcorde <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
3 ➡️  4
@github-actions github-actions bot added the 🏢 edifice Ignition Edifice label Jun 3, 2021
@codecov
Copy link

codecov bot commented Jun 3, 2021

Codecov Report

Merging #330 (fd9c3ab) into ign-rendering5 (e452c39) will increase coverage by 5.30%.
The diff coverage is 71.11%.

Impacted file tree graph

@@                Coverage Diff                 @@
##           ign-rendering5     #330      +/-   ##
==================================================
+ Coverage           52.52%   57.82%   +5.30%     
==================================================
  Files                 143      161      +18     
  Lines               13274    15803    +2529     
==================================================
+ Hits                 6972     9138    +2166     
- Misses               6302     6665     +363     
Impacted Files Coverage Δ
include/ignition/rendering/ArrowVisual.hh 100.00% <ø> (ø)
include/ignition/rendering/AxisVisual.hh 100.00% <ø> (ø)
include/ignition/rendering/Camera.hh 100.00% <ø> (ø)
include/ignition/rendering/CompositeVisual.hh 100.00% <ø> (ø)
include/ignition/rendering/Geometry.hh 100.00% <ø> (ø)
include/ignition/rendering/GpuRays.hh 0.00% <ø> (ø)
include/ignition/rendering/Image.hh 100.00% <ø> (ø)
include/ignition/rendering/Light.hh 100.00% <ø> (ø)
include/ignition/rendering/Material.hh 100.00% <ø> (ø)
include/ignition/rendering/Mesh.hh 100.00% <ø> (ø)
... and 126 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 80101bb...fd9c3ab. Read the comment docs.

@iche033 iche033 merged commit fe9b5b3 into ign-rendering5 Jun 4, 2021
@iche033 iche033 deleted the merge_4_5_060321 branch June 4, 2021 16:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏢 edifice Ignition Edifice
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants