Fix exposeValue and mark as beta

close #499
t3kt · Dec 29, 2021 · dc84da3 · dc84da3
1 parent 5ab8789
commit dc84da3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/src/operators/utility/exposeValue.glsl b/src/operators/utility/exposeValue.glsl
@@ -1,7 +1,12 @@
 bool THIS_check(ReturnT res, ContextT ctx) {
 	if (getStage() != THIS_RENDER_STAGE) return false;
 	#if defined(THIS_Onlyonsurfacehit) && defined(THIS_RETURN_TYPE_Sdf)
-	if (isNonHitSdf(res)) return false;
+	#ifdef RAYTK_SURF_DIST
+	// Not sure why this needs to be multiplied by 2, so this may be incorrect.
+	if (res.x > RAYTK_SURF_DIST * 2.) return false;
+	#else
+	if (res.x > 0.) return false;
+	#endif
 	#endif
 	return true;
 }
@@ -10,7 +15,7 @@ ReturnT thismap(CoordT p, ContextT ctx) {
 	ReturnT res = inputOp1(p, ctx);
 	if (THIS_check(res, ctx)) {
 		#ifdef THIS_HAS_INPUT_valueField
-		inputOp2_ReturnT valRes = inputOp_valueField(p, ctx);
+		inputOp_valueField_ReturnT valRes = inputOp_valueField(p, ctx);
 		#else
 		ReturnT valRes = res;
 		#endif
@@ -21,8 +26,8 @@ ReturnT thismap(CoordT p, ContextT ctx) {
 		}
 		#elif defined(THIS_Valuesource_fieldvalue)
 		{
-			#if defined(THIS_RETURN_TYPE_vec4) || defined(THIS_RETURN_TYPE_float)
-			val = adaptAsVec4(res);
+			#if defined(inputOp_valueField_ReturnT) || defined(inputOp_valueField_ReturnT)
+			val = adaptAsVec4(valRes);
 			#else
 			#error fieldValueNotSupportedForReturnType
 			#endif

diff --git a/src/operators/utility/exposeValue.json b/src/operators/utility/exposeValue.json
@@ -1,7 +1,7 @@
 {
   "meta": {
-    "opStatus": "alpha",
+    "opStatus": "beta",
     "opType": "raytk.operators.utility.exposeValue",
-    "opVersion": 2
+    "opVersion": 3
   }
 }
diff --git a/src/operators/utility/exposeValue.tox b/src/operators/utility/exposeValue.tox
diff --git a/tests/testCases/operators/utility/exposeValue_test.tox b/tests/testCases/operators/utility/exposeValue_test.tox