Code

Add Ogre2Heightmap functionality#386

Code

Merged

iche033 merged 107 commits intogazebosim:maingazebosim/gz-rendering:mainfrom darksylinc:matias-ogre22-terradarksylinc/ign-rendering:matias-ogre22-terraCopy head branch name to clipboardSep 20, 2021

+8,306-57

Commits

Commits on Mar 23, 2021

• Ogre2.2

  Show description for 025f72a
  ahcorde

  committed
  025f72a

• Added media files

  Show description for 1cff215
  ahcorde

  committed
  1cff215

• Added Headless mode

  Show description for e5979b8
  ahcorde

  committed
  e5979b8

• Added feedback

  Show description for fc89bef
  ahcorde

  committed
  fc89bef

Commits on Mar 24, 2021

• Added feedback

  Show description for c5c077c
  ahcorde

  committed
  c5c077c

• Add OGRE2.2 to dependencies

  Show description for 8033623
  mjcarroll

  committed
  8033623

• Fixed GPUray and depthCamera test

  Show description for a82820c
  ahcorde

  committed
  a82820c

• Merge branch 'main' into ahcorde/update/ogre2.2

  ahcorde

  authored
  b5c639e

Commits on Mar 25, 2021

• cast based on pf

  Show description for b664ade
  iche033

  committed
  b664ade

• Fix cleanup with packaged debs

  Show description for d6808b8
  mjcarroll

  committed
  d6808b8

• fix copy raw data

  Show description for e940e9a
  iche033

  committed
  e940e9a

• Merge branch 'ahcorde/update/ogre2.2' of github.com:ignitionrobotics/ign-rendering into ahcorde/update/ogre2.2

  iche033

  committed
  92e8fbf

• fix material test

  Show description for 11cd876
  iche033

  committed
  11cd876

• Lint and compiler warning

  Show description for 88cfd40
  mjcarroll

  committed
  88cfd40

• Trim whitespace

  Show description for db609f3
  mjcarroll

  committed
  db609f3

• Apply gamma correction to sky

  Show description for bc12f40
  ahcorde

  committed
  bc12f40

• Merge branch 'ahcorde/update/ogre2.2' of https://github.com/ignitionrobotics/ign-rendering into ahcorde/update/ogre2.2

  ahcorde

  committed
  fcf51b1

