diff --git a/SuperScriptMaterializer.sln b/SuperScriptMaterializer.sln index 1d77e2d..491a735 100644 --- a/SuperScriptMaterializer.sln +++ b/SuperScriptMaterializer.sln @@ -5,28 +5,36 @@ VisualStudioVersion = 16.0.29418.71 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SuperScriptMaterializer", "SuperScriptMaterializer\SuperScriptMaterializer.vcxproj", "{4D941003-020F-47FD-9FA2-FFC989E306B8}" EndProject +Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "SuperScriptViewer", "SuperScriptViewer\SuperScriptViewer.pyproj", "{6D751BF5-87D6-4123-94B3-34721938CF04}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 - VT5|x64 = VT5|x64 - VT5|x86 = VT5|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4D941003-020F-47FD-9FA2-FFC989E306B8}.Debug|Any CPU.ActiveCfg = VT5|Win32 + {4D941003-020F-47FD-9FA2-FFC989E306B8}.Debug|Any CPU.Build.0 = VT5|Win32 {4D941003-020F-47FD-9FA2-FFC989E306B8}.Debug|x64.ActiveCfg = VT5|x64 {4D941003-020F-47FD-9FA2-FFC989E306B8}.Debug|x64.Build.0 = VT5|x64 {4D941003-020F-47FD-9FA2-FFC989E306B8}.Debug|x86.ActiveCfg = VT35|Win32 {4D941003-020F-47FD-9FA2-FFC989E306B8}.Debug|x86.Build.0 = VT35|Win32 - {4D941003-020F-47FD-9FA2-FFC989E306B8}.Release|x64.ActiveCfg = VT35|x64 - {4D941003-020F-47FD-9FA2-FFC989E306B8}.Release|x64.Build.0 = VT35|x64 - {4D941003-020F-47FD-9FA2-FFC989E306B8}.Release|x86.ActiveCfg = VT35|Win32 - {4D941003-020F-47FD-9FA2-FFC989E306B8}.Release|x86.Build.0 = VT35|Win32 - {4D941003-020F-47FD-9FA2-FFC989E306B8}.VT5|x64.ActiveCfg = VT5|x64 - {4D941003-020F-47FD-9FA2-FFC989E306B8}.VT5|x64.Build.0 = VT5|x64 - {4D941003-020F-47FD-9FA2-FFC989E306B8}.VT5|x86.ActiveCfg = VT5|Win32 - {4D941003-020F-47FD-9FA2-FFC989E306B8}.VT5|x86.Build.0 = VT5|Win32 + {4D941003-020F-47FD-9FA2-FFC989E306B8}.Release|Any CPU.ActiveCfg = VT5|Win32 + {4D941003-020F-47FD-9FA2-FFC989E306B8}.Release|Any CPU.Build.0 = VT5|Win32 + {4D941003-020F-47FD-9FA2-FFC989E306B8}.Release|x64.ActiveCfg = VT5|x64 + {4D941003-020F-47FD-9FA2-FFC989E306B8}.Release|x64.Build.0 = VT5|x64 + {4D941003-020F-47FD-9FA2-FFC989E306B8}.Release|x86.ActiveCfg = VT5|Win32 + {4D941003-020F-47FD-9FA2-FFC989E306B8}.Release|x86.Build.0 = VT5|Win32 + {6D751BF5-87D6-4123-94B3-34721938CF04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6D751BF5-87D6-4123-94B3-34721938CF04}.Debug|x64.ActiveCfg = Debug|Any CPU + {6D751BF5-87D6-4123-94B3-34721938CF04}.Debug|x86.ActiveCfg = Debug|Any CPU + {6D751BF5-87D6-4123-94B3-34721938CF04}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6D751BF5-87D6-4123-94B3-34721938CF04}.Release|x64.ActiveCfg = Release|Any CPU + {6D751BF5-87D6-4123-94B3-34721938CF04}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SuperScriptMaterializer/script_export.cpp b/SuperScriptMaterializer/script_export.cpp index 9d32738..dd49d93 100644 --- a/SuperScriptMaterializer/script_export.cpp +++ b/SuperScriptMaterializer/script_export.cpp @@ -17,7 +17,7 @@ inline void proc_pTarget(CKParameterIn* cache, database* db, dbDataStructHelper* db->write_pTarget(helper->_db_pTarget); } -inline void proc_pIn(CKParameterIn* cache, database* db, dbDataStructHelper* helper, EXPAND_CK_ID parents, int index) { +inline void proc_pIn(CKParameterIn* cache, database* db, dbDataStructHelper* helper, EXPAND_CK_ID parents, EXPAND_CK_ID grandparents, int index) { helper->_db_pIn->thisobj = cache->GetID(); helper->_db_pIn->index = index; strcpy(helper->_db_pIn->name, cache->GetName()); @@ -37,12 +37,12 @@ inline void proc_pIn(CKParameterIn* cache, database* db, dbDataStructHelper* hel if (origin == -1) return; helper->_db_pLink->input = origin; helper->_db_pLink->output = cache->GetID(); - helper->_db_pLink->belong_to = index; + helper->_db_pLink->belong_to = grandparents; db->write_pLink(helper->_db_pLink); } -inline void proc_pOut(CKParameterOut* cache, database* db, dbDataStructHelper* helper, EXPAND_CK_ID parents, int index) { +inline void proc_pOut(CKParameterOut* cache, database* db, dbDataStructHelper* helper, EXPAND_CK_ID parents, EXPAND_CK_ID grandparents, int index) { helper->_db_pOut->thisobj = cache->GetID(); helper->_db_pOut->index = index; strcpy(helper->_db_pOut->name, cache->GetName()); @@ -60,7 +60,7 @@ inline void proc_pOut(CKParameterOut* cache, database* db, dbDataStructHelper* h helper->_db_pLink->input = cache->GetID(); helper->_db_pLink->output = cache_Dest->GetID(); - helper->_db_pLink->belong_to = parents; + helper->_db_pLink->belong_to = grandparents; db->write_pLink(helper->_db_pLink); } @@ -118,9 +118,9 @@ inline void proc_pOper(CKParameterOperation* cache, database* db, dbDataStructHe db->write_pOper(helper->_db_pOper); //export 2 input param and 1 output param - proc_pIn(cache->GetInParameter1(), db, helper, cache->GetID(), 0); - proc_pIn(cache->GetInParameter2(), db, helper, cache->GetID(), 1); - proc_pOut(cache->GetOutParameter(), db, helper, cache->GetID(), 0); + proc_pIn(cache->GetInParameter1(), db, helper, cache->GetID(), parents, 0); + proc_pIn(cache->GetInParameter2(), db, helper, cache->GetID(), parents, 1); + proc_pOut(cache->GetOutParameter(), db, helper, cache->GetID(), parents, 0); } @@ -201,10 +201,10 @@ void IterateBehavior(CKBehavior* bhv, database* db, dbDataStructHelper* helper, int count = 0, i = 0; //pIn for (i = 0, count = bhv->GetInputParameterCount(); i < count; i++) - proc_pIn(bhv->GetInputParameter(i), db, helper, bhv->GetID(), i); + proc_pIn(bhv->GetInputParameter(i), db, helper, bhv->GetID(), parents, i); //pOut for (i = 0, count = bhv->GetOutputParameterCount(); i < count; i++) - proc_pOut(bhv->GetOutputParameter(i), db, helper, bhv->GetID(), i); + proc_pOut(bhv->GetOutputParameter(i), db, helper, bhv->GetID(), parents, i); //bIn for (i = 0, count = bhv->GetInputCount(); i < count; i++) proc_bIn(bhv->GetInput(i), db, helper, bhv->GetID(), i); diff --git a/SuperScriptMaterializer/script_export.h b/SuperScriptMaterializer/script_export.h index 46dd06d..f55cb65 100644 --- a/SuperScriptMaterializer/script_export.h +++ b/SuperScriptMaterializer/script_export.h @@ -5,8 +5,8 @@ #include "database.h" inline void proc_pTarget(CKParameterIn* cache, database* db, dbDataStructHelper* helper, EXPAND_CK_ID parents); -inline void proc_pIn(CKParameterIn* cache, database* db, dbDataStructHelper* helper, EXPAND_CK_ID parents, int index); -inline void proc_pOut(CKParameterOut* cache, database* db, dbDataStructHelper* helper, EXPAND_CK_ID parents, int index); +inline void proc_pIn(CKParameterIn* cache, database* db, dbDataStructHelper* helper, EXPAND_CK_ID parents, EXPAND_CK_ID grandparents, int index); +inline void proc_pOut(CKParameterOut* cache, database* db, dbDataStructHelper* helper, EXPAND_CK_ID parents, EXPAND_CK_ID grandparents, int index); inline void proc_bIn(CKBehaviorIO* cache, database* db, dbDataStructHelper* helper, EXPAND_CK_ID parents, int index); inline void proc_bOut(CKBehaviorIO* cache, database* db, dbDataStructHelper* helper, EXPAND_CK_ID parents, int index); inline void proc_bLink(CKBehaviorLink* cache, database* db, dbDataStructHelper* helper, EXPAND_CK_ID parents); diff --git a/SuperScriptViewer/DecoratorCore.py b/SuperScriptViewer/DecoratorCore.py new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/SuperScriptViewer/DecoratorCore.py @@ -0,0 +1 @@ + diff --git a/SuperScriptViewer/ServerCore.py b/SuperScriptViewer/ServerCore.py new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/SuperScriptViewer/ServerCore.py @@ -0,0 +1 @@ + diff --git a/SuperScriptViewer/SuperScriptViewer.py b/SuperScriptViewer/SuperScriptViewer.py new file mode 100644 index 0000000..6e0e104 --- /dev/null +++ b/SuperScriptViewer/SuperScriptViewer.py @@ -0,0 +1 @@ +print('Super Script View') diff --git a/SuperScriptViewer/SuperScriptViewer.pyproj b/SuperScriptViewer/SuperScriptViewer.pyproj new file mode 100644 index 0000000..44be931 --- /dev/null +++ b/SuperScriptViewer/SuperScriptViewer.pyproj @@ -0,0 +1,41 @@ + + + Debug + 2.0 + 6d751bf5-87d6-4123-94b3-34721938cf04 + . + SuperScriptViewer.py + + + . + . + SuperScriptViewer + SuperScriptViewer + + + true + false + + + true + false + + + + Code + + + Code + + + + + + + + + + + \ No newline at end of file diff --git a/SuperScriptViewer/templates/index.html b/SuperScriptViewer/templates/index.html new file mode 100644 index 0000000..2a45fa3 --- /dev/null +++ b/SuperScriptViewer/templates/index.html @@ -0,0 +1,38 @@ + + + + + + Script Hierarchy + + + +

Script Hierarchy

+

Choose a script to read it.

+
+
+

MfObj

+
    +
  1. shit
  2. +
  3. shit
  4. +
  5. shit
  6. +
  7. shit
  8. +
  9. shit
  10. +
+

MfObj

+
    +
  1. shit
  2. +
  3. shit
  4. +
+

MfObj

+
    +
  1. shit
  2. +
  3. shit
  4. +
  5. shit
  6. +
  7. shit
  8. +
  9. shit
  10. +
+ + + + \ No newline at end of file diff --git a/SuperScriptViewer/templates/viewer.html b/SuperScriptViewer/templates/viewer.html new file mode 100644 index 0000000..aeb0584 --- /dev/null +++ b/SuperScriptViewer/templates/viewer.html @@ -0,0 +1,47 @@ + + + + + + Script Viewer + + + +
+
+ +

Script Hierarchy

+ +

>>

+

Base BB 1

+

>>

+

Base BB 1

+

>>

+

Base BB 1

+

>>

+

Base BB 1

+ +

>>

+

Current BB

+ +
+
+ +
+
+
+ + + +
+
+
+
+
+
+

Get Cell

+
+
+ + + \ No newline at end of file