Merge branch 'dev/markh/displaceOut' into 'main'

[REMIX-3048] supporting outwards displacement with POM

See merge request lightspeedrtx/bridge-remix-nv!124

Author: MarkEHenderson

documentation/RemixApiChangelog.md

@@ -0,0 +1,16 @@
+## Remix API Changelog
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [0.4.2]
+
+### Added
+- MaterialInfoOpaqueEXT.displaceOut
+
+### Changed
+- renamed MaterialInfoOpaqueEXT.heightTextureStrength to MaterialInfoOpaqueEXT.displaceIn
+
+### Fixed
+
+### Removed

ext/remix/remix.h

@@ -275,13 +275,14 @@ namespace remix {
       thinFilmThickness_value = 200.f;
       alphaIsThinFilmThickness = false;
       heightTexture = {};
-      heightTextureStrength = 0.0f;
+      displaceIn = 0.0f;
       useDrawCallAlphaState = true;
       blendType_hasvalue = false;
       blendType_value = 0;
       invertedBlend = false;
       alphaTestType = 7;
       alphaReferenceValue = 0;
+      displaceOut = 0.0f;
       static_assert(sizeof remixapi_MaterialInfoOpaqueEXT == 112);
     }
 

ext/remix/remix_c.h

@@ -54,7 +54,7 @@
 
 #define REMIXAPI_VERSION_MAJOR 0
 #define REMIXAPI_VERSION_MINOR 4
-#define REMIXAPI_VERSION_PATCH 1
+#define REMIXAPI_VERSION_PATCH 2
 
 
 // External
@@ -196,14 +196,15 @@ extern "C" {
     float               thinFilmThickness_value;
     remixapi_Bool       alphaIsThinFilmThickness;
     remixapi_Path       heightTexture;
-    float               heightTextureStrength;
+    float               displaceIn;
     // If true, InstanceInfoBlendEXT is used as a source for alpha state
     remixapi_Bool       useDrawCallAlphaState;
     remixapi_Bool       blendType_hasvalue;
     int                 blendType_value;
     remixapi_Bool       invertedBlend;
     int                 alphaTestType;
     uint8_t             alphaReferenceValue;
+    float               displaceOut;
   } remixapi_MaterialInfoOpaqueEXT;
 
   // Valid only if remixapi_MaterialInfo contains remixapi_MaterialInfoOpaqueEXT in pNext chain

src/util/util_remixapi.cpp

@@ -221,13 +221,14 @@ void MaterialInfo::_dtor() {
                                thinFilmThickness_value, \
                                alphaIsThinFilmThickness, \
                                heightTexture, \
-                               heightTextureStrength, \
+                               displaceIn, \
                                useDrawCallAlphaState, \
                                blendType_hasvalue, \
                                blendType_value, \
                                invertedBlend, \
                                alphaTestType, \
-                               alphaReferenceValue
+                               alphaReferenceValue, \
+                               displaceOut
 uint32_t MaterialInfoOpaque::_calcSize() const {
   return fold_helper::calcSize(MaterialInfoOpaqueVars);
 }