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.

Sign up for GitHub

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

Jump to bottom

4 4 0 prep #242

Merged
merged 4 commits into from
Feb 10, 2021
Merged

4 4 0 prep #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
445a806
Fix coding style issues (#225)
iche033 Feb 3, 2021
36bc282
⬆️ 3.4.0 (#238)
chapulina Feb 10, 2021
978a91f
Update changelog and cmake
Feb 10, 2021
77a8f82
Merge ign-rendering3 forward
Feb 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(ignition-rendering4 VERSION 4.3.1)
project(ignition-rendering4 VERSION 4.4.0)

#============================================================================
# Find ignition-cmake
Expand Down
18 changes: 17 additions & 1 deletion Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@

### Ignition Rendering 4.X

### Ignition Rendering 4.x.x (202x-xx-xx)
### Ignition Rendering 4.4.0 (2021-02-11)

1. Add support for 8 bit thermal camera image format
* [Pull Request #235](https://github.com/ignitionrobotics/ign-rendering/pull/235)

1. All changes up to version 3.4.0

### Ignition Rendering 4.3.1 (2021-02-03)

1. Fix converting Pbs to Unlit material conversion (#230)
Expand Down Expand Up @@ -139,6 +141,20 @@
1. Add support for transparency based on textures alpha channel for ogre1 and ogre2
* [BitBucket pull request 229](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-rendering/pull-requests/229)

### Ignition Rendering 3.X.X (2021-XX-XX)



### Ignition Rendering 3.4.0 (2021-02-09)

1. Clear all Windows warnings
* [Pull request 206](https://github.com/ignitionrobotics/ign-rendering/pull/206)
* [Pull request 215](https://github.com/ignitionrobotics/ign-rendering/pull/215)
* [Pull request 225](https://github.com/ignitionrobotics/ign-rendering/pull/225)

1. Add laser_retro support
* [Pull request 194](https://github.com/ignitionrobotics/ign-rendering/pull/194)

### Ignition Rendering 3.3.0 (2021-01-22)

1. Add Windows installation.
Expand Down
6 changes: 3 additions & 3 deletions ogre/include/ignition/rendering/ogre/OgreMaterialSwitcher.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ namespace ignition
// Ogre::MaterialManager::Listener isn't a dll-interface class, this may cause
// issues
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4275)
#pragma warning(push)
#pragma warning(disable:4275)
#endif
public Ogre::MaterialManager::Listener,
#ifdef _MSC_VER
#pragma warning(pop)
#pragma warning(pop)
#endif
Ogre::RenderTargetListener
{
Expand Down
6 changes: 3 additions & 3 deletions ogre/include/ignition/rendering/ogre/OgreRenderTargetMaterial.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
// Ogre::MaterialManager::Listener isn't a dll-interface class, this may cause
// issues
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4275)
#pragma warning(push)
#pragma warning(disable:4275)
#endif

namespace ignition
Expand Down Expand Up @@ -107,7 +107,7 @@ namespace ignition
}

#ifdef _MSC_VER
#pragma warning(pop)
#pragma warning(pop)
#endif

#endif
6 changes: 3 additions & 3 deletions ogre2/src/Ogre2GpuRays.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,8 @@ void Ogre2LaserRetroMaterialSwitcher::preRenderTargetUpdate(
if (!subItem->hasCustomParameter(this->customParamIdx))
{
// limit laser retro value to 2000 (as in gazebo)
if (retroValue > 2000.0){
if (retroValue > 2000.0)
{
retroValue = 2000.0;
}
float color = retroValue / 2000.0;
Expand Down Expand Up @@ -696,7 +697,7 @@ void Ogre2GpuRays::Setup1stPass()
colorTexDef->preferDepthTexture = true;
colorTexDef->fsaaExplicitResolve = false;

nodeDef->setNumTargetPass(2);
nodeDef->setNumTargetPass(2);

Ogre::CompositorTargetDef *colorTargetDef =
nodeDef->addTargetPass("colorTexture");
Expand Down Expand Up @@ -813,7 +814,6 @@ void Ogre2GpuRays::Setup1stPass()
break;
}
}

}
}

Expand Down