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

5 -> 6 (main) #331

Merged
merged 15 commits into from
Jun 4, 2021
Merged

5 -> 6 (main) #331

merged 15 commits into from
Jun 4, 2021

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Jun 4, 2021

➡️ Forward port

Port ign-rendering5 to main

Branch comparison: main...ign-rendering5

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

WilliamLewww and others added 15 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 🏯 fortress Ignition Fortress label Jun 4, 2021
@codecov
Copy link

codecov bot commented Jun 4, 2021

Codecov Report

Merging #331 (63132ac) into main (3d93e9c) will increase coverage by 0.22%.
The diff coverage is 77.71%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #331      +/-   ##
==========================================
+ Coverage   57.69%   57.91%   +0.22%     
==========================================
  Files         160      162       +2     
  Lines       15992    16162     +170     
==========================================
+ Hits         9226     9361     +135     
- Misses       6766     6801      +35     
Impacted Files Coverage Δ
ogre/src/OgreMaterial.cc 37.23% <0.00%> (-1.68%) ⬇️
ogre/src/OgreMeshFactory.cc 1.06% <0.00%> (ø)
src/RenderingIface.cc 71.92% <53.57%> (-17.73%) ⬇️
src/MoveToHelper.cc 90.47% <90.47%> (ø)
include/ignition/rendering/MoveToHelper.hh 100.00% <100.00%> (ø)
ogre/src/OgreRenderEngine.cc 73.87% <100.00%> (+0.15%) ⬆️
ogre2/src/Ogre2Capsule.cc 61.01% <100.00%> (ø)
ogre2/src/Ogre2GpuRays.cc 94.94% <100.00%> (+0.16%) ⬆️
src/ShaderParam.cc 100.00% <100.00%> (ø)
... and 1 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 3d93e9c...63132ac. Read the comment docs.

@iche033 iche033 merged commit cbc35f8 into main Jun 4, 2021
@iche033 iche033 deleted the merge_5_6_060421 branch June 4, 2021 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants