Skip to content
This repository was archived by the owner on Jun 11, 2024. It is now read-only.

Commit bbecdff

Browse files
authored
correct PF_Err win
1 parent c51cb04 commit bbecdff

File tree

1 file changed

+19
-16
lines changed

1 file changed

+19
-16
lines changed

tl_math.cpp

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ Render (
963963
PF_ParamDef *params[],
964964
PF_LayerDef *outputP )
965965
{
966-
PF_Err err, err2 = PF_Err_NONE;
966+
PF_Err err = PF_Err_NONE, err2= PF_Err_NONE;
967967
AEGP_SuiteHandler suites(in_data->pica_basicP);
968968
PF_EffectWorld *inputP = &params[0]->u.ld;
969969
PF_Point origin;
@@ -978,30 +978,18 @@ Render (
978978
MathInfo miP;
979979
AEFX_CLR_STRUCT(miP);
980980

981-
std::string expression_string_red= "1";
982-
std::string expression_string_green= "1";
983-
std::string expression_string_blue= "1";
984-
std::string expression_string_alpha= "1";
981+
985982

986983
PF_ParamDef checkoutLayerOne;
987984
AEFX_CLR_STRUCT(checkoutLayerOne);
988985
PF_EffectWorld Externalworld;
989986
PF_Pixel16 empty16 = {0,0,0,0};
990987
PF_Pixel empty8 = {0,0,0,0};
991988

992-
if (!err){
993-
arbP = reinterpret_cast<m_ArbData*>(suites.HandleSuite1()->host_lock_handle(arbH));
994-
if (arbP){
995-
m_ArbData *tempPointer = reinterpret_cast<m_ArbData*>(arbP);
996-
expression_string_red = tempPointer->redExAc;
997-
expression_string_green = tempPointer->greenExAc;
998-
expression_string_blue = tempPointer->blueExAc;
999-
expression_string_alpha = tempPointer->alphaExAc;
1000-
}
1001-
}
989+
1002990
ERR(PF_CHECKOUT_PARAM( in_data,
1003991
MATH_INP_LAYER_ONE,
1004-
(in_data->current_time + params[MATH_INP_TOFF_ONE]->u.fs_d.value * in_data->time_step),
992+
(in_data->current_time + A_long(params[MATH_INP_TOFF_ONE]->u.fs_d.value) * in_data->time_step),
1005993
in_data->time_step,
1006994
in_data->time_scale,
1007995
&checkoutLayerOne));
@@ -1163,6 +1151,21 @@ Render (
11631151
miP.xLF = 0;
11641152
miP.yLF = 0;
11651153

1154+
std::string expression_string_red = "1";
1155+
std::string expression_string_green = "1";
1156+
std::string expression_string_blue = "1";
1157+
std::string expression_string_alpha = "1";
1158+
1159+
if (!err) {
1160+
arbP = reinterpret_cast<m_ArbData*>(suites.HandleSuite1()->host_lock_handle(arbH));
1161+
if (arbP) {
1162+
m_ArbData *tempPointer = reinterpret_cast<m_ArbData*>(arbP);
1163+
expression_string_red = tempPointer->redExAc;
1164+
expression_string_green = tempPointer->greenExAc;
1165+
expression_string_blue = tempPointer->blueExAc;
1166+
expression_string_alpha = tempPointer->alphaExAc;
1167+
}
1168+
}
11661169

11671170
miP.redExpr = parseExpr<PF_FpShort>((void*)&miP, expression_string_red);
11681171
if (miP.hasErrorB)

0 commit comments

Comments
 (0)