• Test fixes to Ogre2.2 branch (gazebosim#279)

  Show description for 797675b
  mjcarroll

  authored
  797675b

• Merge branch 'main' into ahcorde/update/ogre2.2

  ahcorde

  authored
  7046608

• Revert gamma correction in the sky

  Show description for d55ee47
  ahcorde

  committed
  d55ee47

Commits on Apr 13, 2021

• Merge branch 'main' into ahcorde/update/ogre2.2

  iche033

  authored
  01aeec2

Commits on Apr 14, 2021

• enable grayscale albedo map to fix red color highlights and disable hardware gamma to fix dark sky color

  Show description for 62bb629
  iche033

  committed
  62bb629

Commits on May 4, 2021

• Merge branch 'main' into ahcorde/update/ogre2.2

  mjcarroll

  committed
  032ce0f

Commits on May 5, 2021

• Local updates for Ogre2.2 against main branch (gazebosim#317)

  Show description for adfdb05
  

  mjcarroll

  and

  iche033

  authored
  adfdb05

Commits on May 11, 2021

• Fix merge

  Show description for 24fb7df
  ahcorde

  committed
  24fb7df

• Merge branch 'main' into ahcorde/update/ogre2.2

  iche033

  committed
  72f23ab

• fix shadows in ogre 2.2

  Show description for 96b2eb5
  iche033

  committed
  96b2eb5

Commits on May 18, 2021

• Merge branch 'main' into ahcorde/update/ogre2.2

  mjcarroll

  authored
  5e2f7b5

Commits on May 24, 2021

• Merge branch 'main' into ahcorde/update/ogre2.2

  mjcarroll

  authored
  21b5993

• Lint

  Show description for c2bbbe9
  mjcarroll

  committed
  c2bbbe9

Commits on Jun 8, 2021

• fix toggling sky

  Show description for 2e9d62e
  iche033

  committed
  2e9d62e

• fix camera test

  Show description for b37ab76
  iche033

  committed
  b37ab76

Commits on Jun 10, 2021

• Merge remote-tracking branch 'origin/main' into ahcorde/update/ogre2.2

  ahcorde

  committed
  523a5cc

• make linters happy

  Show description for 0df4dd4
  ahcorde

  committed
  0df4dd4

• make linters happy

  Show description for b9e8032
  ahcorde

  committed
  b9e8032

Commits on Jun 16, 2021

• Merge branch 'main' into ahcorde/update/ogre2.2

  mjcarroll

  authored
  5d1bbb6

Commits on Jun 20, 2021

• Fix small regression from merge

  Show description for 24a67ad
  mjcarroll

  committed
  24a67ad

Commits on Jun 27, 2021

• Remove problematic leftover files from 2.1

  Show description for 9a381e2
  darksylinc

  committed
  9a381e2

• Do not crash on shutdown

  Show description for 175fcae
  darksylinc

  committed
  175fcae

Commits on Jun 28, 2021

• Remove problematic leftover files from 2.1 (gazebosim#354)

  Show description for fb0fb6e
  darksylinc

  authored
  fb0fb6e

• Do not crash on shutdown (gazebosim#355)

  Show description for 7816937
  darksylinc

  authored
  7816937

Commits on Jun 29, 2021

• Removed unused variable

  Show description for 970d862
  ahcorde

  committed
  970d862

Commits on Jul 3, 2021

• Merge branch 'main' into matias-ogre2.2-main-merge

  Show description for 9f15486
  darksylinc

  committed
  9f15486

• Restore FSAA support in 2.2 branch

  Show description for d3adfbe
  darksylinc

  committed
  d3adfbe

• Fix changing background color not always taking immediate effect

  Show description for 31b4960
  darksylinc

  committed
  31b4960

• Changed pass_clear in favour of LoadAction::Clear

  Show description for 60391e1
  darksylinc

  committed
  60391e1

• Missing public keyword

  Show description for d93cc18
  darksylinc

  committed
  d93cc18

• Save VRAM when FSAA is used and no postprocessing

  Show description for 8c2ec12
  darksylinc

  committed
  8c2ec12

• Merge branch 'ahcorde/update/ogre2.2' into matias-ogre2.2-main-merge

  Show description for 84513fa
  darksylinc

  committed
  84513fa

Commits on Jul 5, 2021

• Remove code deprecated in ign-rendering5

  Show description for 029cd59
  darksylinc

  committed
  029cd59

• Remove code deprecated in ign-rendering5

  Show description for f951593
  darksylinc

  committed
  f951593

Commits on Jul 10, 2021

• Code style fixes

  Show description for 34c31d0
  darksylinc

  committed
  34c31d0

• Undo VRAM saving optimization: It cannot be applied

  Show description for c19ec56
  darksylinc

  committed
  c19ec56

Commits on Jul 13, 2021

• Merge main branch into Ogre 2.2 and fixes (gazebosim#359)

  Show description for d3ce87d
  

  3 peopleauthored
  d3ce87d

Commits on Aug 1, 2021

• Began work on Heightmaps with Ogre2. Very WIP

  Show description for c07bf60
  darksylinc

  committed
  c07bf60

• Register HlmsTerra

  Show description for 22bc5c1
  darksylinc

  committed
  22bc5c1

Commits on Aug 8, 2021

• Update all Terras and show them on screen (WIP)

  Show description for 8480e71
  darksylinc

  committed
  8480e71

• Update to latest Terra to get Z-up support

  Show description for 2e75b61
  darksylinc

  committed
  2e75b61

Commits on Aug 9, 2021

• Better calculation of heightmap size (WIP)

  Show description for fe97c66
  darksylinc

  committed
  fe97c66

Commits on Aug 12, 2021

• Merge remote-tracking branch 'origin/main' into ahcorde/update/ogre2.2

  ahcorde

  committed
  5f53934

Commits on Aug 19, 2021

• Merge branch 'main' into ahcorde/update/ogre2.2

  ahcorde

  authored
  0818a0f

Commits on Aug 25, 2021

• Fix shader compiler error

  Show description for aacbdcc
  darksylinc

  committed
  aacbdcc

• Fix alignment issues in terrain

  Show description for 83e8567
  darksylinc

  committed
  83e8567

• Move Terra to its own folder and project

  Show description for a714833
  darksylinc

  committed
  a714833

• Enable assert that was accidentally disabled

  Show description for ed8fc4e
  darksylinc

  committed
  ed8fc4e

• Customize Terra for Ignition's requirements

  Show description for 74a6d5d
  darksylinc

  committed
  74a6d5d

• Use custom blending modes to adjust to ign

  Show description for 835c559
  darksylinc

  committed
  835c559

• HeightmapTexture::Size is in meters, it's not a scale

  Show description for b88ff85
  darksylinc

  committed
  b88ff85

• Use same blending algorithm for roughness & metalness

  Show description for 6cc6f9a
  darksylinc

  committed
  6cc6f9a

• Deal with edge case where terrain skirts could be above ground

  Show description for cd3a095
  darksylinc

  committed
  cd3a095

• Fix wrong indentation

  Show description for 872caf6
  darksylinc

  committed
  872caf6

• Forgot to push this change

  Show description for 343268d
  darksylinc

  committed
  343268d

• Disable alpha blending of detail maps for Terrain

  Show description for e17406e
  darksylinc

  committed
  e17406e

• Add terrain shadows to normal objects

  Show description for 44b3a6f
  darksylinc

  committed
  44b3a6f

• Merge branch 'ahcorde/update/ogre2.2' into matias-ogre22-terra

  Show description for 3f3f372
  darksylinc

  committed
  3f3f372

• Fix copyright year

  Show description for b295710
  darksylinc

  committed
  b295710

Commits on Aug 28, 2021

• Re-enable ImageHeightmap

  Show description for 9e4243d
  darksylinc

  committed
  9e4243d

• Cosmetic changes

  Show description for fcf3315
  darksylinc

  committed
  fcf3315

• Move Terra's source code into ogre2/src

  Show description for 1b1ab13
  darksylinc

  committed
  1b1ab13

• Support ogre1 heightmaps via cropping and warn about it

  Show description for 84f5b1b
  darksylinc

  committed
  84f5b1b

• Support both ogre2 & ogre engines in heightmap sample

  Show description for 82bdd43
  darksylinc

  committed
  82bdd43

• Force-disable JSON parts of Terra

  Show description for 147232f
  darksylinc

  committed
  147232f

• Add license to Terra files

  Show description for 66f59c1
  darksylinc

  committed
  66f59c1

• Update to latest version of Terra

  Show description for 7d22d26
  darksylinc

  committed
  7d22d26

• Add terrain shadows from spot & point lights

  Show description for 38c74c7
  darksylinc

  committed
  38c74c7

Commits on Aug 30, 2021

• Skip Terra headers in cppcheck

  Show description for 373fd9d
  darksylinc

  committed
  373fd9d

Commits on Sep 2, 2021

• fixing tests

  Show description for f53d5db
  iche033

  committed
  f53d5db

Commits on Sep 3, 2021

• add ifdef

  Show description for 0d1999e
  iche033

  committed
  0d1999e

• suppress warnings

  Show description for 588100c
  iche033

  committed
  588100c

• update syntax

  Show description for 20e24e9
  iche033

  committed
  20e24e9

• update syntax

  Show description for 93599aa
  iche033

  committed
  93599aa

• Merge branch 'main' into ahcorde/update/ogre2.2

  iche033

  authored
  be61509

Commits on Sep 4, 2021

• Merge branch 'ahcorde/update/ogre2.2' into matias-ogre22-terra

  Show description for baf8cff
  darksylinc

  committed
  baf8cff

• Fix crash on shutdown due to ptr destroyed too late

  Show description for 4c08baa
  darksylinc

  committed
  4c08baa

Commits on Sep 7, 2021

• Update to latest Terra to fix bug from upstream

  Show description for 1fb65fc
  darksylinc

  committed
  1fb65fc

Commits on Sep 9, 2021

• Merge branch 'main' into matias-ogre22-terra

  Show description for b75531c
  darksylinc

  committed
  b75531c

• Update to latest Hlms from upstream

  Show description for 226ecaf
  darksylinc

  committed
  226ecaf

Commits on Sep 11, 2021

• Merge branch 'main' into matias-ogre22-terra

  iche033

  authored
  93d88e1

• Fix compiler warning

  Show description for 24d957a
  darksylinc

  committed
  24d957a

• Fix Terra shadows on Spot and Point lights

  Show description for 27ea80e
  darksylinc

  committed
  27ea80e

• Fix Terra's point light shadows

  Show description for 383d80e
  darksylinc

  committed
  383d80e

Commits on Sep 15, 2021

• Fix documentation

  Show description for 6715cbb
  darksylinc

  committed
  6715cbb

Commits on Sep 16, 2021

• Merge branch 'main' into matias-ogre22-terra

  iche033

  authored
  260255b

• fixing CI

  Show description for 6894fd3
  iche033

  committed
  6894fd3

• add include path

  Show description for 19d922c
  iche033

  committed
  19d922c

• windows warning

  Show description for c9d5a17
  iche033

  committed
  c9d5a17

• fix

  Show description for bb0119b
  iche033

  committed
  bb0119b