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

Commit 9f986cf

Browse files
crazylafocrazylafo
authored
fix script: json read and write issue
1 parent 804a596 commit 9f986cf

File tree

3 files changed

+57
-48
lines changed

3 files changed

+57
-48
lines changed

‎include/tl_math.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ using namespace gl33core;
7373
#define MINOR_VERSION 1
7474
#define BUG_VERSION 4
7575
#define STAGE_VERSION PF_Stage_ALPHA
76-
#define BUILD_VERSION 4
76+
#define BUILD_VERSION 5
7777

7878
#define ARB_REFCON (void*)0xDEADBEEFDEADBEEF
7979
typedef struct {

‎script/script_main.h‎

Lines changed: 55 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,15 @@ std::string script_main_functions = R"=====(
66
//
77
88
9-
function parseBoolToInt (bin){
10-
alert (bin)
9+
function parseBoolToInt (bin){
1110
if (bin === 'false'|| bin === 'FALSE' ){return 0}
1211
else {return 1}
1312
}
1413
function parseIntToBool (intvar){
1514
if (intvar == 0){return false}
1615
else {return true}
1716
}
18-
function analyseJson (testObj){
17+
function analyseJson (testObj, pluginVersion){
1918
ExprObj = {};
2019
try{
2120
if (testObj.effectName === "tlMath" && testObj.minimalPluginVersion <=pluginVersion){
@@ -24,7 +23,7 @@ function analyseJson (testObj){
2423
ExprObj.parserModeB = parseBoolToInt (testObj.parserModeB);
2524
ExprObj.category = testObj.category;
2625
if (testObj.glslExpr){ExprObj.glslExpr = testObj.glslExpr;}
27-
if (testObj.evalglslExp){ExprObj.evalglslExp = testObj.evalglslExp}
26+
if (testObj.evalglslExp){ExprObj.evalglslExp = testObj.evalgslExp}
2827
else {ExprObj.evalglslExp = 'NONE'}
2928
if (testObj.evalmathExp){ExprObj.evalmathExp = testObj.evalmathExp}
3029
else {ExprObj.evalmathExp = 'NONE'}
@@ -58,14 +57,15 @@ function analyseJson (testObj){
5857
if (testObj.uiColor2Name){ExprObj.uiColor2Name= testObj.uiColor2Name}
5958
if (testObj.extLGrpVisible){ExprObj.extLGrpVisible= testObj.extLGrpVisible}
6059
if (testObj.extLGrpName){ExprObj.extLGrpName= testObj.extLGrpName}
61-
ExprObj.error = "none";
60+
ExprObj.error = "none";
6261
}
6362
else {
6463
alert ("You must use plugin version "+ testObj.minimalPluginVersion+ " or higher");
65-
ExprObj.error = "err";
64+
ExprObj.error = "error : can't read json file";
6665
}
6766
}catch (e) {
68-
ExprObj.error = "err";
67+
alert (e);
68+
ExprObj.error = "error : can't read json file";
6969
}
7070
return ExprObj;
7171
}
@@ -155,7 +155,7 @@ function saveAsJson(exprCl, pluginVersion){
155155
var presetFile =File.saveDialog('save your preset as a json');
156156
if (presetFile && presetFile.open('w')){
157157
presetFile.encoding ='UTF-8';
158-
presetFile.write(JSON.stringify(ExprObj, undefined, '\\r\\n'));
158+
presetFile.write(JSON.stringify(ExprObj, undefined, '\r\n'));
159159
presetFile.close();
160160
}
161161
}
@@ -167,7 +167,7 @@ function readJson(pluginVersion){
167167
loadFile.encoding ='UTF-8';
168168
var jsonFile = loadFile.read();
169169
var testObj = JSON.parse(jsonFile);
170-
ExprObj = analyseJson (testObj);
170+
ExprObj = analyseJson (testObj, pluginVersion);
171171
loadFile.close();
172172
}
173173
return ExprObj;
@@ -390,43 +390,52 @@ w.grp.parserModeB.ddl.onChange = function (){
390390
}
391391
w.grp.btnGrp.loadBtn.onClick = function (){
392392
var exprObj = readJson(pluginVersion);
393-
if (exprObj.error === "none"){
394-
w.grp.parserModeB.ddl.selection = parseInt(exprObj.parserModeB);
395-
w.grp.tab.glsl.fragSh.fragShet.text = exprObj.glslExpr;
396-
w.grp.tab.expr.redC.redet.text = exprObj.redExpr;
397-
w.grp.tab.expr.greenC.greenet.text = exprObj.greenExpr;
398-
w.grp.tab.expr.blueC.blueet.text = exprObj.blueExpr;
399-
w.grp.tab.expr.alphaC.alphaet.text =exprObj.alphaExpr;
400-
w.grp.PresetN.name.text= exprObj.presetName;
401-
w.grp.tab.paramUI.param.paramslider.grpName.cbvisible= exprObj.uiSliderGrpVisible;
402-
w.grp.tab.paramUI.param.paramslider.grpName.editNameet.text= exprObj.uiSliderGrpName;
403-
w.grp.tab.paramUI.param.paramslider.paramSlider1.cbvisible.value= exprObj.uiSlider1Visible;
404-
w.grp.tab.paramUI.param.paramslider.paramSlider1.editNameet.text = exprObj.uiSlider1Name;
405-
w.grp.tab.paramUI.param.paramslider.paramSlider2.cbvisible.value = exprObj.uiSlider2Visible;
406-
w.grp.tab.paramUI.param.paramslider.paramSlider2.editNameet.text = exprObj.uiSlider2Name;
407-
w.grp.tab.paramUI.param.paramslider.paramSlider3.cbvisible.value = exprObj.uiSlider3Visible;
408-
w.grp.tab.paramUI.param.paramslider.paramSlider3.editNameet.text = exprObj.uiSlider3Name;
409-
w.grp.tab.paramUI.param.paramslider.paramSlider4.cbvisible.value = exprObj.uiSlider4Visible;
410-
w.grp.tab.paramUI.param.paramslider.paramSlider4.editNameet.text = exprObj.uiSlider4Name;
411-
w.grp.tab.paramUI.param.parampoint.grpName.cbvisible.value = exprObj.uiPointGrpVisible;
412-
w.grp.tab.paramUI.param.parampoint.grpName.editNameet.text = exprObj.uiPointGrpName;
413-
w.grp.tab.paramUI.param.parampoint.parampoint1.cbvisible.value = exprObj.uiPoint1Visible;
414-
w.grp.tab.paramUI.param.parampoint.parampoint1.editNameet.text = exprObj.uiPoint1Name;
415-
w.grp.tab.paramUI.param.parampoint.parampoint2.cbvisible.value = exprObj.uiPoint2Visible;
416-
w.grp.tab.paramUI.param.parampoint.parampoint2.editNameet.text = exprObj.uiPoint2Name;
417-
w.grp.tab.paramUI.param.paramcolor.grpName.cbvisible.value = exprObj.uiColorGrpVisible;
418-
w.grp.tab.paramUI.param.paramcolor.grpName.editNameet.text = exprObj.uiColorGrpName;
419-
w.grp.tab.paramUI.param.paramcolor.paramcolor1.cbvisible.value =exprObj.uiColor1Visible;
420-
w.grp.tab.paramUI.param.paramcolor.paramcolor1.editNameet.text=exprObj.uiColor1Name;
421-
w.grp.tab.paramUI.param.paramcolor.paramcolor2.cbvisible.value=exprObj.uiColor2Visible;
422-
w.grp.tab.paramUI.param.paramcolor.paramcolor2.editNameet.text =exprObj.uiColor2Name;
423-
w.grp.tab.paramUI.param.paramextL.grpName.cbvisible.value = exprObj.extLGrpVisible;
424-
w.grp.tab.paramUI.param.paramextL.grpName.editNameet.text = exprObj.extLGrpName;
425-
w.grp.tab.paramUI.descriptionGrp.description.text = exprObj.description;
426-
}
427-
else {
428-
alert (exprObj.error);
429-
}
393+
try{
394+
if (exprObj.error === "none"){
395+
if (exprObj.parserModeB) {w.grp.parserModeB.ddl.selection = parseInt(exprObj.parserModeB)};
396+
if (exprObj.glslExpr) {w.grp.tab.glsl.fragSh.fragShet.text = exprObj.glslExpr};
397+
if (exprObj.redExpr) {w.grp.tab.expr.redC.redet.text = exprObj.redExpr};
398+
if (exprObj.greenExpr) {w.grp.tab.expr.greenC.greenet.text = exprObj.greenExpr};
399+
if (exprObj.blueExpr) {w.grp.tab.expr.blueC.blueet.text = exprObj.blueExpr};
400+
if (exprObj.alphaExpr) {w.grp.tab.expr.alphaC.alphaet.text =exprObj.alphaExpr};
401+
if (exprObj.presetName) {w.grp.PresetN.name.text= exprObj.presetName};
402+
if (exprObj.uiSliderGrpVisible) {w.grp.tab.paramUI.param.paramslider.grpName.cbvisible= exprObj.uiSliderGrpVisible};
403+
if (exprObj.uiSliderGrpName) {w.grp.tab.paramUI.param.paramslider.grpName.editNameet.text= exprObj.uiSliderGrpName};
404+
if (exprObj.uiSlider1Visible) {w.grp.tab.paramUI.param.paramslider.paramSlider1.cbvisible.value= exprObj.uiSlider1Visible};
405+
if (exprObj.uiSlider1Name) {w.grp.tab.paramUI.param.paramslider.paramSlider1.editNameet.text = exprObj.uiSlider1Name};
406+
if (exprObj.uiSlider2Visible) {w.grp.tab.paramUI.param.paramslider.paramSlider2.cbvisible.value = exprObj.uiSlider2Visible};
407+
if (exprObj.uiSlider2Name) {w.grp.tab.paramUI.param.paramslider.paramSlider2.editNameet.text = exprObj.uiSlider2Name};
408+
409+
if (exprObj.uiSlider3Visible) {w.grp.tab.paramUI.param.paramslider.paramSlider3.cbvisible.value = exprObj.uiSlider3Visible};
410+
if (exprObj.uiSlider3Name) {w.grp.tab.paramUI.param.paramslider.paramSlider3.editNameet.text = exprObj.uiSlider3Name};
411+
if (exprObj.uiSlider4Visible) {w.grp.tab.paramUI.param.paramslider.paramSlider4.cbvisible.value = exprObj.uiSlider4Visible};
412+
if (exprObj.uiSlider4Name) {w.grp.tab.paramUI.param.paramslider.paramSlider4.editNameet.text = exprObj.uiSlider4Name};
413+
if (exprObj.uiPointGrpVisible) {w.grp.tab.paramUI.param.parampoint.grpName.cbvisible.value = exprObj.uiPointGrpVisible};
414+
415+
if (exprObj.uiPointGrpName) {w.grp.tab.paramUI.param.parampoint.grpName.editNameet.text = exprObj.uiPointGrpName};
416+
if (exprObj.uiPoint1Visible) {w.grp.tab.paramUI.param.parampoint.parampoint1.cbvisible.value = exprObj.uiPoint1Visible};
417+
if (exprObj.uiPoint1Name) {w.grp.tab.paramUI.param.parampoint.parampoint1.editNameet.text = exprObj.uiPoint1Name};
418+
if (exprObj.uiPoint2Visible) {w.grp.tab.paramUI.param.parampoint.parampoint2.cbvisible.value = exprObj.uiPoint2Visible};
419+
if (exprObj.uiPoint2Name) {w.grp.tab.paramUI.param.parampoint.parampoint2.editNameet.text = exprObj.uiPoint2Name};
420+
if (exprObj.uiColorGrpVisible) {w.grp.tab.paramUI.param.paramcolor.grpName.cbvisible.value = exprObj.uiColorGrpVisible};
421+
if (exprObj.uiColorGrpName) {w.grp.tab.paramUI.param.paramcolor.grpName.editNameet.text = exprObj.uiColorGrpName};
422+
if (exprObj.uiColor1Visible) {w.grp.tab.paramUI.param.paramcolor.paramcolor1.cbvisible.value =exprObj.uiColor1Visible};
423+
if (exprObj.uiColor1Name) {w.grp.tab.paramUI.param.paramcolor.paramcolor1.editNameet.text=exprObj.uiColor1Name};
424+
if (exprObj.uiColor2Visible) {w.grp.tab.paramUI.param.paramcolor.paramcolor2.cbvisible.value=exprObj.uiColor2Visible};
425+
if (exprObj.uiColor2Name) {w.grp.tab.paramUI.param.paramcolor.paramcolor2.editNameet.text =exprObj.uiColor2Name};
426+
if (exprObj.extLGrpVisible) {w.grp.tab.paramUI.param.paramextL.grpName.cbvisible.value = exprObj.extLGrpVisible};
427+
if (exprObj.extLGrpName) {w.grp.tab.paramUI.param.paramextL.grpName.editNameet.text = exprObj.extLGrpName};
428+
if (exprObj.description) {w.grp.tab.paramUI.descriptionGrp.description.text = exprObj.description};
429+
}
430+
else {
431+
alert (exprObj.error);
432+
}
433+
}
434+
catch(e){
435+
alert (e);
436+
}
437+
438+
430439
}
431440
432441
w.grp.btnGrp.saveBtn.onClick = function (){

‎tl_mathPiPL.r‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ resource 'PiPL' (16000) {
4444
},
4545
/* [8] */
4646
AE_Effect_Version {
47-
565764//1.1.4.1.4
47+
565765//1.1.4.1.5
4848
},
4949
/* [9] */
5050
AE_Effect_Info_Flags {

0 commit comments

Comments
 (0)