diff --git a/CWebBrowser/CWebBrowser_VC71.vcproj b/CWebBrowser/CWebBrowser_VC71.vcproj deleted file mode 100644 index cc2be472..00000000 --- a/CWebBrowser/CWebBrowser_VC71.vcproj +++ /dev/null @@ -1,192 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CWebBrowser/CWebBrowser_VC90.vcproj b/CWebBrowser/CWebBrowser_VC90.vcproj deleted file mode 100644 index 951d8e21..00000000 --- a/CWebBrowser/CWebBrowser_VC90.vcproj +++ /dev/null @@ -1,285 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EffectLib/EffectLib_VC71.vcproj b/EffectLib/EffectLib_VC71.vcproj deleted file mode 100644 index 25ebd93d..00000000 --- a/EffectLib/EffectLib_VC71.vcproj +++ /dev/null @@ -1,302 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EffectLib/EffectLib_VC80.vcproj b/EffectLib/EffectLib_VC80.vcproj deleted file mode 100644 index a3f4d105..00000000 --- a/EffectLib/EffectLib_VC80.vcproj +++ /dev/null @@ -1,1771 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EffectLib/EffectLib_VC90.vcproj b/EffectLib/EffectLib_VC90.vcproj deleted file mode 100644 index e381a856..00000000 --- a/EffectLib/EffectLib_VC90.vcproj +++ /dev/null @@ -1,1776 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterBase/eterBase_VC71.vcproj b/EterBase/eterBase_VC71.vcproj deleted file mode 100644 index 50259508..00000000 --- a/EterBase/eterBase_VC71.vcproj +++ /dev/null @@ -1,335 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterBase/eterBase_VC80.vcproj b/EterBase/eterBase_VC80.vcproj deleted file mode 100644 index c7456798..00000000 --- a/EterBase/eterBase_VC80.vcproj +++ /dev/null @@ -1,663 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterBase/eterBase_VC90.vcproj b/EterBase/eterBase_VC90.vcproj deleted file mode 100644 index 8b1176d9..00000000 --- a/EterBase/eterBase_VC90.vcproj +++ /dev/null @@ -1,687 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterGrnLib/eterGrnLib_VC71.vcproj b/EterGrnLib/eterGrnLib_VC71.vcproj deleted file mode 100644 index f35bd903..00000000 --- a/EterGrnLib/eterGrnLib_VC71.vcproj +++ /dev/null @@ -1,294 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterGrnLib/eterGrnLib_VC80.vcproj b/EterGrnLib/eterGrnLib_VC80.vcproj deleted file mode 100644 index ef986b61..00000000 --- a/EterGrnLib/eterGrnLib_VC80.vcproj +++ /dev/null @@ -1,1538 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterGrnLib/eterGrnLib_VC90.vcproj b/EterGrnLib/eterGrnLib_VC90.vcproj deleted file mode 100644 index f4995b21..00000000 --- a/EterGrnLib/eterGrnLib_VC90.vcproj +++ /dev/null @@ -1,1544 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterImageLib/eterImageLib_VC71.vcproj b/EterImageLib/eterImageLib_VC71.vcproj deleted file mode 100644 index 77eb4fb4..00000000 --- a/EterImageLib/eterImageLib_VC71.vcproj +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterImageLib/eterImageLib_VC80.vcproj b/EterImageLib/eterImageLib_VC80.vcproj deleted file mode 100644 index 141dde7a..00000000 --- a/EterImageLib/eterImageLib_VC80.vcproj +++ /dev/null @@ -1,786 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterImageLib/eterImageLib_VC90.vcproj b/EterImageLib/eterImageLib_VC90.vcproj deleted file mode 100644 index 8c66010f..00000000 --- a/EterImageLib/eterImageLib_VC90.vcproj +++ /dev/null @@ -1,791 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterLib/eterlib_VC71.vcproj b/EterLib/eterlib_VC71.vcproj deleted file mode 100644 index a9b8f7a3..00000000 --- a/EterLib/eterlib_VC71.vcproj +++ /dev/null @@ -1,692 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterLib/eterlib_VC80.vcproj b/EterLib/eterlib_VC80.vcproj deleted file mode 100644 index ff959d81..00000000 --- a/EterLib/eterlib_VC80.vcproj +++ /dev/null @@ -1,5238 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterLib/eterlib_VC90.vcproj b/EterLib/eterlib_VC90.vcproj deleted file mode 100644 index 09fcce4a..00000000 --- a/EterLib/eterlib_VC90.vcproj +++ /dev/null @@ -1,1203 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterLocale/EterLocale.vcproj b/EterLocale/EterLocale.vcproj deleted file mode 100644 index 6edd76f1..00000000 --- a/EterLocale/EterLocale.vcproj +++ /dev/null @@ -1,636 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterLocale/EterLocale_VC71.vcproj b/EterLocale/EterLocale_VC71.vcproj deleted file mode 100644 index 19a853d2..00000000 --- a/EterLocale/EterLocale_VC71.vcproj +++ /dev/null @@ -1,233 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterLocale/EterLocale_VC80.vcproj b/EterLocale/EterLocale_VC80.vcproj deleted file mode 100644 index fec905a3..00000000 --- a/EterLocale/EterLocale_VC80.vcproj +++ /dev/null @@ -1,614 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterLocale/EterLocale_VC90.vcproj b/EterLocale/EterLocale_VC90.vcproj deleted file mode 100644 index 8067f8b7..00000000 --- a/EterLocale/EterLocale_VC90.vcproj +++ /dev/null @@ -1,614 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterPack/EterPack_VC71.vcproj b/EterPack/EterPack_VC71.vcproj deleted file mode 100644 index b8f864d5..00000000 --- a/EterPack/EterPack_VC71.vcproj +++ /dev/null @@ -1,237 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterPack/EterPack_VC80.vcproj b/EterPack/EterPack_VC80.vcproj deleted file mode 100644 index a250ef2b..00000000 --- a/EterPack/EterPack_VC80.vcproj +++ /dev/null @@ -1,778 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterPack/EterPack_VC90.vcproj b/EterPack/EterPack_VC90.vcproj deleted file mode 100644 index d729d094..00000000 --- a/EterPack/EterPack_VC90.vcproj +++ /dev/null @@ -1,805 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterPythonLib/eterPythonLib_VC71.vcproj b/EterPythonLib/eterPythonLib_VC71.vcproj deleted file mode 100644 index 61ee0bf3..00000000 --- a/EterPythonLib/eterPythonLib_VC71.vcproj +++ /dev/null @@ -1,251 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterPythonLib/eterPythonLib_VC80.vcproj b/EterPythonLib/eterPythonLib_VC80.vcproj deleted file mode 100644 index c3e5c9b1..00000000 --- a/EterPythonLib/eterPythonLib_VC80.vcproj +++ /dev/null @@ -1,1263 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EterPythonLib/eterPythonLib_VC90.vcproj b/EterPythonLib/eterPythonLib_VC90.vcproj deleted file mode 100644 index dd26f3bc..00000000 --- a/EterPythonLib/eterPythonLib_VC90.vcproj +++ /dev/null @@ -1,1268 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/GameLib/gamelib_VC71.vcproj b/GameLib/gamelib_VC71.vcproj deleted file mode 100644 index 221d48bc..00000000 --- a/GameLib/gamelib_VC71.vcproj +++ /dev/null @@ -1,503 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/GameLib/gamelib_VC80.vcproj b/GameLib/gamelib_VC80.vcproj deleted file mode 100644 index 4f9a02f0..00000000 --- a/GameLib/gamelib_VC80.vcproj +++ /dev/null @@ -1,4700 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/GameLib/gamelib_VC90.vcproj b/GameLib/gamelib_VC90.vcproj deleted file mode 100644 index 4262c370..00000000 --- a/GameLib/gamelib_VC90.vcproj +++ /dev/null @@ -1,4705 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/GrannyConverter/GrannyConverter.cpp b/GrannyConverter/GrannyConverter.cpp deleted file mode 100644 index 2f0f3916..00000000 --- a/GrannyConverter/GrannyConverter.cpp +++ /dev/null @@ -1,277 +0,0 @@ -// GrannyConverter.cpp : Defines the entry point for the console application. -// - -#include "stdafx.h" -#include -#include -#include - -#pragma warning(push) -#pragma warning(disable:4100) -#pragma warning(disable:4127) -#pragma warning(disable:4189) -#pragma warning(disable:4512) -#pragma warning(disable:4706) -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#pragma warning(pop) -#include - -#pragma comment(lib, "granny2.lib") - -struct CryptoTester -{ - CryptoTester() : Encryptor(NULL), Decryptor(NULL), elapsedTime(0.0) {} - CryptoPP::StreamTransformation* Encryptor; - CryptoPP::StreamTransformation* Decryptor; - double elapsedTime; -}; - -template void SetupCrypto(std::vector& vector, const byte* key, const byte* iv) -{ - CryptoTester res; - - res.Encryptor = new N::Encryption; - res.Decryptor = new N::Decryption; - - CryptoPP::SimpleKeyingInterface* keyInterface = dynamic_cast(res.Encryptor); - CryptoPP::SimpleKeyingInterface* keyInterface2 = dynamic_cast(res.Decryptor); - - if (keyInterface->IVRequirement() != CryptoPP::SimpleKeyingInterface::NOT_RESYNCHRONIZABLE) - { - keyInterface->SetKeyWithIV(key, keyInterface->MaxKeyLength(), iv, keyInterface->MaxIVLength()); - keyInterface2->SetKeyWithIV(key, keyInterface->MaxKeyLength(), iv, keyInterface->MaxIVLength()); - } - else - { - keyInterface->SetKey(key, keyInterface->MaxKeyLength()); - keyInterface2->SetKey(key, keyInterface->MaxKeyLength()); - } - - vector.push_back(res); -} - -int _tmain(int argc, char* argv[]) -{ - if (argc != 2) - return 1; - - char arg1[1024 + 1]; - strcpy_s(arg1, sizeof(arg1), argv[1]); - - CFilename Gr2FileName(arg1); - - CFilename RawFileName(Gr2FileName.NoExtension()); - RawFileName += ".ygr"; - - CFilename NewGr2FileName(Gr2FileName.NoExtension()); - NewGr2FileName += "_new.gr2"; - - granny_file* gr2File = GrannyReadEntireFile(Gr2FileName.c_str()); - granny_int32x FileSectionCount; - granny_file_info * FileInfo; - - if (gr2File) - { - FileSectionCount = gr2File->SectionCount; - FileInfo = GrannyGetFileInfo(gr2File); - - GrannyConvertFileInfoToRaw(FileInfo, RawFileName.c_str()); - } - - FILE * fp; - - if (0 == fopen_s(&fp, RawFileName.c_str(), "rb") && fp) - { - fseek(fp, 0L, SEEK_END); - long FileSize = ftell(fp); - fseek(fp, 0L, SEEK_SET); - char * Buffer = (char *) malloc(FileSize); - printf("FileSize: %u\n", fread(Buffer, sizeof(char), FileSize, fp)); - fclose(fp); - - // ÆÄÀÏ À̸§À¸·Î ºÎÅÍ ¾Ïȣȭ Å°¸¦ »ý¼ºÇÔ (´Ù¸¥ ÆÄÀÏ·Î À̸§ ¹Ù²ã¼­ »ç¿ëÇϱâ Èûµé¾îÁü) - std::string SrcStringForKey(RawFileName); - CryptoPP::HashTransformation* hm = NULL; - unsigned int idx = GetCRC32(SrcStringForKey.c_str(), SrcStringForKey.length()) & 3; - - // Å° ¾Ïȣȭ - byte key[32]; - - CryptoPP::HashTransformation* hm1 = NULL; - CryptoPP::HashTransformation* hm2 = NULL; - - static CryptoPP::Tiger tiger; - static CryptoPP::SHA1 sha1; - static CryptoPP::RIPEMD128 ripemd128; - static CryptoPP::Whirlpool whirlpool; - - switch (idx & 3) - { - case 0: - hm1 = &whirlpool; - break; - - case 1: - hm1 = &tiger; - break; - - case 2: - hm1 = &sha1; - break; - - case 3: - hm1 = &ripemd128; - break; - } - - CryptoPP::StringSource(SrcStringForKey, true, - new CryptoPP::HashFilter(*hm1, - //new CryptoPP::HexEncoder( - new CryptoPP::ArraySink(key, sizeof(key) - 16) - //) // HexEncoder - ) // HashFilter - ); // StringSource - - // ¸¸µé¾îÁø Å°ÀÇ Ã¹¹ø° 4¹ÙÀÌÆ®·Î ´ÙÀ½ 16¹ÙÀÌÆ® Å° »ý¼º ¾Ë°í¸®Áò ¼±Åà - unsigned int idx2 = *(unsigned int*) key; - - switch (idx2 & 3) - { - case 0: - hm2 = &sha1; - break; - - case 1: - hm2 = &ripemd128; - break; - - case 2: - hm2 = &whirlpool; - break; - - case 3: - hm2 = &tiger; - break; - } - - CryptoPP::StringSource(SrcStringForKey, true, - new CryptoPP::HashFilter(*hm2, - //new CryptoPP::HexEncoder( - new CryptoPP::ArraySink(key + 16, sizeof(key) - 16) - //) // HexEncoder - ) // HashFilter - ); // StringSource - // Å° »ý¼º ¿Ï·á - - // IV »ý¼º - CryptoPP::AutoSeededRandomPool prng; - byte iv[32]; - prng.GenerateBlock(iv, sizeof(iv)); - - // Cryptoµé ¼Â¾÷ - std::vector tester; - - SetupCrypto >(tester, key, iv); - SetupCrypto >(tester, key, iv); - SetupCrypto >(tester, key, iv); - SetupCrypto(tester, key, iv); - SetupCrypto(tester, key, iv); - SetupCrypto(tester, key, iv); - SetupCrypto >(tester, key, iv); - SetupCrypto >(tester, key, iv); - - std::string CipherText; // ¾Ïȣȭ¿¡ »ç¿ëµÉ Àӽà ¹öÆÛ - std::string DecryptText; // º¹È£È­¿¡ »ç¿ëµÉ Àӽà ¹öÆÛ - - double nonono = 0.0; - - for (int i = 0; i < 1024; ++i) - { - CipherText.clear(); - DecryptText.clear(); - - std::vector::iterator it = tester.begin(); - - while (it != tester.end()) - { - CryptoTester& tester = *(it++); - - boost::timer t; - - CryptoPP::ArraySource((const byte*) Buffer, FileSize, true, - new CryptoPP::StreamTransformationFilter(*tester.Encryptor, - new CryptoPP::StringSink(CipherText) - ) - ); - - CryptoPP::ArraySource(CipherText, true, - new CryptoPP::StreamTransformationFilter(*tester.Decryptor, - new CryptoPP::StringSink(DecryptText) - ) - ); - - tester.elapsedTime += t.elapsed(); - } - - boost::timer t; - - for (int k = 0; k < FileSize >> 5; k += 32) - CipherText.replace(k, 32, Buffer + k, 32); - - const char * text = CipherText.c_str(); - - for (int k = 0; k < FileSize >> 5; k += 32) - DecryptText.replace(k, 32, text + k, 32); - - nonono += t.elapsed(); - } - - std::vector::iterator it = tester.begin(); - - while (it != tester.end()) - { - CryptoTester& tester = *(it++); - printf("%s %g\n", tester.Encryptor->AlgorithmName().c_str(), tester.elapsedTime); - } - - printf("No Crypto: %g\n", nonono); - - // ´Ù½Ã ±×·¡´Ï ÆÄÀÏ·Î ÀúÀå - FileInfo = (granny_file_info *)DecryptText.c_str(); - - GrannyRebasePointers(GrannyFileInfoType, (void*) FileInfo, (int) FileInfo, true); - - granny_int32x DefaultSectionIndex = 0; - - int artToolSize = GrannyGetTotalObjectSize(GrannyArtToolInfoType); - - granny_file_data_tree_writer *DataTreeWriter = - GrannyBeginFileDataTreeWriting(GrannyFileInfoType, FileInfo, - DefaultSectionIndex, - DefaultSectionIndex); - - GrannyWriteDataTreeToFile(DataTreeWriter, GrannyCurrentGRNStandardTag, - NewGr2FileName.c_str(), - FileSectionCount); - - GrannyEndFileDataTreeWriting(DataTreeWriter); - - free(Buffer); - } - - return 0; -} diff --git a/GrannyConverter/GrannyConverter.vcproj b/GrannyConverter/GrannyConverter.vcproj deleted file mode 100644 index 78e10a63..00000000 --- a/GrannyConverter/GrannyConverter.vcproj +++ /dev/null @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/GrannyConverter/GrannyConverter_VC71.vcproj b/GrannyConverter/GrannyConverter_VC71.vcproj deleted file mode 100644 index 858de8af..00000000 --- a/GrannyConverter/GrannyConverter_VC71.vcproj +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/GrannyConverter/stdafx.cpp b/GrannyConverter/stdafx.cpp deleted file mode 100644 index 4e2cc79b..00000000 --- a/GrannyConverter/stdafx.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// GrannyConverter.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - -// TODO: reference any additional headers you need in STDAFX.H -// and not in this file diff --git a/GrannyConverter/stdafx.h b/GrannyConverter/stdafx.h deleted file mode 100644 index 0be0e6ff..00000000 --- a/GrannyConverter/stdafx.h +++ /dev/null @@ -1,17 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#pragma once - -#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later. -#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows. -#endif - -#include -#include - - - -// TODO: reference additional headers your program requires here diff --git a/Metin2Client_VC90.sln b/Metin2Client.sln similarity index 92% rename from Metin2Client_VC90.sln rename to Metin2Client.sln index 59d6267b..1f4fc6ea 100644 --- a/Metin2Client_VC90.sln +++ b/Metin2Client.sln @@ -2,37 +2,37 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.1.32210.238 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CWebBrowser", "CWebBrowser\CWebBrowser_VC90.vcxproj", "{D64AE35F-F982-46D4-8E38-09E5C9752955}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CWebBrowser", "src\CWebBrowser\CWebBrowser.vcxproj", "{D64AE35F-F982-46D4-8E38-09E5C9752955}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EffectLib", "EffectLib\EffectLib_VC90.vcxproj", "{790B152D-6582-467F-B767-8603C5A9E613}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EffectLib", "src\EffectLib\EffectLib.vcxproj", "{790B152D-6582-467F-B767-8603C5A9E613}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EterPack", "EterPack\EterPack_VC90.vcxproj", "{4950BA04-3877-4F66-BCA0-60E00DE3770B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EterPack", "src\EterPack\EterPack.vcxproj", "{4950BA04-3877-4F66-BCA0-60E00DE3770B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PRTerrainLib", "PRTerrainLib\PRTerrainLib_VC90.vcxproj", "{8B1D0DDE-A521-4EB2-9544-F606376278CC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PRTerrainLib", "src\PRTerrainLib\PRTerrainLib.vcxproj", "{8B1D0DDE-A521-4EB2-9544-F606376278CC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpeedTreeLib", "SpeedTreeLib\SpeedTreeLib_VC90.vcxproj", "{0FDDD886-1EB5-4655-80C3-EF08087FAEFD}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpeedTreeLib", "src\SpeedTreeLib\SpeedTreeLib.vcxproj", "{0FDDD886-1EB5-4655-80C3-EF08087FAEFD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SphereLib", "SphereLib\SphereLib_VC90.vcxproj", "{A5D7AF9F-0A4F-4ED3-B209-2553B1ADD17D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SphereLib", "src\SphereLib\SphereLib.vcxproj", "{A5D7AF9F-0A4F-4ED3-B209-2553B1ADD17D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UserInterface", "UserInterface\UserInterface_VC90.vcxproj", "{F6CEB04C-4403-4CD4-84A2-D6A372BD4334}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UserInterface", "src\UserInterface\UserInterface.vcxproj", "{F6CEB04C-4403-4CD4-84A2-D6A372BD4334}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eterBase", "EterBase\eterBase_VC90.vcxproj", "{678C47DC-B3EF-460E-A932-56F3208FC65E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EterBase", "src\EterBase\EterBase.vcxproj", "{678C47DC-B3EF-460E-A932-56F3208FC65E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eterGrnLib", "eterGrnLib\eterGrnLib_VC90.vcxproj", "{E1FF7630-628F-4AD0-BF66-F14D86A04035}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EterGrnLib", "src\EterGrnLib\EterGrnLib.vcxproj", "{E1FF7630-628F-4AD0-BF66-F14D86A04035}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eterImageLib", "eterImageLib\eterImageLib_VC90.vcxproj", "{FE95382C-8E3E-40AC-8060-634D1A0D4CF5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EterImageLib", "src\EterImageLib\EterImageLib.vcxproj", "{FE95382C-8E3E-40AC-8060-634D1A0D4CF5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eterPythonLib", "eterPythonLib\eterPythonLib_VC90.vcxproj", "{24516A87-8544-46A9-A0C8-0A01269642D9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EterPythonLib", "src\EterPythonLib\EterPythonLib.vcxproj", "{24516A87-8544-46A9-A0C8-0A01269642D9}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eterlib", "EterLib\eterlib_VC90.vcxproj", "{887F89DF-A1A2-47DF-A869-F3FC84704E3E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EterLib", "src\EterLib\EterLib.vcxproj", "{887F89DF-A1A2-47DF-A869-F3FC84704E3E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamelib", "GameLib\gamelib_VC90.vcxproj", "{1801F0ED-7DE6-4175-BF25-6FA98AAA350B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameLib", "src\GameLib\GameLib.vcxproj", "{1801F0ED-7DE6-4175-BF25-6FA98AAA350B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mileslib", "MilesLib\mileslib_VC90.vcxproj", "{9189BA90-1997-4B47-A673-A54C7DF4A4F7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MilesLib", "src\MilesLib\MilesLib.vcxproj", "{9189BA90-1997-4B47-A673-A54C7DF4A4F7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scriptLib", "scriptLib\scriptLib_VC90.vcxproj", "{E682CEA2-1D79-4DE9-A2CE-6AED27E4170E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ScriptLib", "src\ScriptLib\ScriptLib.vcxproj", "{E682CEA2-1D79-4DE9-A2CE-6AED27E4170E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EterLocale", "EterLocale\EterLocale_VC90.vcxproj", "{05207E97-C83A-49C6-8E08-403679963A7B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EterLocale", "src\EterLocale\EterLocale.vcxproj", "{05207E97-C83A-49C6-8E08-403679963A7B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/MilesLib/mileslib_VC71.vcproj b/MilesLib/mileslib_VC71.vcproj deleted file mode 100644 index e7a7804f..00000000 --- a/MilesLib/mileslib_VC71.vcproj +++ /dev/null @@ -1,261 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MilesLib/mileslib_VC80.vcproj b/MilesLib/mileslib_VC80.vcproj deleted file mode 100644 index d235e6cc..00000000 --- a/MilesLib/mileslib_VC80.vcproj +++ /dev/null @@ -1,1274 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MilesLib/mileslib_VC90.vcproj b/MilesLib/mileslib_VC90.vcproj deleted file mode 100644 index 9e97f457..00000000 --- a/MilesLib/mileslib_VC90.vcproj +++ /dev/null @@ -1,1279 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PRTerrainLib/PRTerrainLib_VC71.vcproj b/PRTerrainLib/PRTerrainLib_VC71.vcproj deleted file mode 100644 index 9cd1460a..00000000 --- a/PRTerrainLib/PRTerrainLib_VC71.vcproj +++ /dev/null @@ -1,218 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PRTerrainLib/PRTerrainLib_VC80.vcproj b/PRTerrainLib/PRTerrainLib_VC80.vcproj deleted file mode 100644 index c5487aaa..00000000 --- a/PRTerrainLib/PRTerrainLib_VC80.vcproj +++ /dev/null @@ -1,725 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PRTerrainLib/PRTerrainLib_VC90.vcproj b/PRTerrainLib/PRTerrainLib_VC90.vcproj deleted file mode 100644 index c7758540..00000000 --- a/PRTerrainLib/PRTerrainLib_VC90.vcproj +++ /dev/null @@ -1,730 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/README.md b/README.md new file mode 100644 index 00000000..8c0139c1 --- /dev/null +++ b/README.md @@ -0,0 +1,80 @@ +Tested working config: + +``` +boost-algorithm:x86-windows-static 1.78.0 Boost algorithm module +boost-array:x86-windows-static 1.78.0 Boost array module +boost-assert:x86-windows-static 1.78.0 Boost assert module +boost-bind:x86-windows-static 1.78.0 Boost bind module +boost-build:x64-windows 1.78.0#1 Boost.Build +boost-concept-check:x86-windows-static 1.78.0 Boost concept_check module +boost-config:x86-windows-static 1.78.0 Boost config module +boost-container-hash:x86-windows-static 1.78.0 Boost container_hash module +boost-container:x86-windows-static 1.78.0 Boost container module +boost-conversion:x86-windows-static 1.78.0 Boost conversion module +boost-core:x86-windows-static 1.78.0 Boost core module +boost-detail:x86-windows-static 1.78.0 Boost detail module +boost-exception:x86-windows-static 1.78.0 Boost exception module +boost-function-types:x86-windows-static 1.78.0 Boost function_types module +boost-function:x86-windows-static 1.78.0 Boost function module +boost-fusion:x86-windows-static 1.78.0 Boost fusion module +boost-integer:x86-windows-static 1.78.0 Boost integer module +boost-intrusive:x86-windows-static 1.78.0 Boost intrusive module +boost-io:x86-windows-static 1.78.0 Boost io module +boost-iterator:x86-windows-static 1.78.0 Boost iterator module +boost-modular-build-helper:x64-windows 1.78.0#2 Internal vcpkg port used to build Boost libraries +boost-move:x86-windows-static 1.78.0 Boost move module +boost-mp11:x86-windows-static 1.78.0 Boost mp11 module +boost-mpl:x86-windows-static 1.78.0 Boost mpl module +boost-optional:x86-windows-static 1.78.0 Boost optional module +boost-predef:x86-windows-static 1.78.0 Boost predef module +boost-preprocessor:x86-windows-static 1.78.0 Boost preprocessor module +boost-range:x86-windows-static 1.78.0 Boost range module +boost-regex:x86-windows-static 1.78.0 Boost regex module +boost-smart-ptr:x86-windows-static 1.78.0 Boost smart_ptr module +boost-static-assert:x86-windows-static 1.78.0 Boost static_assert module +boost-system:x86-windows-static 1.78.0 Boost system module +boost-throw-exception:x86-windows-static 1.78.0 Boost throw_exception module +boost-tuple:x86-windows-static 1.78.0 Boost tuple module +boost-type-index:x86-windows-static 1.78.0 Boost type_index module +boost-type-traits:x86-windows-static 1.78.0 Boost type_traits module +boost-typeof:x86-windows-static 1.78.0 Boost typeof module +boost-uninstall:x64-windows 1.78.0 Internal vcpkg port used to uninstall Boost +boost-uninstall:x86-windows-static 1.78.0 Internal vcpkg port used to uninstall Boost +boost-unordered:x86-windows-static 1.78.0 Boost unordered module +boost-utility:x86-windows-static 1.78.0 Boost utility module +boost-variant2:x86-windows-static 1.78.0 Boost variant2 module +boost-vcpkg-helpers:x86-windows-static 1.78.0#1 Internal vcpkg port used to modularize Boost +boost-winapi:x86-windows-static 1.78.0 Boost winapi module +cryptopp:x86-windows-static 8.6.0 Crypto++ is a free C++ class library of cryptogr... +devil:x86-windows-static 1.8.0#8 A full featured cross-platform image library +devil[jasper]:x86-windows-static Use JasPer for .jp2 (and some .icns) support +devil[lcms]:x86-windows-static Use Little CMS for color profiles +devil[libjpeg]:x86-windows-static Use Libjpeg for .jpg (and some .blp) support +devil[libpng]:x86-windows-static Use Libpng for .png (and some .ico) +devil[openexr]:x86-windows-static Use openexr +devil[tiff]:x86-windows-static Use Libtiff for .tif support +freeglut:x86-windows-static 3.2.1#7 Open source implementation of GLUT with source a... +jasper:x86-windows-static 2.0.33#3 Open source implementation of the JPEG-2000 Part... +jasper[opengl]:x86-windows-static Enable the use of the OpenGL/GLUT Library +lcms:x86-windows-static 2.12#3 Little CMS. +libjpeg-turbo:x86-windows-static 2.1.3 libjpeg-turbo is a JPEG image codec that uses SI... +liblzma:x86-windows-static 5.2.5#5 Compression library with an API similar to that ... +libpng:x86-windows-static a 1.6.37#16 libpng is a library implementing an interface fo... +lzo:x86-windows-static 2.10#7 Lossless data compression library +openexr:x86-windows-static 2.5.0#3 OpenEXR is a high dynamic-range (HDR) image file... +opengl:x86-windows-static 0.0#9 Open Graphics Library (OpenGL)[3][4][5] is a cro... +python2:x86-windows-static 2.7.18#3 The Python programming language as an embeddable... +tiff:x86-windows-static 4.3.0#6 A library that supports the manipulation of TIFF... +tiff[jpeg]:x86-windows-static Support JPEG compression in TIFF image files +tiff[lzma]:x86-windows-static Support LZMA compression in TIFF image files +tiff[zip]:x86-windows-static Support ZIP/deflate compression in TIFF image files +vcpkg-cmake-config:x64-windows 2022-02-06 +vcpkg-cmake:x64-windows 2022-01-19 +zlib:x86-windows-static 1.2.11#13 A compression library +``` + +boost: boost-system:x86-windows-static boost-container:x86-windows-static boost-unordered:x86-windows-static boost-algorithm:x86-windows-static + +Current config + +cryptopp:x86-windows-static devil:x86-windows-static lzo:x86-windows-static python2:x86-windows-static \ No newline at end of file diff --git a/ScriptLib/scriptLib_VC71.vcproj b/ScriptLib/scriptLib_VC71.vcproj deleted file mode 100644 index 4650d281..00000000 --- a/ScriptLib/scriptLib_VC71.vcproj +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ScriptLib/scriptLib_VC80.vcproj b/ScriptLib/scriptLib_VC80.vcproj deleted file mode 100644 index 7ed8ca86..00000000 --- a/ScriptLib/scriptLib_VC80.vcproj +++ /dev/null @@ -1,622 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ScriptLib/scriptLib_VC90.vcproj b/ScriptLib/scriptLib_VC90.vcproj deleted file mode 100644 index fa1d76ef..00000000 --- a/ScriptLib/scriptLib_VC90.vcproj +++ /dev/null @@ -1,627 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SoundArranger/ActorInstanceAccessor.cpp b/SoundArranger/ActorInstanceAccessor.cpp deleted file mode 100644 index d28f377d..00000000 --- a/SoundArranger/ActorInstanceAccessor.cpp +++ /dev/null @@ -1,118 +0,0 @@ -#include "StdAfx.h" -#include "ActorInstanceAccessor.h" - -#include - -void CActorInstanceAccessor::SetRaceDataPointer(CRaceData * pRaceData) -{ - m_pkCurRaceData = pRaceData; - - CGraphicThingInstance::Clear(); - CGraphicThingInstance::ReserveModelThing(CRaceData::PART_MAX_NUM); - CGraphicThingInstance::ReserveModelInstance(CRaceData::PART_MAX_NUM); - - CGraphicThing* pModelThing = pRaceData->GetBaseModelThing(); - RegisterModelThing(0, pModelThing); - - SetModelInstance(0, 0, 0); -} - -void CActorInstanceAccessor::StartAnimation(float fTime) -{ - m_kCurMotNode.dwcurFrame = DWORD(fTime / 0.033f); -} - -void CActorInstanceAccessor::UpdateFrame() -{ - MotionEventProcess(); - ++m_kCurMotNode.dwcurFrame; -} - -void CActorInstanceAccessor::SetMotion(DWORD dwMotionKey) -{ - // Temporary - For strange motion start - if (m_LODControllerVector.empty()) - return; - - CGrannyLODController * pController = m_LODControllerVector[0]; - CGrannyModelInstance * pModelInstance = pController->GetModelInstance(); - - if (pModelInstance) - { - pModelInstance->SetLocalTime(0.001f); - CGraphicThingInstance::SetMotion(dwMotionKey); - } -} - -void CActorInstanceAccessor::SetMotionData(CRaceMotionData * pMotionData) -{ - m_pkCurRaceMotionData = pMotionData; -} - -void CActorInstanceAccessor::RefreshMotionEvent(MOTION_KEY dwMotionKey) -{ - CRaceMotionData * pMotionData; - if (m_pkCurRaceData->GetMotionDataPointer(dwMotionKey, &pMotionData)) - { - // ±Ã±ØÀûÀ¸·Î´Â Instance¸¦ ¸¸µéÁö ¾Ê°í Data·Î ó¸® ÇÏ°Ô ÇÑ´Ù. - [levites] - for (DWORD i = 0; i < pMotionData->GetMotionEventDataCount(); ++i) - { - const CRaceMotionData::TMotionEventData * c_pData; - if (!pMotionData->GetMotionEventDataPointer(i, &c_pData)) - continue; - - if (CRaceMotionData::MOTION_EVENT_TYPE_EFFECT == c_pData->iType) - { -// const CRaceMotionData::TMotionEffectEventData * c_pEffectData = (const CRaceMotionData::TMotionEffectEventData *)c_pData; -// CEffectManager::Instance().RegisterEffect(c_pEffectData->strEffectFileName.c_str()); - - ///// - -/* - std::string strFileName; - StringPath(c_szFileName, strFileName); - DWORD dwCRC = GetCaseCRC32(strFileName.c_str(), strFileName.length()); - - CEffectData * pEffect; - if (CEffectManager::Instance().GetEffectData(dwCRC, &pEffect)) - { - DWORD i; - for (i = 0; i < pEffectData->GetParticleCount(); ++i) - { - CParticleSystemData * pParticle = pEffectData->GetParticlePointer(i); - pParticle->GetParticlePropertyPointer(); - } - - for (i = 0; i < pEffectData->GetMeshCount(); ++i) - { - CEffectMesh * pMesh = pEffectData->GetMeshPointer(i); - } - } -*/ - } - - TMotionEventInstance MotionEventInstance; - MotionEventInstance.iType = c_pData->iType; - MotionEventInstance.iMotionEventIndex = i; - MotionEventInstance.fStartingTime = c_pData->fStartingTime; - MotionEventInstance.c_pMotionData = c_pData; - } - } -} - -float CActorInstanceAccessor::GetMotionDuration(DWORD dwMotionKey) -{ - return CActorInstance::GetMotionDuration(dwMotionKey); -} - -void CActorInstanceAccessor::ClearAttachingEffect() -{ - __ClearAttachingEffect(); -} - -CActorInstanceAccessor::CActorInstanceAccessor() -{ -} -CActorInstanceAccessor::~CActorInstanceAccessor() -{ -} diff --git a/SoundArranger/ActorInstanceAccessor.h b/SoundArranger/ActorInstanceAccessor.h deleted file mode 100644 index e88929de..00000000 --- a/SoundArranger/ActorInstanceAccessor.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include - -class CActorInstanceAccessor : public CActorInstance -{ - public: - CActorInstanceAccessor(); - virtual ~CActorInstanceAccessor(); - - void ClearAttachingEffect(); - - void SetRaceDataPointer(CRaceData * pRaceData); - - void StartAnimation(float fTime); - void UpdateFrame(); - - void SetMotion(MOTION_KEY dwMotionKey); - void SetMotionData(CRaceMotionData * pMotionData); - - void RefreshMotionEvent(MOTION_KEY dwMotionKey); - float GetMotionDuration(DWORD dwMotionKey); -}; \ No newline at end of file diff --git a/SoundArranger/ChildFrm.cpp b/SoundArranger/ChildFrm.cpp deleted file mode 100644 index bc37fc41..00000000 --- a/SoundArranger/ChildFrm.cpp +++ /dev/null @@ -1,63 +0,0 @@ -// ChildFrm.cpp : implementation of the CChildFrame class -// - -#include "stdafx.h" -#include "SoundArranger.h" - -#include "ChildFrm.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// CChildFrame - -IMPLEMENT_DYNCREATE(CChildFrame, CMDIChildWnd) - -BEGIN_MESSAGE_MAP(CChildFrame, CMDIChildWnd) - //{{AFX_MSG_MAP(CChildFrame) - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CChildFrame construction/destruction - -CChildFrame::CChildFrame() -{ -} - -CChildFrame::~CChildFrame() -{ -} - -BOOL CChildFrame::PreCreateWindow(CREATESTRUCT& cs) -{ - if( !CMDIChildWnd::PreCreateWindow(cs) ) - return FALSE; - - return TRUE; -} - - - -///////////////////////////////////////////////////////////////////////////// -// CChildFrame diagnostics - -#ifdef _DEBUG -void CChildFrame::AssertValid() const -{ - CMDIChildWnd::AssertValid(); -} - -void CChildFrame::Dump(CDumpContext& dc) const -{ - CMDIChildWnd::Dump(dc); -} - -#endif //_DEBUG - -///////////////////////////////////////////////////////////////////////////// -// CChildFrame message handlers diff --git a/SoundArranger/ChildFrm.h b/SoundArranger/ChildFrm.h deleted file mode 100644 index 868120b1..00000000 --- a/SoundArranger/ChildFrm.h +++ /dev/null @@ -1,51 +0,0 @@ -// ChildFrm.h : interface of the CChildFrame class -// -///////////////////////////////////////////////////////////////////////////// - -#if !defined(AFX_CHILDFRM_H__AB58D62B_0B70_4C21_8EA1_DAE4DB2E8F0F__INCLUDED_) -#define AFX_CHILDFRM_H__AB58D62B_0B70_4C21_8EA1_DAE4DB2E8F0F__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - - -class CChildFrame : public CMDIChildWnd -{ - DECLARE_DYNCREATE(CChildFrame) -public: - CChildFrame(); - -// Attributes -public: - -// Operations -public: - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CChildFrame) - virtual BOOL PreCreateWindow(CREATESTRUCT& cs); - //}}AFX_VIRTUAL - -// Implementation -public: - virtual ~CChildFrame(); -#ifdef _DEBUG - virtual void AssertValid() const; - virtual void Dump(CDumpContext& dc) const; -#endif - -// Generated message map functions -protected: - //{{AFX_MSG(CChildFrame) - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; - -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_CHILDFRM_H__AB58D62B_0B70_4C21_8EA1_DAE4DB2E8F0F__INCLUDED_) diff --git a/SoundArranger/DlgMotionViewMode.cpp b/SoundArranger/DlgMotionViewMode.cpp deleted file mode 100644 index eb692b48..00000000 --- a/SoundArranger/DlgMotionViewMode.cpp +++ /dev/null @@ -1,94 +0,0 @@ -// DlgMotionViewMode.cpp : implementation file -// - -#include "stdafx.h" -#include "soundarranger.h" -#include "DlgMotionViewMode.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// CDlgMotionViewMode dialog - - -CDlgMotionViewMode::CDlgMotionViewMode(CWnd* pParent /*=NULL*/) - : CDialog(CDlgMotionViewMode::IDD, pParent) -{ - m_ChangedDataObserver.SetOwner(this); - RegisterChangedDataObserver(&m_ChangedDataObserver); - - //{{AFX_DATA_INIT(CDlgMotionViewMode) - // NOTE: the ClassWizard will add member initialization here - //}}AFX_DATA_INIT -} - - -void CDlgMotionViewMode::DoDataExchange(CDataExchange* pDX) -{ - CDialog::DoDataExchange(pDX); - //{{AFX_DATA_MAP(CDlgMotionViewMode) - DDX_Control(pDX, IDC_RESERVE_MOTION_LIST, m_ctrlReserveMotionList); - DDX_Control(pDX, IDC_BASIS_MOTION_LIST, m_ctrlBasisMotionList); - //}}AFX_DATA_MAP -} - - -BEGIN_MESSAGE_MAP(CDlgMotionViewMode, CDialog) - //{{AFX_MSG_MAP(CDlgMotionViewMode) - // NOTE: the ClassWizard will add message map macros here - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CDlgMotionViewMode normal functions - -void CDlgMotionViewMode::OnChangedModel() -{ - m_ctrlBasisMotionList.ResetContent(); - - TCharacterData * pCharacterData; - if (GetCharacterDataPointer(GetCurrentModelIndex(), &pCharacterData)) - { - for (DWORD i = 0; i < pCharacterData->BasisMotionIDVector.size(); ++i) - { - TMotionDataMap::iterator itor = pCharacterData->MotionDataMap.find(pCharacterData->BasisMotionIDVector[i]); - if (itor != pCharacterData->MotionDataMap.end()) - { - m_ctrlBasisMotionList.InsertString(m_ctrlBasisMotionList.GetSelCount(), itor->second.strName.c_str()); - } - } - } -} - -void CDlgMotionViewMode::OnChangedReserveMotion() -{ - m_ctrlReserveMotionList.ResetContent(); - - TCharacterData * pCharacterData; - if (GetCharacterDataPointer(GetCurrentModelIndex(), &pCharacterData)) - { - for (DWORD i = 0; i < ms_ReserveMotionDeque.size(); ++i) - { - TMotionDataMap::iterator itor = pCharacterData->MotionDataMap.find(ms_ReserveMotionDeque[i]); - if (itor != pCharacterData->MotionDataMap.end()) - { - m_ctrlReserveMotionList.InsertString(m_ctrlReserveMotionList.GetSelCount(), itor->second.strName.c_str()); - } - } - } -} - -///////////////////////////////////////////////////////////////////////////// -// CDlgMotionViewMode message handlers - -void CDlgMotionViewMode::OnOK() -{ -} - -void CDlgMotionViewMode::OnCancel() -{ -} diff --git a/SoundArranger/DlgMotionViewMode.h b/SoundArranger/DlgMotionViewMode.h deleted file mode 100644 index c9d93f59..00000000 --- a/SoundArranger/DlgMotionViewMode.h +++ /dev/null @@ -1,65 +0,0 @@ -#if !defined(AFX_DLGMOTIONVIEWMODE_H__5D83AE29_15FE_4DF3_A0B7_9B6BDBDF1282__INCLUDED_) -#define AFX_DLGMOTIONVIEWMODE_H__5D83AE29_15FE_4DF3_A0B7_9B6BDBDF1282__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 -// DlgMotionViewMode.h : header file -// - -#include "Manager.h" - -///////////////////////////////////////////////////////////////////////////// -// CDlgMotionViewMode dialog - -class CDlgMotionViewMode : public CDialog, public CManager -{ -// Construction -public: - CDlgMotionViewMode(CWnd* pParent = NULL); // standard constructor - -// Dialog Data - //{{AFX_DATA(CDlgMotionViewMode) - enum { IDD = IDD_DIALOG_MOTION_VIEW_MODE }; - CListBox m_ctrlReserveMotionList; - CListBox m_ctrlBasisMotionList; - //}}AFX_DATA - - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CDlgMotionViewMode) - protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL - -// Implementation -protected: - - // Generated message map functions - //{{AFX_MSG(CDlgMotionViewMode) - afx_msg void OnOK(); - afx_msg void OnCancel(); - //}}AFX_MSG - DECLARE_MESSAGE_MAP() - -public: - void OnChangedModel(); - void OnChangedReserveMotion(); - -protected: - class CChangedDataObserver : public CManager::IChangedDataObserver - { - public: - void SetOwner(CDlgMotionViewMode * pOwner) { m_pOwner = pOwner; } - void OnChangedModel() { m_pOwner->OnChangedModel(); } - void OnChangedReserveMotion() { m_pOwner->OnChangedReserveMotion(); } - protected: - CDlgMotionViewMode * m_pOwner; - } m_ChangedDataObserver; -}; - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_DLGMOTIONVIEWMODE_H__5D83AE29_15FE_4DF3_A0B7_9B6BDBDF1282__INCLUDED_) diff --git a/SoundArranger/FileOpener.cpp b/SoundArranger/FileOpener.cpp deleted file mode 100644 index 3e6babac..00000000 --- a/SoundArranger/FileOpener.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// FileOpener.cpp : implementation file -// - -#include "stdafx.h" -#include "FileOpener.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// CFileOpener - -IMPLEMENT_DYNAMIC(CFileOpener, CFileDialog) - -CFileOpener::CFileOpener(BOOL bOpenFileDialog, LPCTSTR lpszDefExt, LPCTSTR lpszFileName, - DWORD dwFlags, LPCTSTR lpszFilter, CWnd* pParentWnd) : - CFileDialog(bOpenFileDialog, lpszDefExt, lpszFileName, dwFlags, lpszFilter, pParentWnd) -{ -} - - -BEGIN_MESSAGE_MAP(CFileOpener, CFileDialog) - //{{AFX_MSG_MAP(CFileOpener) - //}}AFX_MSG_MAP -END_MESSAGE_MAP() diff --git a/SoundArranger/FileOpener.h b/SoundArranger/FileOpener.h deleted file mode 100644 index 7a05ab25..00000000 --- a/SoundArranger/FileOpener.h +++ /dev/null @@ -1,40 +0,0 @@ -#if !defined(AFX_FILEOPENER_H__D5190597_42A1_4318_82B8_7BBE22F731FE__INCLUDED_) -#define AFX_FILEOPENER_H__D5190597_42A1_4318_82B8_7BBE22F731FE__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 -// FileOpener.h : header file -// - -///////////////////////////////////////////////////////////////////////////// -// CFileOpener dialog - -#define WM_TEMP1 (WM_USER+300) -#define WM_TEMP2 (WM_USER+302) - -class CFileOpener : public CFileDialog -{ - DECLARE_DYNAMIC(CFileOpener) - -public: - CFileOpener(BOOL bOpenFileDialog, // TRUE for FileOpen, FALSE for FileSaveAs - LPCTSTR lpszDefExt = NULL, - LPCTSTR lpszFileName = NULL, - DWORD dwFlags = OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, - LPCTSTR lpszFilter = NULL, - CWnd* pParentWnd = NULL); - -public: - char * GetFileFullName(){ return m_szFileName; } - -protected: - //{{AFX_MSG(CFileOpener) - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_FILEOPENER_H__D5190597_42A1_4318_82B8_7BBE22F731FE__INCLUDED_) diff --git a/SoundArranger/GraphViewer.cpp b/SoundArranger/GraphViewer.cpp deleted file mode 100644 index c0424a76..00000000 --- a/SoundArranger/GraphViewer.cpp +++ /dev/null @@ -1,583 +0,0 @@ -// GraphViewer.cpp : ±¸Çö ÆÄÀÏÀÔ´Ï´Ù. -// - -#include "stdafx.h" -#include "SoundArranger.h" -#include "GraphViewer.h" -#include "ResSoundData.h" - - -const int c_TimeBox_Width = 20; -const int c_TimeBox_Height = 7; -const int c_Point_Width = 5; -const int c_Point_Height = 10; - - -// CGraphViewer - -IMPLEMENT_DYNCREATE(CGraphViewer, CView) - -CGraphViewer::CGraphViewer() -{ - m_pdlgSoundData = NULL; - - m_ChangedSoundObserver.SetOwner(this); - RegisterChangedDataObserver(&m_ChangedSoundObserver); -} - -CGraphViewer::~CGraphViewer() -{ - if (m_pdlgSoundData) - { - delete m_pdlgSoundData; - m_pdlgSoundData = NULL; - } -} - -BEGIN_MESSAGE_MAP(CGraphViewer, CView) - ON_WM_CREATE() - ON_WM_LBUTTONDOWN() - ON_WM_LBUTTONUP() - ON_WM_RBUTTONDOWN() - ON_WM_RBUTTONUP() - ON_WM_MOUSEMOVE() - ON_WM_TIMER() -END_MESSAGE_MAP() - -void CGraphViewer::Update() -{ - GetWindowRect(&m_WindowRect); - m_lHalfHeight = m_WindowRect.Height() / 2; - - ///// - - long lxPosition; - TimeToGraphPosition(GetLocalTime(), &lxPosition); - m_TimeBox.left = lxPosition-c_TimeBox_Width; - m_TimeBox.right = lxPosition+c_TimeBox_Width; - m_TimeBox.top = m_lHalfHeight-c_TimeBox_Height; - m_TimeBox.bottom = m_lHalfHeight+c_TimeBox_Height; -} - -void CGraphViewer::Render() -{ - m_Screen.SetClearColor(0.1f, 0.1f, 0.2f, 1); - - m_Screen.Begin(); - m_Screen.Clear(); - - D3DXMATRIX matIdentity; - D3DXMatrixIdentity(&matIdentity); - STATEMANAGER.SaveTransform(D3DTS_PROJECTION, &matIdentity); - STATEMANAGER.SaveTransform(D3DTS_VIEW, &matIdentity); - STATEMANAGER.SetTransform(D3DTS_WORLD, &matIdentity); - - m_Screen.SetOrtho2D(1280.0f, 968.0f, 400); - m_Screen.SetColorOperation(); - - // Draw Line - m_Screen.SetDiffuseColor(1, 1, 1, 1); - m_Screen.RenderBar2d(0.0f, - (float) m_WindowRect.Height() / 2 - 1, - (float) m_WindowRect.Width(), - (float) m_WindowRect.Height() / 2 + 1); - - static std::vector vecLocalTime; - if (ms_PlayFlag) - { - if (vecLocalTime.empty()) - { - vecLocalTime.push_back(GetLocalTime()); - } - else if (vecLocalTime[vecLocalTime.size()-1] != GetLocalTime()) - vecLocalTime.push_back(GetLocalTime()); - } - else - vecLocalTime.clear(); - - // Draw Debugging Data -// for (DWORD k = 0; k < vecLocalTime.size(); ++k) -// { -// long lxPos; -// TimeToGraphPosition(vecLocalTime[k], &lxPos); -// -// m_Screen.SetDiffuseColor(1.0f, 0.0f, 0.0f, 0.8f); -// m_Screen.RenderBar2d(lxPos-1, m_lHalfHeight-5, lxPos+1, m_lHalfHeight+5); -// } - - // Draw Frame - float fLineTimePos = 0.0f; - for (int i = 0; i < ms_iFrameCount-1; ++i) - { - fLineTimePos += 0.033f; - - long lxPos; - TimeToGraphPosition(fLineTimePos, &lxPos); - - m_Screen.SetDiffuseColor(1.0f, 1.0f, 1.0f, 0.8f); - m_Screen.RenderBar2d(lxPos-1, m_lHalfHeight-3, lxPos+1, m_lHalfHeight+3); - } - - // Draw Time Box Around - if (isMotion()) - { - if (m_isTimeBarDragging || m_isTimeBarOver) - { - m_Screen.SetDiffuseColor(1.0f, 1.0f, 1.0f, 0.8f); - m_Screen.RenderBar2d(m_TimeBox.left, m_TimeBox.top, m_TimeBox.right, m_TimeBox.bottom); - } - else - { - m_Screen.SetDiffuseColor(1.0f, 1.0f, 1.0f, 1.0f); - m_Screen.RenderBar2d(m_TimeBox.left, m_TimeBox.top, m_TimeBox.right, m_TimeBox.top+2); - m_Screen.RenderBar2d(m_TimeBox.left, m_TimeBox.bottom-2, m_TimeBox.right, m_TimeBox.bottom); - m_Screen.RenderBar2d(m_TimeBox.left, m_TimeBox.top, m_TimeBox.left+2, m_TimeBox.bottom); - m_Screen.RenderBar2d(m_TimeBox.right-2, m_TimeBox.top, m_TimeBox.right, m_TimeBox.bottom); - } - - m_Screen.SetDiffuseColor(0.0f, 1.0f, 0.0f, 0.8f); - m_Screen.RenderBar2d((m_TimeBox.left+m_TimeBox.right)/2-1, 0, (m_TimeBox.left+m_TimeBox.right)/2+1, m_WindowRect.Height()); - } - - // Draw Time Node - if (isEffect()) - { - TTimeNodeList::iterator itor = ms_TimeNodeList.begin(); - for (; itor != ms_TimeNodeList.end(); ++itor) - { - const TTimeNode & c_rTimeNode = *itor; - - float fcurTime = GetCurrentTime() - c_rTimeNode.fStartTime; - - long lxLine; - TimeToGraphPosition(fcurTime, &lxLine); - - m_Screen.SetDiffuseColor(0.0f, 1.0f, 0.0f, 0.8f); - m_Screen.RenderBar2d(lxLine-1, 0, lxLine+1, m_WindowRect.Height()); - } - } - - // Draw Points - TCharacterData * pCharacterData; - if (GetCharacterDataPointer(GetCurrentModelIndex(), &pCharacterData)) - { - RenderSoundNodes(pCharacterData->SoundDataVector); - } - TMotionData * pMotionData; - if (GetCharacterMotionDataPointer(GetCurrentModelIndex(), GetCurrentMotionIndex(), &pMotionData)) - { - RenderSoundNodes(pMotionData->SoundDataVector); - } - - STATEMANAGER.RestoreTransform(D3DTS_VIEW); - STATEMANAGER.RestoreTransform(D3DTS_PROJECTION); - - CRect RenderingRect; - RenderingRect.left = 0; - RenderingRect.top = 0; - RenderingRect.right = m_WindowRect.Width(); - RenderingRect.bottom = m_WindowRect.Height(); - - m_Screen.End(); - m_Screen.Show(&RenderingRect, m_hWnd); -} - -void CGraphViewer::RenderSoundNodes(const NSound::TSoundDataVector & c_rVector) -{ - for (int i = 0; i < int(c_rVector.size()); ++i) - { - const NSound::TSoundData & c_rSoundData = c_rVector[i]; - - long lxPosition; - TimeToGraphPosition(c_rSoundData.fTime, &lxPosition); - - if (i == m_OverPoint || i == m_DraggingPoint) - { - m_Screen.SetDiffuseColor(1.0f, 1.0f, 1.0f, 0.8f); - m_Screen.RenderBar2d(lxPosition-c_Point_Width, m_lHalfHeight-c_Point_Height, lxPosition+c_Point_Width, m_lHalfHeight+c_Point_Height); - } - else - { - m_Screen.SetDiffuseColor(1.0f, 1.0f, 1.0f, 0.8f); - m_Screen.RenderBar2d(lxPosition-c_Point_Width, m_lHalfHeight-c_Point_Height, lxPosition+c_Point_Width, m_lHalfHeight-c_Point_Height+2); - m_Screen.RenderBar2d(lxPosition-c_Point_Width, m_lHalfHeight+c_Point_Height-2, lxPosition+c_Point_Width, m_lHalfHeight+c_Point_Height); - m_Screen.RenderBar2d(lxPosition-c_Point_Width, m_lHalfHeight-c_Point_Height, lxPosition-c_Point_Width+2, m_lHalfHeight+c_Point_Height); - m_Screen.RenderBar2d(lxPosition+c_Point_Width-2, m_lHalfHeight-c_Point_Height, lxPosition+c_Point_Width, m_lHalfHeight+c_Point_Height); - } - - m_Screen.SetDiffuseColor(1.0f, 1.0f, 1.0f, 0.8f); - m_Screen.RenderBar2d(lxPosition-1, m_lHalfHeight-3, lxPosition+1, m_lHalfHeight+3); - } -} - -void CGraphViewer::TimeToGraphPosition(const float & rTime, long * pPoint) -{ - *pPoint = rTime / GetLimitTime() * m_WindowRect.Width(); -} -void CGraphViewer::GraphPositionToTime(const long & pPoint, float * pTime) -{ - *pTime = float(pPoint) / float(m_WindowRect.Width()) * GetLimitTime(); -} - -bool CGraphViewer::IsClickedTimebar(CPoint & rPoint) -{ - if (rPoint.x >= m_TimeBox.left) - if (rPoint.x <= m_TimeBox.right) - if (rPoint.y >= m_TimeBox.top) - if (rPoint.y <= m_TimeBox.bottom) - { - return true; - } - - return false; -} - -bool CGraphViewer::GetClickPoint(CPoint & rPoint, int * pIndex) -{ - *pIndex = -1; - - static long HalfHeight; - HalfHeight = m_WindowRect.Height()/2; - - NSound::TSoundDataVector * pSoundDataVector; - if (GetCharacterSoundDataVector(GetCurrentModelIndex(), GetCurrentMotionIndex(), &pSoundDataVector)) - { - for (DWORD i = 0; i < pSoundDataVector->size(); ++i) - { - NSound::TSoundData & rSoundData = pSoundDataVector->at(i); - - static long xPosition; - TimeToGraphPosition(rSoundData.fTime, &xPosition); - - if (rPoint.x >= xPosition - c_Point_Width) - if (rPoint.x <= xPosition + c_Point_Width) - if (rPoint.y >= HalfHeight - c_Point_Height) - if (rPoint.y <= HalfHeight + c_Point_Height) - { - *pIndex = i; - return true; - } - } - } - - return false; -} - - -void CGraphViewer::InsertSoundData(int ix) -{ - if (!isMotion() && !isEffect()) - { - LogBox("¸ÕÀú ¸ð¼Ç ȤÀº ÀÌÆåÆ®¸¦ ¼±Åà ÇϽʽÿÀ", "ERROR", GetSafeHwnd()); - return; - } - - if (!isSound()) - return; - - Edit(); - - float fTime; - GraphPositionToTime(ix, &fTime); - - DWORD dwFrame = fTime / 0.033f; - float fFrameTime = dwFrame * 0.033f; - - const char * c_szFileName; - if (GetSoundFileName(GetCurrentSoundIndex(), &c_szFileName)) - { - CManager::InsertSoundData(GetCurrentModelIndex(), GetCurrentMotionIndex(), fFrameTime, c_szFileName); - } - - CManager::SetSoundIndex(0); -} - -void CGraphViewer::ChangeSoundData(int iPointIndex) -{ - if (!isSound()) - return; - - TMotionData * pMotionData; - if (!CManager::GetCharacterMotionDataPointer(GetCurrentModelIndex(), GetCurrentMotionIndex(), &pMotionData)) - return; - - NSound::TSoundData & rSoundData = pMotionData->SoundDataVector[iPointIndex]; - - if (DWORD(iPointIndex) >= pMotionData->SoundDataVector.size()) - return; - - const char * c_szFileName; - if (!GetSoundFileName(GetCurrentSoundIndex(), &c_szFileName)) - return; - - char szAlert[128+1]; - _snprintf(szAlert, 128, "%s¸¦ %s·Î ¹Ù²Ù½Ã°Ú½À´Ï±î?", rSoundData.strSoundFileName.c_str(), c_szFileName); - if (6 != MessageBox(szAlert, NULL, MB_YESNOCANCEL)) - return; - - Edit(); - - rSoundData.strSoundFileName = c_szFileName; -} - -void CGraphViewer::DeleteSoundData(int iPointIndex) -{ - if (-1 == iPointIndex) - return; - - NSound::TSoundDataVector * pSoundDataVector; - if (GetCharacterSoundDataVector(GetCurrentModelIndex(), GetCurrentMotionIndex(), &pSoundDataVector)) - { - char szAlert[128+1]; - _snprintf(szAlert, 128, "Á¤¸»·Î Áö¿ì½Ã°Ú½À´Ï±î?"); - if (6 != MessageBox(szAlert, NULL, MB_YESNO)) - return; - - DeleteVectorItem(pSoundDataVector, iPointIndex); - Edit(); - - m_pdlgSoundData->ShowWindow(SW_HIDE); - } -} - -void CGraphViewer::OnChangedSound() -{ - if (0 == GetCurrentSoundIndex()) - { - SetCursor(AfxGetApp()->LoadCursor(IDC_ARROW)); - } -} - - -// CGraphViewer ±×¸®±âÀÔ´Ï´Ù. -void CGraphViewer::OnDraw(CDC* pDC) -{ - CDocument* pDoc = GetDocument(); -} - - -// CGraphViewer Áø´ÜÀÔ´Ï´Ù. - -#ifdef _DEBUG -void CGraphViewer::AssertValid() const -{ - CView::AssertValid(); -} - -void CGraphViewer::Dump(CDumpContext& dc) const -{ - CView::Dump(dc); -} -#endif //_DEBUG - - -// -// CGraphViewer ¸Þ½ÃÁö 󸮱âÀÔ´Ï´Ù. -// - -void CGraphViewer::OnPaint() -{ - Render(); - CView::OnPaint(); -} - -void CGraphViewer::OnLButtonDown(UINT nFlags, CPoint point) -{ - SetCapture(); - - if (canEdit()) - { - int iPointIndex; - // TimeBar¸¦ ´­·¶´Ù¸é.. - if (IsClickedTimebar(point)) - { - m_isTimeBarDragging = TRUE; - } - // SoundPoint¸¦ ´­·¶´Ù¸é.. - else if (GetClickPoint(point, &iPointIndex)) - { - if (isSound()) - { - ChangeSoundData(iPointIndex); - } - else - { - m_DraggingPoint = iPointIndex; - } - } - // ºó °ø°£À» ´­·¶´Ù¸é.. - else - { - if (isSound()) - { - InsertSoundData(point.x); - } - else - { - float fTime; - - GraphPositionToTime(point.x, &fTime); - - ms_fLocalTime = fTime; - } - } - } - - CView::OnLButtonDown(nFlags, point); -} -void CGraphViewer::OnLButtonUp(UINT nFlags, CPoint point) -{ - m_DraggingPoint = -1; - m_isTimeBarDragging = FALSE; - - if (this == GetCapture()) - { - ReleaseCapture(); - } - else - { - if (canEdit()) - { - if (isSound()) - { - InsertSoundData(point.x); - } - } - } - - CView::OnLButtonUp(nFlags, point); -} - -void CGraphViewer::OnRButtonDown(UINT nFlags, CPoint point) -{ - SetCapture(); - - if (canEdit()) - { - int iPointIndex; - if (GetClickPoint(point, &iPointIndex)) - { - DeleteSoundData(iPointIndex); - } - else - { - CManager::SetSoundIndex(0); - } - } - - CView::OnRButtonDown(nFlags, point); -} -void CGraphViewer::OnRButtonUp(UINT nFlags, CPoint point) -{ - if (GetCapture()==this) - ReleaseCapture(); - - CView::OnRButtonUp(nFlags, point); -} - -void CGraphViewer::OnMouseMove(UINT nFlags, CPoint point) -{ - static float fTime; - - m_xMousePosition = point.x; - m_isTimeBarOver = FALSE; - - if (m_isTimeBarDragging) - { - GraphPositionToTime(point.x, &fTime); - - SetLocalTime(min(GetLimitTime(), max(0.001f, fTime))); - } - else if (m_DraggingPoint >= 0) - { - GraphPositionToTime(point.x, &fTime); - - NSound::TSoundDataVector * pSoundDataVector; - if (GetCharacterSoundDataVector(GetCurrentModelIndex(), GetCurrentMotionIndex(), &pSoundDataVector)) - { - DWORD dwFrame = min(GetLimitTime(), max(0.0f, fTime)) / 0.033f; - float fFrameTime = dwFrame * 0.033f; - pSoundDataVector->at(m_DraggingPoint).fTime = fFrameTime; - } - - Edit(); - } - else - { - if (IsClickedTimebar(point)) - { - m_isTimeBarOver = TRUE; - m_OverPoint = -1; - } - else if (GetClickPoint(point, &m_OverPoint)) - { - if (GetCurrentSoundIndex()) - { - SetCursor(AfxGetApp()->LoadCursor(IDC_CHANGE_SOUND)); - } - } - else - { - if (GetCurrentSoundIndex()) - { - SetCursor(AfxGetApp()->LoadCursor(IDC_ADD_SOUND)); - } - } - } - - ///// - - if (-1 != m_OverPoint || -1 != m_DraggingPoint) - { - DWORD dwPointIndex = max(m_OverPoint, m_DraggingPoint); - - NSound::TSoundDataVector * pSoundDataVector; - if (GetCharacterSoundDataVector(GetCurrentModelIndex(), GetCurrentMotionIndex(), &pSoundDataVector)) - if (dwPointIndex < pSoundDataVector->size()) - { - const NSound::TSoundData & c_rSoundData = pSoundDataVector->at(dwPointIndex); - m_pdlgSoundData->UpdateSoundData(c_rSoundData.fTime, c_rSoundData.strSoundFileName.c_str()); - - ///// - - CRect Rect; - m_pdlgSoundData->GetWindowRect(&Rect); - - CPoint GlobalPoint(0, (m_WindowRect.Height()/2) - Rect.Height() - 30); - TimeToGraphPosition(c_rSoundData.fTime, &GlobalPoint.x); - ClientToScreen(&GlobalPoint); - GlobalPoint.x -= Rect.Width() / 2; - - m_pdlgSoundData->MoveWindow(GlobalPoint.x, GlobalPoint.y, Rect.Width(), Rect.Height()); - - m_pdlgSoundData->ShowWindow(TRUE); - SetFocus(); - } - } - else - { - m_pdlgSoundData->ShowWindow(FALSE); - } - - CView::OnMouseMove(nFlags, point); -} - -int CGraphViewer::OnCreate(LPCREATESTRUCT lpCreateStruct) -{ - if (CView::OnCreate(lpCreateStruct) == -1) - return -1; - - // TODO: ¿©±â¿¡ Ư¼öÈ­µÈ ÀÛ¼º Äڵ带 Ãß°¡ÇÕ´Ï´Ù. - m_hWnd = GetSafeHwnd(); - - m_OverPoint = -1; - m_DraggingPoint = -1; - m_isTimeBarOver = FALSE; - m_isTimeBarDragging = FALSE; - - m_pdlgSoundData = new CResSoundData; - m_pdlgSoundData->Create(this); - m_pdlgSoundData->ShowWindow(FALSE); - - return 0; -} diff --git a/SoundArranger/GraphViewer.h b/SoundArranger/GraphViewer.h deleted file mode 100644 index 8ff68305..00000000 --- a/SoundArranger/GraphViewer.h +++ /dev/null @@ -1,81 +0,0 @@ -#pragma once - -#include -#include "Manager.h" - -class CResSoundData; - -// CGraphViewer ºäÀÔ´Ï´Ù. -class CGraphViewer : public CView, public CManager -{ - DECLARE_DYNCREATE(CGraphViewer) - -protected: - CGraphViewer(); // µ¿Àû ¸¸µé±â¿¡ »ç¿ëµÇ´Â protected »ý¼ºÀÚÀÔ´Ï´Ù. - virtual ~CGraphViewer(); - -public: - virtual void OnDraw(CDC* pDC); // ÀÌ ºä¸¦ ±×¸®±â À§ÇØ ÀçÁ¤ÀǵǾú½À´Ï´Ù. -#ifdef _DEBUG - virtual void AssertValid() const; - virtual void Dump(CDumpContext& dc) const; -#endif - -public: - afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct); - afx_msg void OnLButtonDown(UINT nFlags, CPoint point); - afx_msg void OnLButtonUp(UINT nFlags, CPoint point); - afx_msg void OnRButtonDown(UINT nFlags, CPoint point); - afx_msg void OnRButtonUp(UINT nFlags, CPoint point); - afx_msg void OnMouseMove(UINT nFlags, CPoint point); - afx_msg void OnPaint(); - -protected: - DECLARE_MESSAGE_MAP() - -public: - void Update(); - void Render(); - - void TimeToGraphPosition(const float & rTime, long * pPoint); - void GraphPositionToTime(const long & pPoint, float * pTime); - - void OnChangedSound(); - -protected: - void RenderSoundNodes(const NSound::TSoundDataVector & c_rVector); - - bool IsClickedTimebar(CPoint & rPoint); - bool GetClickPoint(CPoint & rPoint, int * pIndex); - void InsertSoundData(int ix); - void ChangeSoundData(int iPointIndex); - void DeleteSoundData(int iPointIndex); - -protected: - HWND m_hWnd; - CRect m_WindowRect; - - CScreen m_Screen; - CGraphicTextInstance * pTextInstance; - - int m_xMousePosition; - long m_lHalfHeight; - - CRect m_TimeBox; - BOOL m_isTimeBarOver; - BOOL m_isTimeBarDragging; - - int m_OverPoint; - int m_DraggingPoint; - - CResSoundData * m_pdlgSoundData; - - class CChangedSoundObserver : public CManager::IChangedDataObserver - { - public: - void SetOwner(CGraphViewer * pOwner) { m_pOwner = pOwner; } - void OnChangedSound() { m_pOwner->OnChangedSound(); } - protected: - CGraphViewer * m_pOwner; - } m_ChangedSoundObserver; -}; \ No newline at end of file diff --git a/SoundArranger/MainFrm.cpp b/SoundArranger/MainFrm.cpp deleted file mode 100644 index 0932d008..00000000 --- a/SoundArranger/MainFrm.cpp +++ /dev/null @@ -1,756 +0,0 @@ -// MainFrm.cpp : implementation of the CMainFrame class -// - -#include "stdafx.h" -#include "SoundArranger.h" - -#include "MainFrm.h" -#include "Util.h" - -/* -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif -*/ - -static UINT g_auiStatusIndicators[] = -{ - ID_SEPARATOR, // status line indicator -}; - -#include -#include - -float CCamera::CAMERA_MAX_DISTANCE = 2500.0f; - -///////////////////////////////////////////////////////////////////////////// -// CMainFrame - -IMPLEMENT_DYNAMIC(CMainFrame, CMDIFrameWnd) - -BEGIN_MESSAGE_MAP(CMainFrame, CMDIFrameWnd) - //{{AFX_MSG_MAP(CMainFrame) - ON_WM_CREATE() - ON_WM_CLOSE() - ON_COMMAND(ID_APP_SAVE_SOUND_DATA, OnAppSaveSoundData) - ON_COMMAND(ID_TOOLBAR_PLAY, OnToolbarPlay) - ON_COMMAND(ID_TOOLBAR_PLAYLOOP, OnToolbarPlayloop) - ON_COMMAND(ID_TOOLBAR_REVERSE, OnToolbarReverse) - ON_COMMAND(ID_TOOLBAR_PAUSE, OnToolbarPause) - ON_COMMAND(ID_TOOLBAR_STOP, OnToolbarStop) - ON_COMMAND(ID_KEYBOARD_PLAY, OnKeyboardPlay) - ON_COMMAND(ID_CANCEL_SOUND, OnCancelSound) - ON_UPDATE_COMMAND_UI(ID_VIEW_MODEL_LIST, OnUpdateViewModelList) - ON_COMMAND(ID_VIEW_MODEL_LIST, OnViewModelList) - ON_COMMAND(ID_VIEW_MOTION_LIST, OnViewMotionList) - ON_UPDATE_COMMAND_UI(ID_VIEW_MOTION_LIST, OnUpdateViewMotionList) - ON_COMMAND(ID_VIEW_MOTION_PROPERTY, OnViewMotionProperty) - ON_UPDATE_COMMAND_UI(ID_VIEW_MOTION_PROPERTY, OnUpdateViewMotionProperty) - ON_COMMAND(ID_VIEW_SOUND_LIST, OnViewSoundList) - ON_UPDATE_COMMAND_UI(ID_VIEW_SOUND_LIST, OnUpdateViewSoundList) - ON_COMMAND(ID_WORK_MODE_EDIT, OnWorkModeEdit) - ON_UPDATE_COMMAND_UI(ID_WORK_MODE_EDIT, OnUpdateWorkModeEdit) - ON_COMMAND(ID_WORK_MODE_VIEW, OnWorkModeView) - ON_UPDATE_COMMAND_UI(ID_WORK_MODE_VIEW, OnUpdateWorkModeView) - ON_COMMAND(ID_WORK_SCREEN_SHOT_CAPTURE, OnCaptureScreen) - ON_COMMAND(ID_WORK_RELOAD_ALL_RESOURCE, OnReloadAllResource) - ON_WM_TIMER() - ON_COMMAND(ID_CHAR_VISIBLE_TOGGLE, OnCharVisibleToggle) - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -static UINT indicators[] = -{ - ID_SEPARATOR, // status line indicator - ID_INDICATOR_CAPS, - ID_INDICATOR_NUM, - ID_INDICATOR_SCRL, -}; - -static const RGBTRIPLE kBackgroundColor = {192, 192, 192}; - -static void ReplaceBackgroundColor (CBitmap& ioBM) -{ - BITMAP bmInfo; - - VERIFY (ioBM.GetBitmap (&bmInfo)); - - VERIFY (bmInfo.bmBitsPixel == 24); -// VERIFY (bmInfo.bmWidthBytes == (bmInfo.bmWidth * 3)); - - const UINT numPixels (bmInfo.bmHeight * bmInfo.bmWidth); - - DIBSECTION ds; - - VERIFY (ioBM.GetObject (sizeof (DIBSECTION), &ds) == sizeof (DIBSECTION)); - - RGBTRIPLE* pixels = reinterpret_cast(ds.dsBm.bmBits); - VERIFY (pixels != NULL); - - const COLORREF buttonColor (::GetSysColor (COLOR_BTNFACE)); - const RGBTRIPLE userBackgroundColor = { - GetBValue (buttonColor), GetGValue (buttonColor), GetRValue (buttonColor)}; - - for (UINT i = 0; i < numPixels; ++i) - { - if (pixels [i].rgbtBlue == kBackgroundColor.rgbtBlue && - pixels [i].rgbtGreen == kBackgroundColor.rgbtGreen && - pixels [i].rgbtRed == kBackgroundColor.rgbtRed) - { - pixels [i] = userBackgroundColor; - } - } -} - -static void MakeToolbarImageList (UINT inBitmapID, CImageList & outImageList) -{ - CBitmap bm; - - VERIFY (bm.Attach (::LoadImage (::AfxFindResourceHandle( - MAKEINTRESOURCE (inBitmapID), RT_BITMAP), - MAKEINTRESOURCE (inBitmapID), IMAGE_BITMAP, 0, 0, - (LR_DEFAULTSIZE | LR_CREATEDIBSECTION)))); - - ::ReplaceBackgroundColor (bm); - - VERIFY (outImageList.Create(19, 31, ILC_COLOR24, 5, 0)); - VERIFY (outImageList.Add (&bm, RGB (0, 0, 0)) != -1); -} - -///////////////////////////////////////////////////////////////////////////// -// CMainFrame construction/destruction - -CMainFrame::CMainFrame() -{ - m_pSplitterWindow = NULL; - m_pDlgMotionViewMode = NULL; -} - -CMainFrame::~CMainFrame() -{ - ms_ActorInstance.Destroy(); - ms_RaceManager.DestroyAccessor(); - - if (m_pDlgMotionViewMode) - { - delete m_pDlgMotionViewMode; - m_pDlgMotionViewMode = NULL; - } - - if (m_pSplitterWindow) - { - delete m_pSplitterWindow; - m_pSplitterWindow = NULL; - } - - DestroyCollisionInstanceSystem(); - DestroyEffect(); - - if (ms_pEffectData) - ms_pEffectData->Clear(); - - m_EffectManager.Destroy(); - m_SoundManager.Destroy(); - Clear(); - - ///// - CTextFileLoader::DestroySystem(); - ms_EffectInstancePool.Clear(); - CParticleSystemInstance::DestroySystem(); - CEffectInstance::DestroySystem(); - CRaceData::DestroySystem(); - NRaceData::DestroySystem(); - CArea::DestroySystem(); - CActorInstance::DestroySystem(); -} - -int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) -{ - if (CMDIFrameWnd::OnCreate(lpCreateStruct) == -1) - return -1; - - // Initialize - if (CGraphicDevice::CREATE_OK != m_GraphicDevice.Create(GetSafeHwnd(), 1280, 960)) - return -1; - - if (-1 == CreateToolBar()) - return -1; - - if (-1 == CreateWindows()) - return -1; - - if (-1 == CreateStatusBar()) - return -1; - - m_pDlgMotionViewMode = new CDlgMotionViewMode; - m_pDlgMotionViewMode->Create(CDlgMotionViewMode::IDD, this); - m_pDlgMotionViewMode->SetWindowPos(NULL, 10, 600, 0, 0, TRUE); - m_pDlgMotionViewMode->ShowWindow(FALSE); - - m_SoundManager.Create(); - if (!Initialize()) - return -1; - - return 0; -} - -int CMainFrame::CreateToolBar() -{ - if (!m_wndPlayToolBar.CreateEx(this, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_TOP - | CBRS_GRIPPER | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC) || - !m_wndPlayToolBar.LoadToolBar(IDR_TOOLBAR)) - { - TRACE0("µµ±¸ ¸ðÀ½À» ¸¸µéÁö ¸øÇß½À´Ï´Ù.\n"); - return -1; - } - - ::MakeToolbarImageList(IDB_TOOLBAR, m_ImageList); - - CToolBarCtrl & rToolBarCtrl = m_wndPlayToolBar.GetToolBarCtrl(); - rToolBarCtrl.SetImageList(&m_ImageList); - rToolBarCtrl.SetDisabledImageList(&m_ImageListDisabled); - rToolBarCtrl.SetHotImageList(&m_ImageListHot); - - m_wndPlayToolBar.EnableDocking(CBRS_ALIGN_ANY); - EnableDocking(CBRS_ALIGN_ANY); - DockControlBar(&m_wndPlayToolBar); - - /////////////////////////////////////////////////////////////////////////////////////////////// - - if (!m_wndToolBarWindow.CreateEx(this, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_TOP - | CBRS_GRIPPER | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC)) - return FALSE; - - if (!m_wndToolBarWindow.LoadToolBar(IDR_TOOLBAR_WINDOW)) - return FALSE; - if (!m_wndToolBarWindow.LoadTrueColorToolBar(36, IDB_TOOLBAR_WINDOW, IDB_TOOLBAR_WINDOW, IDB_TOOLBAR_WINDOW)) - return FALSE; - - m_wndToolBarWindow.EnableDocking(CBRS_ALIGN_ANY); - EnableDocking(CBRS_ALIGN_ANY); - DockControlBar(&m_wndToolBarWindow, AFX_IDW_DOCKBAR_TOP); - - /////////////////////////////////////////////////////////////////////////////////////////////// - - if (!m_wndToolBarMode.CreateEx(this, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_TOP - | CBRS_GRIPPER | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC)) - return FALSE; - - if (!m_wndToolBarMode.LoadToolBar(IDR_TOOLBAR_MODE)) - return FALSE; - - m_wndToolBarMode.EnableDocking(CBRS_ALIGN_ANY); - DockControlBar(&m_wndToolBarMode, AFX_IDW_DOCKBAR_TOP); - ShowControlBar(&m_wndToolBarMode, FALSE, FALSE); - - ///// - ///// - - // NOTE : Position ¹èÄ¡ »ç¿ë¹ý - // 1. ±âÁØÀÌ µÇ´Â ToolBarÀÇ Rect¸¦ ¾ò´Â´Ù. - // 2. ¾òÀº Rect¿¡¼­ ¿øÇÏ´Â ¹æÇâÀ¸·Î OffsetRect ½ÃŲ´Ù. - // 3. º¯È¯µÈ Rect·Î DockÀ» Çѹø ´õ ÇØÁØ´Ù. - // [levites] - - RecalcLayout(); - - CRect PlayToolBarRect; - m_wndPlayToolBar.GetWindowRect(PlayToolBarRect); - PlayToolBarRect.OffsetRect(1, 0); - DockControlBar(&m_wndToolBarWindow, AFX_IDW_DOCKBAR_TOP, PlayToolBarRect); - - RecalcLayout(); - - CRect WindowToolBarRect; - m_wndToolBarWindow.GetWindowRect(WindowToolBarRect); - WindowToolBarRect.OffsetRect(1, 0); - DockControlBar(&m_wndToolBarMode, AFX_IDW_DOCKBAR_TOP, WindowToolBarRect); - - return 0; -} - -int CMainFrame::CreateWindows() -{ - ///// - // Model List Bar - if (!m_wndModelListBar.Create(_T("Model List"), this, CSize(200, 300), TRUE, 5002)) - { - TRACE0("Failed to create Property Bar\n"); - return -1; // fail to create - } - m_wndModelListBar.SetBarStyle(m_wndModelListBar.GetBarStyle() | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC); - m_wndModelListBar.SetSCBStyle(m_wndModelListBar.GetSCBStyle() | SCBS_SIZECHILD); - m_wndModelListBar.EnableDocking(CBRS_ALIGN_LEFT); - ShowControlBar(&m_wndModelListBar, TRUE, FALSE); - DockControlBar(&m_wndModelListBar, AFX_IDW_DOCKBAR_LEFT); - ////////////////////////////////////////////////////////////////////////////////////////////// - if (!m_resModelList.Create(WS_CHILD|WS_VISIBLE|TVS_HASLINES|TVS_HASBUTTONS|TVS_LINESATROOT|TVS_SHOWSELALWAYS, CRect(0, 0, 0, 0), &m_wndModelListBar, 5102)) - { - TRACE0("Failed to create instant bar child\n"); - return -1; - } - m_resModelList.ModifyStyleEx(0, WS_EX_CLIENTEDGE); - ///// - CreateHighColorImageList(IDB_MODEL_TREE_ITEM, &m_ModelTreeItemImage); - m_resModelList.SetImageList(&m_ModelTreeItemImage, TVSIL_NORMAL); - ////////////////////////////////////////////////////////////////////////////////////////////// - - ///// - // Motion List Bar - if (!m_wndMotionListBar.Create(_T("Motion List"), this, CSize(200, 300), TRUE, 5003)) - { - TRACE0("Failed to create Property Bar\n"); - return -1; // fail to create - } - - m_wndMotionListBar.SetBarStyle(m_wndMotionListBar.GetBarStyle() | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC); - m_wndMotionListBar.SetSCBStyle(m_wndMotionListBar.GetSCBStyle() | SCBS_SIZECHILD); - m_wndMotionListBar.EnableDocking(CBRS_ALIGN_LEFT); - - ShowControlBar(&m_wndMotionListBar, TRUE, FALSE); - DockControlBar(&m_wndMotionListBar, AFX_IDW_DOCKBAR_LEFT); - - ////////////////////////////////////////////////////////////////////////////////////////////// - if (!m_resMotionList.Create(WS_CHILD|WS_VISIBLE|LVS_LIST|LVS_SORTASCENDING|LVS_SHOWSELALWAYS|LVS_SINGLESEL, CRect(0, 0, 0, 0), &m_wndMotionListBar, 5103)) - { - TRACE0("Failed to create instant bar child\n"); - return -1; - } - m_resMotionList.ModifyStyleEx(0, WS_EX_CLIENTEDGE); - ////////////////////////////////////////////////////////////////////////////////////////////// - - ///// - // Sound List Bar - if (!m_wndSoundListBar.Create(_T("Sound List"), this, CSize(200, 300), TRUE, 5005)) - { - TRACE0("Failed to create Property Bar\n"); - return -1; // fail to create - } - m_wndSoundListBar.SetBarStyle(m_wndSoundListBar.GetBarStyle() | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC); - m_wndSoundListBar.SetSCBStyle(m_wndSoundListBar.GetSCBStyle() | SCBS_SIZECHILD); - m_wndSoundListBar.EnableDocking(CBRS_ALIGN_RIGHT); - ShowControlBar(&m_wndSoundListBar, TRUE, FALSE); - DockControlBar(&m_wndSoundListBar, AFX_IDW_DOCKBAR_RIGHT); - ////////////////////////////////////////////////////////////////////////////////////////////// - if (!m_pageSoundList.Create((CWnd*)&m_wndSoundListBar)) - { - TRACE0("Failed to create instant bar child\n"); - return -1; - } - ////////////////////////////////////////////////////////////////////////////////////////////// - - ///// - // Motion Property - if (!m_wndPropertyWindow.Create(_T("Motion Property"), this, CSize(200, 470), TRUE, 5004)) - { - TRACE0("Failed to create Property Bar\n"); - return -1; // fail to create - } - m_wndPropertyWindow.SetBarStyle(m_wndPropertyWindow.GetBarStyle() | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC); - m_wndPropertyWindow.EnableDocking(CBRS_ALIGN_RIGHT); - ShowControlBar(&m_wndPropertyWindow, TRUE, FALSE); - //////////////////////////////////////////////////////////// - RecalcLayout(); - CRect PropertyBarRect; - m_wndSoundListBar.GetWindowRect(PropertyBarRect); - DockControlBar(&m_wndPropertyWindow, AFX_IDW_DOCKBAR_RIGHT, PropertyBarRect); - ////////////////////////////////////////////////////////////////////////////////////////////// - if (!m_pageMotionProperty.Create((CWnd*)&m_wndPropertyWindow)) - { - TRACE0("Failed to create instant bar child\n"); - return -1; - } - ////////////////////////////////////////////////////////////////////////////////////////////// - - RecalcLayout(); - - // ¿©±â¼­ ´Ù½Ã m_wndModelListBar µµÅ·À» ÇØÁÖ´Â ÀÌÀ¯´Â, ÀÌ·¸°Ô ÇÏÁö ¾ÊÀ¸¸é - // ¸ð¼Ç ¸®½ºÆ®¿Í ¸ðµ¨ ¸®½ºÆ® µµÅ·¹Ù°¡ ¼¼·Î·Î µÎ°³ ÇÑÁÙ·Î ¾ÈºÙ°í µÎÁÙÀ» Â÷Áö - // Çϱ⠶§¹®ÀÌ´Ù. - // ÇÑÁÙ : | ¼¼·Î·Î µÎÁÙ : || - // | || - CRect ModelListBarRect; - m_wndMotionListBar.GetWindowRect(ModelListBarRect); - DockControlBar(&m_wndModelListBar, AFX_IDW_DOCKBAR_LEFT, ModelListBarRect); - - return 0; -} - -BOOL CMainFrame::CreateStatusBar() -{ - if (!m_wndStatusBar.Create(this) || - !m_wndStatusBar.SetIndicators(g_auiStatusIndicators, sizeof(g_auiStatusIndicators) / sizeof(UINT))) - return FALSE; - - return TRUE; -} - -void CMainFrame::SetStatusBarString(const char * c_pszStr) -{ - m_wndStatusBar.SetPaneText(0, c_pszStr, TRUE); -} - -BOOL CMainFrame::OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext* pContext) -{ - m_pSplitterWindow = new ST_SplitterWnd(); - m_pSplitterWindow->Create(this, RUNTIME_CLASS(CGraphViewer), RUNTIME_CLASS(CModelViewer), pContext, false); - - m_pGraphViewer = (CGraphViewer *) m_pSplitterWindow->GetPane(0, 0); - m_pModelViewer = (CModelViewer *) m_pSplitterWindow->GetPane(1, 0); - - return TRUE; -} - -BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs) -{ - if (!CMDIFrameWnd::PreCreateWindow(cs)) - return FALSE; - - cs.x = 0; - cs.y = 0; - cs.cx = 1024; - cs.cy = 768; - - return TRUE; -} - -///////////////////////////////////////////////////////////////////////////// -// CMainFrame diagnostics - -#ifdef _DEBUG -void CMainFrame::AssertValid() const -{ - CMDIFrameWnd::AssertValid(); -} - -void CMainFrame::Dump(CDumpContext& dc) const -{ - CMDIFrameWnd::Dump(dc); -} - -#endif //_DEBUG - -///////////////////////////////////////////////////////////////////////////// -// CMainFrame message handlers - -void CMainFrame::OnClose() -{ - if (isEdit()) - { - int result = MessageBox("ij¸¯ÅÍ »ç¿îµå µ¥ÀÌŸ°¡ ¼öÁ¤ µÇ¾ú½À´Ï´Ù. ÀúÀå ÇϽðڽÀ´Ï±î?", NULL, MB_YESNOCANCEL); - - switch(result) - { - case 6: // Yes - SaveSoundInformation(); - break; - - case 7: // No - break; - - case 2: // Cancel - return; - break; - } - } - - CMDIFrameWnd::OnClose(); -} - -void CMainFrame::OnAppSaveSoundData() -{ - SaveSoundInformation(); -} - -///////////////////////////////////////////////////////////////////////////// -// CMainFrame Normal Functions - -bool PackInitialize(const char * c_pszFolder) -{ - if (access(c_pszFolder, 0) != 0) - return true; - - std::string stFolder(c_pszFolder); - stFolder += "/"; - - std::string stFileName(stFolder); - stFileName += "Index"; - - CMappedFile file; - LPCVOID pvData; - - if (!file.Create(stFileName.c_str(), &pvData, 0, 0)) - { - LogBoxf("FATAL ERROR! File not exist: %s", stFileName.c_str()); - TraceError("FATAL ERROR! File not exist: %s", stFileName.c_str()); - return true; - } - - CMemoryTextFileLoader TextLoader; - TextLoader.Bind(file.Size(), pvData); - - bool bPackFirst = TRUE; - - std::string strPackType = TextLoader.GetLineString(0).c_str(); - - if (strPackType.compare("FILE") && strPackType.compare("PACK")) - { - TraceError("Pack/Index has invalid syntax. First line must be 'PACK' or 'FILE'"); - return false; - } - - if (0 == strPackType.compare("FILE")) - { - bPackFirst = FALSE; - Tracef("¾Ë¸²: ÆÄÀÏ ¸ðµåÀÔ´Ï´Ù.\n"); - } - else - { - Tracef("¾Ë¸²: ÆÑ ¸ðµåÀÔ´Ï´Ù.\n"); - } - - CEterPackManager::Instance().SetSearchMode(bPackFirst); - - CSoundData::SetPackMode(); // Miles ÆÄÀÏ ÄݹéÀ» ¼ÂÆà - - for (DWORD i = 1; i < TextLoader.GetLineCount() - 1; i += 2) - { - const std::string & c_rstFolder = TextLoader.GetLineString(i); - const std::string & c_rstName = TextLoader.GetLineString(i + 1); - - CEterPackManager::Instance().RegisterPack((stFolder + c_rstName).c_str(), c_rstFolder.c_str()); - } - - CEterPackManager::Instance().RegisterRootPack((stFolder + std::string("root")).c_str()); - return true; -} - -bool CMainFrame::Initialize() -{ - FILE * file = fopen("config.cfg", "r"); - if (file) - { - char szLine[256+1]; - if (fgets(szLine, 256, file)) - { - int ir, ig, ib; - sscanf(szLine, " %d %d %d ", &ir, &ig, &ib); - - extern float g_frClearColor; - extern float g_fgClearColor; - extern float g_fbClearColor; - - g_frClearColor = float(ir) / 255.0f; - g_fgClearColor = float(ig) / 255.0f; - g_fbClearColor = float(ib) / 255.0f; - } - - fclose(file); - } - - ///////// - - __InitGrannyError(); - - ms_pEffectData = new CEffectData; - ms_RaceManager.SetRaceData(0, &ms_RaceData); - - CTimer& rkTimer=CTimer::Instance(); - rkTimer.SetBaseTime(); - rkTimer.UseCustomTime(); - - RegisterResource(); - m_LightManager.Initialize(); - -#ifdef _DEBUG - OpenConsoleWindow(); -#endif - - PackInitialize("pack"); - - LoadSoundScript("SoundScript.txt"); - LoadSoundInformation(); - - return true; -} - -void CMainFrame::Process() -{ - long lStartTime = timeGetTime(); - - CTimer& rkTimer=CTimer::Instance(); - rkTimer.Advance(); - - m_pGraphViewer->Update(); - - TimeProcess(); - - m_pModelViewer->Render(); - m_pGraphViewer->Render(); - - long lElapsedTime = timeGetTime() - lStartTime; - if (lElapsedTime < 16) - { - Sleep(16 - lElapsedTime); - } -} - -void CMainFrame::Clear() -{ - ms_iMode = MODE_EDIT; - ms_icurType = MODEL_TYPE_NONE; - ms_isEdit = false; - ms_PlayFlag = false; - ms_LoopFlag = false; - ms_fLocalTime = 0.001f; - ms_dwLocalFrame = 0; - ms_dwModelIndex = 0; - ms_dwShapeIndex = 0; - ms_dwMotionIndex = 0; - ms_dwSoundIndex = 0; - SetLimitTime(2.0f); - - ms_ActorInstance.Clear(); - if (ms_pEffectData) - { - ms_pEffectData->Clear(); - delete ms_pEffectData; - } - ms_pEffectData = NULL; - stl_wipe_second(ms_ItemDataMap); -} - -// ViewModelList -void CMainFrame::OnViewModelList() -{ - if (m_wndModelListBar.IsVisible()) - ShowControlBar(&m_wndModelListBar, FALSE, FALSE); - else - ShowControlBar(&m_wndModelListBar, TRUE, FALSE); -} -void CMainFrame::OnUpdateViewModelList(CCmdUI* pCmdUI) -{ - pCmdUI->Enable(); - pCmdUI->SetCheck(m_wndModelListBar.IsVisible()); -} - -// ViewMotionList -void CMainFrame::OnViewMotionList() -{ - if (m_wndMotionListBar.IsVisible()) - ShowControlBar(&m_wndMotionListBar, FALSE, FALSE); - else - ShowControlBar(&m_wndMotionListBar, TRUE, FALSE); -} -void CMainFrame::OnUpdateViewMotionList(CCmdUI* pCmdUI) -{ - pCmdUI->Enable(); - pCmdUI->SetCheck(m_wndMotionListBar.IsVisible()); -} - -// ViewMotionProperty -void CMainFrame::OnViewMotionProperty() -{ - if (m_wndPropertyWindow.IsVisible()) - ShowControlBar(&m_wndPropertyWindow, FALSE, FALSE); - else - ShowControlBar(&m_wndPropertyWindow, TRUE, FALSE); -} -void CMainFrame::OnUpdateViewMotionProperty(CCmdUI* pCmdUI) -{ - pCmdUI->Enable(); - pCmdUI->SetCheck(m_wndPropertyWindow.IsVisible()); -} - -// ViewSoundList -void CMainFrame::OnViewSoundList() -{ - if (m_wndSoundListBar.IsVisible()) - ShowControlBar(&m_wndSoundListBar, FALSE, FALSE); - else - ShowControlBar(&m_wndSoundListBar, TRUE, FALSE); -} -void CMainFrame::OnUpdateViewSoundList(CCmdUI* pCmdUI) -{ - pCmdUI->Enable(); - pCmdUI->SetCheck(m_wndSoundListBar.IsVisible()); -} - -// Mode - Edit -void CMainFrame::OnWorkModeEdit() -{ - ms_iMode = MODE_EDIT; - m_pDlgMotionViewMode->ShowWindow(FALSE); -} -void CMainFrame::OnUpdateWorkModeEdit(CCmdUI* pCmdUI) -{ - pCmdUI->Enable(); - pCmdUI->SetCheck(MODE_EDIT == ms_iMode); -} - -// Mode - View -void CMainFrame::OnWorkModeView() -{ - ms_iMode = MODE_VIEW; - m_pDlgMotionViewMode->ShowWindow(TRUE); -} -void CMainFrame::OnUpdateWorkModeView(CCmdUI* pCmdUI) -{ - pCmdUI->Enable(); - pCmdUI->SetCheck(MODE_VIEW == ms_iMode); -} - -// Granny Error -void CMainFrame::GrannyError(granny_log_message_type Type, - granny_log_message_origin Origin, - char const *Error, - void *UserData) -{ - TCharacterDataMap::iterator itorModel = ms_CharacterDataMap.find(ms_dwModelIndex); - if (itorModel == ms_CharacterDataMap.end()) - return; - - TCharacterData & rCharacterData = itorModel->second; - TMotionDataMap::iterator itorMotion = rCharacterData.MotionDataMap.find(ms_dwMotionIndex); - if (rCharacterData.MotionDataMap.end() != itorMotion) - { - TMotionData & rMotionData = itorMotion->second; - - Tracef("CurrentAnimationFile : %s\n", rMotionData.strFullFileName.c_str()); - TraceError("GRANNY: %s", Error); - Tracef("\n"); - } -} - -void CMainFrame::__InitGrannyError() -{ - granny_log_callback Callback; - Callback.Function = GrannyError; - Callback.UserData = 0; - GrannySetLogCallback(&Callback); -} - -void CMainFrame::OnCaptureScreen() -{ -} - -void CMainFrame::OnReloadAllResource() -{ - ms_RaceData.Destroy(); - ms_ActorInstance.Clear(); - ms_ActorInstance.ClearAttachingEffect(); - ms_pEffectData->Clear(); - CEffectManager::Instance().DeleteAllInstances(); - DestroyEffect(); - Refresh(); -} - -void CMainFrame::OnCharVisibleToggle() -{ - if (!m_pModelViewer) - return; - - m_pModelViewer->ToggleVisable(); -} diff --git a/SoundArranger/MainFrm.h b/SoundArranger/MainFrm.h deleted file mode 100644 index 29cc788a..00000000 --- a/SoundArranger/MainFrm.h +++ /dev/null @@ -1,178 +0,0 @@ -// MainFrm.h : interface of the CMainFrame class -// -///////////////////////////////////////////////////////////////////////////// - -#if !defined(AFX_MAINFRM_H__C7A49A70_9E36_48C4_8F16_85CC22722D2E__INCLUDED_) -#define AFX_MAINFRM_H__C7A49A70_9E36_48C4_8F16_85CC22722D2E__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "ST_SplitterWnd.h" -#include "DlgMotionViewMode.h" -#include "ResModelList.h" -#include "ResMotionList.h" -#include "PageSoundList.h" -#include "PageMotionProperty.h" - -#include "ModelViewer.h" -#include "GraphViewer.h" - -class CMainFrame : public CMDIFrameWnd, public CManager -{ - DECLARE_DYNAMIC(CMainFrame) -public: - CMainFrame(); - -// Attributes -public: - -// Operations -public: - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CMainFrame) - public: - virtual BOOL PreCreateWindow(CREATESTRUCT& cs); - protected: - virtual BOOL OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext* pContext); - //}}AFX_VIRTUAL - -// Implementation -public: - virtual ~CMainFrame(); -#ifdef _DEBUG - virtual void AssertValid() const; - virtual void Dump(CDumpContext& dc) const; -#endif - -// Generated message map functions -protected: - //{{AFX_MSG(CMainFrame) - afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct); - afx_msg void OnClose(); - afx_msg void OnAppSaveSoundData(); - afx_msg void OnToolbarPlay(); - afx_msg void OnToolbarPlayloop(); - afx_msg void OnToolbarReverse(); - afx_msg void OnToolbarPause(); - afx_msg void OnToolbarStop(); - afx_msg void OnKeyboardPlay(); - afx_msg void OnCancelSound(); - afx_msg void OnUpdateViewModelList(CCmdUI* pCmdUI); - afx_msg void OnViewModelList(); - afx_msg void OnViewMotionList(); - afx_msg void OnUpdateViewMotionList(CCmdUI* pCmdUI); - afx_msg void OnViewMotionProperty(); - afx_msg void OnUpdateViewMotionProperty(CCmdUI* pCmdUI); - afx_msg void OnViewSoundList(); - afx_msg void OnUpdateViewSoundList(CCmdUI* pCmdUI); - afx_msg void OnWorkModeEdit(); - afx_msg void OnUpdateWorkModeEdit(CCmdUI* pCmdUI); - afx_msg void OnWorkModeView(); - afx_msg void OnUpdateWorkModeView(CCmdUI* pCmdUI); - afx_msg void OnCaptureScreen(); - afx_msg void OnReloadAllResource(); - afx_msg void OnCharVisibleToggle(); - //}}AFX_MSG - DECLARE_MESSAGE_MAP() - -public: - bool Initialize(); - void Clear(); - - void ControlSoundInformationFiles(BOOL isLoad); - void LoadSoundInformation(); - void SaveSoundInformation(); - - BOOL LoadSoundScript(const char * c_szFileName); - BOOL LoadSoundScriptGroup(HTREEITEM hParent, CTextFileLoader & rTextFileLoader); - BOOL LoadSoundScriptModel(HTREEITEM hParent, CTextFileLoader & rTextFileLoader, EModelType eModelType); - BOOL LoadSoundScriptEffect(HTREEITEM hParent, CTextFileLoader & rTextFileLoader); - BOOL LoadSoundScriptEquipment(CTextFileLoader & rTextFileLoader, TEquipmentDataList & rEquipmentDataList); - - void SetStatusBarString(const char * c_pszStr); - - void Process(); - -protected: - void RegisterResource(); - - int CreateToolBar(); - int CreateWindows(); - int CreateStatusBar(); - - void __InitGrannyError(); - static void GrannyError(granny_log_message_type Type, granny_log_message_origin Origin, char const *Error, void *UserData); - -protected: - ST_SplitterWnd * m_pSplitterWindow; - CToolBar m_wndPlayToolBar; - CTrueColorToolBar m_wndToolBarWindow; - CTrueColorToolBar m_wndToolBarMode; - CDlgMotionViewMode * m_pDlgMotionViewMode; - - // Status Bar - CStatusBar m_wndStatusBar; - - // Model List - CSizingControlBarCF m_wndModelListBar; - CResModelList m_resModelList; - - // Motion List - CSizingControlBarCF m_wndMotionListBar; - CResMotionList m_resMotionList; - - // Current Motion Property - CSizingControlBarCF m_wndPropertyWindow; - CPageMotionProperty m_pageMotionProperty; - - // Sound List - CSizingControlBarCF m_wndSoundListBar; - CPageSoundList m_pageSoundList; - - CModelViewer * m_pModelViewer; - CGraphViewer * m_pGraphViewer; - - CImageList m_ImageList; - CImageList m_ImageListHot; - CImageList m_ImageListDisabled; - CImageList m_ModelTreeItemImage; - - std::string m_stCharacterSetFileName; - -private: - CGraphicDevice m_GraphicDevice; - CEffectManager m_EffectManager; - CSoundManager m_SoundManager; - CEterPack m_pack; - CEterPackManager m_EterPackManager; - CResourceManager m_resourceManager; - CGameEventManager m_eventManager; - CLZO lzo; - CLightManager m_LightManager; - CTimer m_Timer; - CFlyingManager m_FlyingManager; - CCullingManager m_CullingManager; -}; - -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_MAINFRM_H__C7A49A70_9E36_48C4_8F16_85CC22722D2E__INCLUDED_) diff --git a/SoundArranger/MainFrmControl.cpp b/SoundArranger/MainFrmControl.cpp deleted file mode 100644 index 1f84a300..00000000 --- a/SoundArranger/MainFrmControl.cpp +++ /dev/null @@ -1,47 +0,0 @@ -#include "StdAfx.h" -#include "MainFrm.h" - -void CMainFrame::OnToolbarReverse() -{ - ms_fLocalTime = 0.001f; - ms_dwLocalFrame = 0; -} - -void CMainFrame::OnToolbarPlay() -{ - PlayMotion(); -} - -void CMainFrame::OnToolbarPlayloop() -{ - PlayMotion(TRUE); -} - -void CMainFrame::OnToolbarStop() -{ - OnToolbarReverse(); - ms_PlayFlag = false; -} - -void CMainFrame::OnToolbarPause() -{ - ms_PlayFlag = !ms_PlayFlag; -} - -void CMainFrame::OnKeyboardPlay() -{ - OnToolbarPlay(); -} - -//void CMainFrame::OnUpdateWorkLoop(CCmdUI *pCmdUI) -//{ -// if (ms_LoopFlag) -// pCmdUI->SetCheck(1); -// else -// pCmdUI->SetCheck(0); -//} - -void CMainFrame::OnCancelSound() -{ - SetSoundIndex(0); -} diff --git a/SoundArranger/MainFrmFile.cpp b/SoundArranger/MainFrmFile.cpp deleted file mode 100644 index 9537b6c8..00000000 --- a/SoundArranger/MainFrmFile.cpp +++ /dev/null @@ -1,350 +0,0 @@ -#include "StdAfx.h" -#include "MainFrm.h" - -#include - -void CMainFrame::LoadSoundInformation() -{ - ControlSoundInformationFiles(TRUE); -} - -void CMainFrame::SaveSoundInformation() -{ - ControlSoundInformationFiles(FALSE); - LogBox("ÀúÀåÀÌ ¿Ï·á µÇ¾ú½À´Ï´Ù", "¾Ë¸²", GetSafeHwnd()); -} - -void CMainFrame::ControlSoundInformationFiles(BOOL isLoad) -{ - TCharacterDataMap::iterator itor = ms_CharacterDataMap.begin(); - - for (; itor != ms_CharacterDataMap.end(); ++itor) - { - TCharacterData & rCharacterData = itor->second; - - /////////////////////////////////////////////////////////////////////////////////////////// - const char * c_szPathHeaderName = "d:/ymir work/"; - - if (strncmp(rCharacterData.strPathName.c_str(), c_szPathHeaderName, strlen(c_szPathHeaderName))) - { - LogBoxf("ÆÄÀÏ °æ·ÎÀÇ ½ÃÀÛÀÌ d:\\ymir work°¡ ¾Æ´Õ´Ï´Ù. (path: %s)", rCharacterData.strPathName.c_str()); - continue; - } - /////////////////////////////////////////////////////////////////////////////////////////// - - std::string strSifPath; - strSifPath = "sound/"; - strSifPath += rCharacterData.strPathName.substr(strlen(c_szPathHeaderName), -1); - - MyCreateDirectory(strSifPath.c_str()); - - ///// - - if (MODEL_TYPE_EFFECT == rCharacterData.eModelType) - { - std::string strModelPath; - std::string strModelName; - std::string strModelExtension; - - GetFilePathNameExtension(rCharacterData.strModelScriptFileName.c_str(), - rCharacterData.strModelScriptFileName.length(), - &strModelPath, &strModelName, &strModelExtension); - - std::string strSoundInformationFileName; - - strSoundInformationFileName = strSifPath; - strSoundInformationFileName += strModelName; - strSoundInformationFileName += ".mss"; - - if (isLoad) - { - if (!NSound::LoadSoundInformationPiece(strSoundInformationFileName.c_str(), rCharacterData.SoundDataVector)) - SetStatusBarString(NSound::GetResultString()); - } - else - { - if (!NSound::SaveSoundInformationPiece(strSoundInformationFileName.c_str(), rCharacterData.SoundDataVector)) - SetStatusBarString(NSound::GetResultString()); - } - } - else - { - TMotionDataMap::iterator itorMotion = rCharacterData.MotionDataMap.begin(); - - for (; itorMotion != rCharacterData.MotionDataMap.end(); ++itorMotion) - { - TMotionData & rMotionData = itorMotion->second; - - std::string strMotionPath; - std::string strMotionName; - std::string strMotionExtension; - GetFilePathNameExtension(rMotionData.strFullFileName.c_str(), - rMotionData.strFullFileName.length(), - &strMotionPath, &strMotionName, &strMotionExtension); - - std::string strSoundInformationFileName; - strSoundInformationFileName = strSifPath; - strSoundInformationFileName += strMotionName; - strSoundInformationFileName += ".mss"; - - if (isLoad) - { - if (!NSound::LoadSoundInformationPiece(strSoundInformationFileName.c_str(), rMotionData.SoundDataVector)) - SetStatusBarString(NSound::GetResultString()); - } - else - { - if (!NSound::SaveSoundInformationPiece(strSoundInformationFileName.c_str(), rMotionData.SoundDataVector)) - SetStatusBarString(NSound::GetResultString()); - } - } - } - } - - ms_isEdit = false; -} - -CMainFrame::EModelType GetModelType(const char * c_szTypeName) -{ - CMainFrame::EModelType eModelType = CManager::MODEL_TYPE_NONE; - if (0 == strcmp(c_szTypeName, "PLAYER")) - { - eModelType = CManager::MODEL_TYPE_PLAYER; - } - else if (0 == strcmp(c_szTypeName, "ENEMY")) - { - eModelType = CManager::MODEL_TYPE_ENEMY; - } - else if (0 == strcmp(c_szTypeName, "EFFECT")) - { - eModelType = CManager::MODEL_TYPE_EFFECT; - } - - return eModelType; -} - -BOOL CMainFrame::LoadSoundScript(const char * c_szFileName) -{ - CTextFileLoader TextFileLoader; - if (!TextFileLoader.Load(c_szFileName)) - return FALSE; - - TextFileLoader.SetTop(); - LoadSoundScriptGroup(TVI_ROOT, TextFileLoader); - - return TRUE; -} - -BOOL CMainFrame::LoadSoundScriptGroup(HTREEITEM hParent, CTextFileLoader & rTextFileLoader) -{ - for (DWORD i = 0; i < rTextFileLoader.GetChildNodeCount(); ++i) - { - if (!rTextFileLoader.SetChildNode(i)) - return FALSE; - - std::string strGroupName; - if (!rTextFileLoader.GetCurrentNodeName(&strGroupName)) - return FALSE; - - std::string strGroupType; - if (!rTextFileLoader.GetTokenString("type", &strGroupType)) - return FALSE; - - if (0 == strGroupType.compare("GROUP")) - { - HTREEITEM hGroupItem = m_resModelList.InsertItem(_T(strGroupName.c_str()), 0, 1, hParent, TVI_LAST); - if (!LoadSoundScriptGroup(hGroupItem, rTextFileLoader)) - return FALSE; - } - else if (0 == strGroupType.compare("PLAYER")) - { - if (!LoadSoundScriptModel(hParent, rTextFileLoader, MODEL_TYPE_PLAYER)) - return FALSE; - } - else if (0 == strGroupType.compare("NPC")) - { - if (!LoadSoundScriptModel(hParent, rTextFileLoader, MODEL_TYPE_NPC)) - return FALSE; - } - else if (0 == strGroupType.compare("ENEMY")) - { - if (!LoadSoundScriptModel(hParent, rTextFileLoader, MODEL_TYPE_ENEMY)) - return FALSE; - } - else if (0 == strGroupType.compare("EFFECT")) - { - if (!LoadSoundScriptEffect(hParent, rTextFileLoader)) - return FALSE; - } - - rTextFileLoader.SetParentNode(); - } - - return TRUE; -} - -BOOL CMainFrame::LoadSoundScriptModel(HTREEITEM hParent, CTextFileLoader & rTextFileLoader, EModelType eModelType) -{ - TCharacterData CharacterData; - CharacterData.eModelType = eModelType; - - if (!rTextFileLoader.GetCurrentNodeName(&CharacterData.strName)) - { - assert(!"FALSE"); - return FALSE; - } - - std::string strPathName; - if (!rTextFileLoader.GetTokenString("pathname", &strPathName)) - { - assert(!"FALSE"); - return FALSE; - } - - StringPath(strPathName.c_str(), CharacterData.strPathName); - CharacterData.strPathName += "/"; - - if (!rTextFileLoader.GetTokenString("modelscriptfilename", &CharacterData.strModelScriptFileName)) - { - assert(!"FALSE"); - return FALSE; - } - - // Equipment - LoadSoundScriptEquipment(rTextFileLoader, CharacterData.EquipmentDataList); - - DWORD dwMotionCount; - if (!rTextFileLoader.GetTokenDoubleWord("motioncount", &dwMotionCount)) - { - assert(!"FALSE"); - return FALSE; - } - - for (DWORD i = 0; i < dwMotionCount; ++i) - { - if (!rTextFileLoader.SetChildNode("motion", i)) - { - assert(!"FALSE"); - return FALSE; - } - - TMotionData MotionData; - - if (!rTextFileLoader.GetTokenString("name", &MotionData.strName)) - { - assert(!"FALSE"); - return FALSE; - } - std::string strFileName; - if (!rTextFileLoader.GetTokenString("motionscriptfilename", &strFileName)) - { - assert(!"FALSE"); - return FALSE; - } - - MotionData.strFullFileName = CharacterData.strPathName; - MotionData.strFullFileName += strFileName; - MotionData.strFullFileName += ".msa"; - - LoadSoundScriptEquipment(rTextFileLoader, MotionData.EquipmentDataList); - - DWORD dwMotionCRC32 = GetCaseCRC32(MotionData.strFullFileName.c_str(), MotionData.strFullFileName.length()); - CharacterData.MotionDataMap.insert(TMotionDataMap::value_type(dwMotionCRC32, MotionData)); - - BOOL isBasisMotion; - if (rTextFileLoader.GetTokenBoolean("basismotion", &isBasisMotion)) - { - if (isBasisMotion) - CharacterData.BasisMotionIDVector.push_back(dwMotionCRC32); - } - - ///// - rTextFileLoader.SetParentNode(); - } - - DWORD dwCRC32 = GetCaseCRC32(CharacterData.strPathName.c_str(), CharacterData.strPathName.length()); - ms_CharacterDataMap.insert(TCharacterDataMap::value_type(dwCRC32, CharacterData)); - - int iIconIndex = 2; - if (MODEL_TYPE_PLAYER == eModelType) - iIconIndex = 2; - else if (MODEL_TYPE_ENEMY == eModelType) - iIconIndex = 3; - - HTREEITEM hcurItem = m_resModelList.InsertItem(_T(CharacterData.strName.c_str()), iIconIndex, iIconIndex, hParent, TVI_LAST); - m_resModelList.SetItemData(hcurItem, dwCRC32); - - return TRUE; -} - -BOOL CMainFrame::LoadSoundScriptEffect(HTREEITEM hParent, CTextFileLoader & rTextFileLoader) -{ - TCharacterData CharacterData; - CharacterData.eModelType = MODEL_TYPE_EFFECT; - - if (!rTextFileLoader.GetCurrentNodeName(&CharacterData.strName)) - { - assert(!"FALSE"); - return FALSE; - } - - std::string strPathName; - if (!rTextFileLoader.GetTokenString("pathname", &strPathName)) - { - assert(!"FALSE"); - return FALSE; - } - - StringPath(strPathName.c_str(), CharacterData.strPathName); - CharacterData.strPathName += "/"; - - std::string strFileName; - if (!rTextFileLoader.GetTokenString("effectfilename", &strFileName)) - { - assert(!"FALSE"); - return FALSE; - } - CharacterData.strModelScriptFileName = CharacterData.strPathName; - CharacterData.strModelScriptFileName += strFileName; - - DWORD dwCRC32 = GetCaseCRC32(CharacterData.strModelScriptFileName.c_str(), CharacterData.strModelScriptFileName.length()); - ms_CharacterDataMap.insert(TCharacterDataMap::value_type(dwCRC32, CharacterData)); - - HTREEITEM hcurItem = m_resModelList.InsertItem(_T(CharacterData.strName.c_str()), 4, 4, hParent, TVI_LAST); - m_resModelList.SetItemData(hcurItem, dwCRC32); - - return TRUE; -} - -BOOL CMainFrame::LoadSoundScriptEquipment(CTextFileLoader & rTextFileLoader, TEquipmentDataList & rEquipmentDataList) -{ - CTokenVector * pEquipmentDataTokenVector; - if (rTextFileLoader.GetTokenVector("equipmentdata", &pEquipmentDataTokenVector)) - { - for (DWORD j = 0; j < pEquipmentDataTokenVector->size(); j+=3) - { - TEquipmentData EquipmentData; - EquipmentData.iPartIndex = atoi(pEquipmentDataTokenVector->at(j).c_str()); - EquipmentData.strAttachingBoneName = pEquipmentDataTokenVector->at(j+1); - StringPath(pEquipmentDataTokenVector->at(j+2).c_str(), EquipmentData.strItemScriptFileName); - - DWORD dwCRC32 = GetCaseCRC32(EquipmentData.strItemScriptFileName.c_str(), EquipmentData.strItemScriptFileName.length()); - TItemDataMap::iterator itorItem = ms_ItemDataMap.find(dwCRC32); - if (ms_ItemDataMap.end() == itorItem) - { - EquipmentData.pItemData = new CItemData; -// EquipmentData.pItemData->LoadItemData(EquipmentData.strItemScriptFileName.c_str()); - EquipmentData.pItemData->SetDefaultItemData("", EquipmentData.strItemScriptFileName.c_str()); - ms_ItemDataMap.insert(TItemDataMap::value_type(dwCRC32, EquipmentData.pItemData)); - } - else - { - EquipmentData.pItemData = itorItem->second; - } - - rEquipmentDataList.push_back(EquipmentData); - } - } - - return TRUE; -} diff --git a/SoundArranger/MainFrmResource.cpp b/SoundArranger/MainFrmResource.cpp deleted file mode 100644 index 0f5beb28..00000000 --- a/SoundArranger/MainFrmResource.cpp +++ /dev/null @@ -1,39 +0,0 @@ -#include "StdAfx.h" -#include "MainFrm.h" - -CResource * NewImage(const char* c_szFileName) -{ - return new CGraphicImage(c_szFileName); -} - -CResource * NewSubImage(const char* c_szFileName) -{ - return new CGraphicSubImage(c_szFileName); -} - -CResource * NewText(const char* c_szFileName) -{ - return new CGraphicText(c_szFileName); -} - -CResource * NewThing(const char* c_szFileName) -{ - return new CGraphicThing(c_szFileName); -} - -CResource * NewEffectMesh(const char* c_szFileName) -{ - return new CEffectMesh(c_szFileName); -} - -void CMainFrame::RegisterResource() -{ - m_resourceManager.RegisterResourceNewFunctionPointer("sub", NewSubImage); - m_resourceManager.RegisterResourceNewFunctionPointer("dds", NewImage); - m_resourceManager.RegisterResourceNewFunctionPointer("jpg", NewImage); - m_resourceManager.RegisterResourceNewFunctionPointer("tga", NewImage); - m_resourceManager.RegisterResourceNewFunctionPointer("bmp", NewImage); - m_resourceManager.RegisterResourceNewFunctionPointer("fnt", NewText); - m_resourceManager.RegisterResourceNewFunctionPointer("gr2", NewThing); - m_resourceManager.RegisterResourceNewFunctionPointer("mde", NewEffectMesh); -} \ No newline at end of file diff --git a/SoundArranger/Manager.cpp b/SoundArranger/Manager.cpp deleted file mode 100644 index a18c2d52..00000000 --- a/SoundArranger/Manager.cpp +++ /dev/null @@ -1,638 +0,0 @@ -#include "StdAfx.h" -#include "manager.h" - -#include -#include - -int CManager::ms_iMode; -int CManager::ms_icurType; -bool CManager::ms_isEdit; -bool CManager::ms_PlayFlag; -bool CManager::ms_LoopFlag; -DWORD CManager::ms_dwLocalFrame; -float CManager::ms_fLocalTime; -float CManager::ms_fLimitTime; -int CManager::ms_iFrameCount; -int CManager::ms_iLoopCount; -int CManager::ms_icurLoopCount; -float CManager::ms_fMotionStartTime; -float CManager::ms_fElapsedTime; -CManager::TTimeNodeList CManager::ms_TimeNodeList; -DWORD CManager::ms_dwModelIndex; -DWORD CManager::ms_dwShapeIndex; -DWORD CManager::ms_dwMotionIndex; -DWORD CManager::ms_dwSoundIndex; - -CRaceDataAccessor CManager::ms_RaceData; -CRaceManagerAccessor CManager::ms_RaceManager; -CActorInstanceAccessor CManager::ms_ActorInstance; -CEffectData * CManager::ms_pEffectData; - -CManager::TCharacterDataMap CManager::ms_CharacterDataMap; -CManager::TChangedDataObserverList CManager::ms_ChangedDataObserverList; -CDynamicPool CManager::ms_EffectInstancePool; -CManager::TEffectInstanceList CManager::ms_EffectInstanceList; -CManager::TSoundFileNameMap CManager::ms_SoundFileNameMap; -CManager::TReserveMotionDeque CManager::ms_ReserveMotionDeque; -CManager::TItemDataMap CManager::ms_ItemDataMap; - -void CManager::SetLocalTime(float fTime) -{ - ms_fLocalTime = fTime; - ms_dwLocalFrame = DWORD(ms_fLocalTime / 0.033f); -} - -void CManager::SetLimitTime(float fTime) -{ - ms_fLimitTime = fTime; - ms_iFrameCount = fTime / 0.033333f; -} - -DWORD CManager::GetCurrentModelIndex() -{ - return ms_dwModelIndex; -} - -DWORD CManager::GetCurrentMotionIndex() -{ - return ms_dwMotionIndex; -} - -DWORD CManager::GetCurrentSoundIndex() -{ - return ms_dwSoundIndex; -} - -BOOL CManager::isModel() -{ - return 0 != ms_dwModelIndex; -} - -BOOL CManager::isMotion() -{ - return 0 != ms_dwMotionIndex; -} - -BOOL CManager::isSound() -{ - return 0 != ms_dwSoundIndex; -} - -BOOL CManager::isEffect() -{ - return MODEL_TYPE_EFFECT == ms_icurType; -} - -float CManager::GetCurrentTime() -{ - return float(CTimer::Instance().GetCurrentMillisecond()) / 1000.0f; -} - -float CManager::GetLimitTime() -{ - return ms_fLimitTime; -} - -float CManager::GetLocalTime() -{ - return ms_fLocalTime; -} - -struct FChangedModel -{ - void operator() (CManager::IChangedDataObserver * pObserver) - { - pObserver->OnChangedModel(); - } -}; - -struct FChangedMotion -{ - void operator() (CManager::IChangedDataObserver * pObserver) - { - pObserver->OnChangedMotion(); - } -}; - -struct FChangedSound -{ - void operator() (CManager::IChangedDataObserver * pObserver) - { - pObserver->OnChangedSound(); - } -}; - -struct FChangedReserveMotion -{ - void operator() (CManager::IChangedDataObserver * pObserver) - { - pObserver->OnChangedReserveMotion(); - } -}; - -void CManager::SetModelIndex(DWORD dwIndex) -{ - if (dwIndex == ms_dwModelIndex) - return; - - BOOL bChangedModel = FALSE; - if (ms_dwModelIndex != dwIndex) - { - bChangedModel = TRUE; - } - - ms_dwModelIndex = dwIndex; - ms_dwMotionIndex = GetRandomMotionIndex(dwIndex); - Refresh(); - - if (bChangedModel) - for_each(ms_ChangedDataObserverList.begin(), ms_ChangedDataObserverList.end(), FChangedModel()); -} - -void CManager::SetMotionIndex(DWORD dwIndex) -{ - if (dwIndex == ms_dwMotionIndex) - return; - - switch (ms_iMode) - { - case MODE_EDIT: - ms_dwMotionIndex = dwIndex; - Refresh(); - - for_each(ms_ChangedDataObserverList.begin(), ms_ChangedDataObserverList.end(), FChangedMotion()); - break; - - case MODE_VIEW: - ReserveMotionIndex(dwIndex); - for_each(ms_ChangedDataObserverList.begin(), ms_ChangedDataObserverList.end(), FChangedReserveMotion()); - break; - } -} - -void CManager::ReserveMotionIndex(DWORD dwIndex) -{ - ms_ReserveMotionDeque.push_back(dwIndex); -} - -void CManager::SetSoundIndex(DWORD dwIndex) -{ - ms_dwSoundIndex = dwIndex; - - for_each(ms_ChangedDataObserverList.begin(), ms_ChangedDataObserverList.end(), FChangedSound()); -} - -void CManager::ClearSoundIndex() -{ - SetSoundIndex(0); -} - -void CManager::InsertSoundData(DWORD dwModelIndex, DWORD dwMotionIndex, float fTime, const char * c_szFileName) -{ - TCharacterData * pCharacterData; - if (!GetCharacterDataPointer(dwModelIndex, &pCharacterData)) - return; - - NSound::TSoundData SoundData; - SoundData.fTime = fTime; - SoundData.strSoundFileName = c_szFileName; - - if (isEffect()) - { - InsertSoundData(&pCharacterData->SoundDataVector, SoundData); - } - else - { - TMotionDataMap::iterator itorMotion = pCharacterData->MotionDataMap.find(ms_dwMotionIndex); - if (itorMotion == pCharacterData->MotionDataMap.end()) - return; - - TMotionData * pMotionData = &itorMotion->second; - - InsertSoundData(&pMotionData->SoundDataVector, SoundData); - } -} - -void CManager::InsertSoundData(NSound::TSoundDataVector * pSoundDataVector, const NSound::TSoundData & c_rSoundData) -{ - int iSize = int(pSoundDataVector->size()) - 1; - int i; - - for (i = 0; i < iSize; ++i) - { - if (c_rSoundData.fTime >= pSoundDataVector->at(i).fTime) - if (c_rSoundData.fTime <= pSoundDataVector->at(i+1).fTime) - break; - } - - NSound::TSoundDataVector::iterator itor = pSoundDataVector->begin(); - - for (int j = 0; j < i; ++j) - ++itor; - - pSoundDataVector->insert(itor, c_rSoundData); -} - -void CManager::Refresh() -{ - ms_PlayFlag = false; - ms_fLocalTime = 0.001f; - ms_dwLocalFrame = 0; - SetLimitTime(0.0f); - ms_fMotionStartTime = float(CTimer::Instance().GetCurrentMillisecond()) / 1000.0f; - ms_TimeNodeList.clear(); - ms_ActorInstance.__SetLocalTime(ms_fLocalTime); - - ////////////////////////////////////// - - ms_RaceData.Destroy(); - ms_ActorInstance.Clear(); - ms_ActorInstance.ClearAttachingEffect(); - ms_pEffectData->Clear(); - CEffectManager::Instance().DeleteAllInstances(); - DestroyEffect(); - - ////////////////////////////////////// - - TCharacterDataMap::iterator itorModel = ms_CharacterDataMap.find(ms_dwModelIndex); - if (itorModel == ms_CharacterDataMap.end()) - return; - - TCharacterData & rCharacterData = itorModel->second; - ms_icurType = rCharacterData.eModelType; - - if (MODEL_TYPE_EFFECT == rCharacterData.eModelType) - { - const char * c_szFileName = rCharacterData.strModelScriptFileName.c_str(); - ms_pEffectData->Clear(); - if (!ms_pEffectData->LoadScript(c_szFileName)) - { - Tracef(" Failed to load effect : %s\n", c_szFileName); - } - SetLimitTime(1.0f); - } - else - { - // Model - ms_RaceData.Destroy(); - ms_RaceData.LoadRaceData(rCharacterData.strModelScriptFileName.c_str()); - ms_ActorInstance.SetRaceDataPointer(&ms_RaceData); - ms_ActorInstance.RefreshActorInstance(); - ms_ActorInstance.SetShape(ms_dwShapeIndex); - ms_ActorInstance.SetFlyTarget(D3DXVECTOR3(0.0f, -1000.0f, 50.0f)); - ms_ActorInstance.SetFishingPosition(D3DXVECTOR3(0.0f, -300.0f, 0.0f)); - RefreshEquipment(rCharacterData.EquipmentDataList); // Equipment of Model - - // Motion - Temporary - // ½Ã°£ÀÌ ³ª¸é Àüü ¸ð¼ÇÀ» ÀüºÎ µî·ÏÇÏ´Â ¹æ½ÄÀ¸·Î ¹Ù²Û´Ù. - // ±×·± ÇüÅ°¡ µÇ¸é Refresh´Â ¸ðµ¨ÀÌ ¹Ù²î¾úÀ» ¶§¸¸ Àç¼ÂÆà µÈ´Ù. - // ¶ÇÇÑ ViewModeµµ ±¸ÇöÀÌ ¼ö¿ùÇØÁú °ÍÀÌ¶ó ¿¹»óÇÑ´Ù. - ms_RaceData.RegisterMotionMode(0); - TMotionDataMap::iterator itorMotion = rCharacterData.MotionDataMap.find(ms_dwMotionIndex); - if (itorMotion != rCharacterData.MotionDataMap.end()) - { - TMotionData & rMotionData = itorMotion->second; - - DWORD dwID = 0; - - ms_RaceData.RegisterMotionData(0, 0, rMotionData.strFullFileName.c_str()); - CRaceMotionData * pRaceMotionData; - if (ms_RaceData.GetMotionDataPointer(dwID, &pRaceMotionData)) - { - const char * c_szFileName = pRaceMotionData->GetMotionFileName(); - CGraphicThing * pMotion = (CGraphicThing *)CResourceManager::Instance().GetResourcePointer(c_szFileName); - ms_ActorInstance.RegisterMotionThing(dwID, pMotion); - ms_ActorInstance.SetMotion(0); - ms_ActorInstance.SetMotionData(pRaceMotionData); - ms_ActorInstance.SetPosition(0.0f, 0.0f, 0.0f); - - SetLimitTime(ms_ActorInstance.GetMotionDuration(0)); - ms_iLoopCount = pRaceMotionData->GetLoopCount(); - ms_icurLoopCount = ms_iLoopCount; - } - - // Equipment of Motion - RefreshEquipment(rMotionData.EquipmentDataList); - } - } -} - -void CManager::RefreshEquipment(const TEquipmentDataList & c_rEquipmentDataList) -{ - TEquipmentDataList::const_iterator itor = c_rEquipmentDataList.begin(); - for (; itor != c_rEquipmentDataList.end(); ++itor) - { - const TEquipmentData & c_rEquipmentData = *itor; - - ms_RaceData.RegisterAttachingBoneName(c_rEquipmentData.iPartIndex, - c_rEquipmentData.strAttachingBoneName.c_str()); - - ms_ActorInstance.AttachWeapon(0, c_rEquipmentData.iPartIndex, c_rEquipmentData.pItemData); - } -} - -void CManager::BlendMotion(DWORD dwIndex, float fBlendTime) -{ - if (ms_dwMotionIndex == dwIndex) - return; - - TCharacterDataMap::iterator itorModel = ms_CharacterDataMap.find(ms_dwModelIndex); - if (itorModel == ms_CharacterDataMap.end()) - return; - - TCharacterData & rCharacterData = itorModel->second; - TMotionDataMap::iterator itorMotion = rCharacterData.MotionDataMap.find(dwIndex); - if (itorMotion != rCharacterData.MotionDataMap.end()) - { - const std::string & c_rMotionFileName = itorMotion->second.strFullFileName; - CGraphicThing * pMotion = (CGraphicThing *)CResourceManager::Instance().GetResourcePointer(c_rMotionFileName.c_str()); - - ///// - - ms_dwMotionIndex = dwIndex; - for_each(ms_ChangedDataObserverList.begin(), ms_ChangedDataObserverList.end(), FChangedMotion()); - } -} - -void CManager::RegisterChangedDataObserver(IChangedDataObserver * pObserver) -{ - ms_ChangedDataObserverList.push_back(pObserver); -} - -BOOL CManager::GetCharacterDataPointer(DWORD dwIndex, TCharacterData ** ppCharacterData) -{ - TCharacterDataMap::iterator itorModel = ms_CharacterDataMap.find(dwIndex); - if (itorModel == ms_CharacterDataMap.end()) - return FALSE; - - *ppCharacterData = &itorModel->second; - - return TRUE; -} - -BOOL CManager::GetCharacterMotionDataPointer(DWORD dwModelIndex, DWORD dwMotionIndex, TMotionData ** ppMotionData) -{ - TCharacterData * pCharacterData; - if (!GetCharacterDataPointer(dwModelIndex, &pCharacterData)) - return FALSE; - - TMotionDataMap::iterator itorMotion = pCharacterData->MotionDataMap.find(ms_dwMotionIndex); - if (itorMotion == pCharacterData->MotionDataMap.end()) - return FALSE; - - *ppMotionData = &itorMotion->second; - - return TRUE; -} - -BOOL CManager::GetCharacterSoundDataVector(DWORD dwModelIndex, DWORD dwMotionIndex, NSound::TSoundDataVector ** ppSoundDataVector) -{ - if (MODEL_TYPE_EFFECT == ms_icurType) - { - TCharacterData * pCharacterData; - if (!GetCharacterDataPointer(dwModelIndex, &pCharacterData)) - return FALSE; - - *ppSoundDataVector = &(pCharacterData->SoundDataVector); - } - else - { - TMotionData * pMotionData; - if (!GetCharacterMotionDataPointer(dwModelIndex, dwMotionIndex, &pMotionData)) - return FALSE; - - *ppSoundDataVector = &(pMotionData->SoundDataVector); - } - return TRUE; -} - -BOOL CManager::GetSoundFileName(DWORD dwSoundIndex, const char ** c_pszFileName) -{ - TSoundFileNameMap::iterator itor = ms_SoundFileNameMap.find(dwSoundIndex); - if (itor == ms_SoundFileNameMap.end()) - return FALSE; - - *c_pszFileName = itor->second.c_str(); - - return TRUE; -} - -DWORD CManager::GetRandomMotionIndex(DWORD dwModelIndex) -{ - TCharacterData * pCharacterData; - if (GetCharacterDataPointer(GetCurrentModelIndex(), &pCharacterData)) - if (!pCharacterData->BasisMotionIDVector.empty()) - { - int iRandomMotionArrayIndex = rand() % int(pCharacterData->BasisMotionIDVector.size()); - DWORD dwRandomMotionIndex = pCharacterData->BasisMotionIDVector[iRandomMotionArrayIndex]; - return dwRandomMotionIndex; - } - - return 0; -} - -void CManager::TimeProcess() -{ - // Getting Elapsed Time - static DWORD s_dwLastTime = CTimer::Instance().GetCurrentMillisecond(); - ms_fElapsedTime = float(CTimer::Instance().GetCurrentMillisecond() - s_dwLastTime) / 1000.0f; - s_dwLastTime = CTimer::Instance().GetCurrentMillisecond(); - // Getting Elapsed Time - - switch (ms_iMode) - { - case MODE_EDIT: - if (ms_PlayFlag) - { - ms_fLocalTime += ms_fElapsedTime; - - UpdateSound(); - ++ms_dwLocalFrame; - - CRaceMotionData * pRaceMotionData; - if (ms_RaceData.GetMotionDataPointer(0, &pRaceMotionData)) - if (pRaceMotionData->IsLoopMotion()) - { - if (ms_fLocalTime > pRaceMotionData->GetLoopEndTime()) - { - if (ms_icurLoopCount > 1 || ms_icurLoopCount == -1) - { - if (ms_icurLoopCount > 1) - --ms_icurLoopCount; - SetLocalTime(pRaceMotionData->GetLoopStartTime()); - } - } - } - - if (ms_fLocalTime > ms_fLimitTime) - { - ms_fLocalTime = 0.001f; - ms_dwLocalFrame = 0; - ms_icurLoopCount = ms_iLoopCount; - - ms_PlayFlag = false; - - if (ms_LoopFlag) - PlayMotion(TRUE); - } - } - break; - case MODE_VIEW: - ms_fLocalTime += ms_fElapsedTime; - if (ms_fLocalTime-ms_fMotionStartTime > ms_fLimitTime - 0.3f) - { - ms_fMotionStartTime = float(CTimer::Instance().GetCurrentMillisecond()) / 1000.0f; - - if (ms_ReserveMotionDeque.empty()) - { - DWORD dwRandomMotionIndex = GetRandomMotionIndex(GetCurrentModelIndex()); - if (0 != dwRandomMotionIndex) - { - BlendMotion(dwRandomMotionIndex, 0.3f); - } - } - else - { - DWORD dwMotionIndex = ms_ReserveMotionDeque.front(); - BlendMotion(dwMotionIndex, 0.3f); - ms_ReserveMotionDeque.pop_front(); - for_each(ms_ChangedDataObserverList.begin(), ms_ChangedDataObserverList.end(), FChangedReserveMotion()); - } - } - UpdateSound(); - ++ms_dwLocalFrame; - break; - } -} - -void CManager::UpdateSound() -{ - NSound::TSoundDataVector * pSoundDataVector; - if (!GetCharacterSoundDataVector(GetCurrentModelIndex(), GetCurrentMotionIndex(), &pSoundDataVector)) - return; - - float fcurTime = GetCurrentTime(); - for (TTimeNodeList::iterator itor = ms_TimeNodeList.begin(); itor != ms_TimeNodeList.end();) - { - TTimeNode & rTimeNode = *itor; - - NSound::TSoundInstanceVector SoundInstanceVector; - NSound::DataToInstance(*pSoundDataVector, &SoundInstanceVector); - - // Start - Update SoundInstanceVector - for (DWORD i = 0; i < SoundInstanceVector.size(); ++i) - { - const NSound::TSoundInstance & c_rSoundInstance = SoundInstanceVector[i]; - - if (c_rSoundInstance.dwFrame == ms_dwLocalFrame) - { - CSoundManager::Instance().PlaySound2D(c_rSoundInstance.strSoundFileName.c_str()); - } - } - // End - Update SoundInstanceVector - - if (fcurTime - rTimeNode.fStartTime >= ms_fLimitTime) - { - itor = ms_TimeNodeList.erase(itor); - } - else - { - ++itor; - } - } -} - -void CManager::PlayMotion(BOOL bLoopFlag) -{ - if (MODE_VIEW == ms_iMode) - return; - - if (!isMotion() && !isEffect()) - return; - - if (ms_PlayFlag) - { - SetLocalTime(0.0f); - //return; - } - - ms_PlayFlag = true; - ms_LoopFlag = bLoopFlag; - - // Temporary - if (MODEL_TYPE_EFFECT == ms_icurType) - { - CEffectInstance * pInstance = ms_EffectInstancePool.Alloc(); - pInstance->Clear(); - pInstance->SetEffectDataPointer(ms_pEffectData); - ms_EffectInstanceList.push_back(pInstance); - - TTimeNode TimeNode; - TimeNode.fStartTime = GetCurrentTime(); - TimeNode.fLastTime = GetCurrentTime(); - ms_TimeNodeList.push_back(TimeNode); - } - else - { - TTimeNode TimeNode; - TimeNode.fStartTime = GetCurrentTime() - GetLocalTime() + 0.001f; - TimeNode.fLastTime = GetCurrentTime(); - ms_TimeNodeList.push_back(TimeNode); - - ms_ActorInstance.RefreshMotionEvent(0); - ms_ActorInstance.StartAnimation(GetLocalTime()); - } - // Temporary -} - -void CManager::RegisterSoundFileName(DWORD dwID, const char * c_szFileName) -{ - ms_SoundFileNameMap.insert(TSoundFileNameMap::value_type(dwID, c_szFileName)); -} - -void CManager::ClearAllSoundFileName() -{ - ms_SoundFileNameMap.clear(); -} - -void CManager::Edit() -{ - ms_isEdit = true; -} - -void CManager::UnEdit() -{ - ms_isEdit = false; -} - -bool CManager::isEdit() -{ - return ms_isEdit; -} - -bool CManager::canEdit() -{ - return MODE_EDIT == ms_iMode; -} - -void CManager::DestroyEffect() -{ - TEffectInstanceList::iterator itor = ms_EffectInstanceList.begin(); - for (; itor != ms_EffectInstanceList.end(); ++itor) - { - CEffectInstance * pInstance = *itor; - pInstance->Clear(); - } - ms_EffectInstanceList.clear(); -} - -CManager::CManager() -{ - ms_iLoopCount = 0; - ms_icurLoopCount = 0; - ms_fMotionStartTime = 0.0f; -} - -CManager::~CManager() -{ -} diff --git a/SoundArranger/Manager.h b/SoundArranger/Manager.h deleted file mode 100644 index 8415d37d..00000000 --- a/SoundArranger/Manager.h +++ /dev/null @@ -1,198 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include -#include "RaceDataAccessor.h" -#include "RaceManagerAccessor.h" -#include "ActorInstanceAccessor.h" - -class CManager -{ - public: - enum - { - SOUND_STRING_LENGTH = 64, - FILE_MAX_LEN = 128, - - MODE_EDIT = 0, - MODE_VIEW = 1, - }; - - enum EModelType - { - MODEL_TYPE_NONE, - MODEL_TYPE_PLAYER, - MODEL_TYPE_NPC, - MODEL_TYPE_ENEMY, - MODEL_TYPE_EFFECT, - }; - - typedef std::map TSoundFileNameMap; - typedef std::vector TGraphicThingVector; - typedef std::map TMotionPathMap; - typedef std::vector TBasisMotionIDVector; - typedef std::deque TReserveMotionDeque; - - typedef struct SEquipmentData - { - int iPartIndex; - std::string strAttachingBoneName; - std::string strItemScriptFileName; - CItemData * pItemData; - } TEquipmentData; - typedef std::list TEquipmentDataList; - - typedef struct SMotionData - { - // Static Data From Script - std::string strName; - std::string strFullFileName; - - TEquipmentDataList EquipmentDataList; - - // Dynamic Data Will Save To Data File - NSound::TSoundDataVector SoundDataVector; - } TMotionData; - typedef std::map TMotionDataMap; - - typedef struct SCharacterData - { - // Static Data From Script - std::string strPathName; - - EModelType eModelType; - std::string strName; - std::string strModelScriptFileName; - - ///// - - // For Character & Monster Model - TEquipmentDataList EquipmentDataList; - TMotionDataMap MotionDataMap; - TBasisMotionIDVector BasisMotionIDVector; - - // For Effect - NSound::TSoundDataVector SoundDataVector; - } TCharacterData; - typedef std::map TCharacterDataMap; - - class IChangedDataObserver - { - public: - virtual void OnChangedModel(){} - virtual void OnChangedMotion(){} - virtual void OnChangedSound(){} - virtual void OnChangedReserveMotion(){} - }; - - typedef std::list TChangedDataObserverList; - - typedef struct STimeNode - { - float fStartTime; - float fLastTime; - } TTimeNode; - typedef std::list TTimeNodeList; - - // Effect - typedef std::list TEffectInstanceList; - - // Item - typedef std::map TItemDataMap; - - public: - CManager(void); - ~CManager(void); - - static void SetLocalTime(float fTime); - static void SetLimitTime(float fTime); - - static DWORD GetCurrentModelIndex(); - static DWORD GetCurrentMotionIndex(); - static DWORD GetCurrentSoundIndex(); - static BOOL isModel(); - static BOOL isMotion(); - static BOOL isSound(); - static BOOL isEffect(); - static float GetCurrentTime(); - static float GetLimitTime(); - static float GetLocalTime(); - - static void SetModelIndex(DWORD dwIndex); - static void SetMotionIndex(DWORD dwIndex); - static void ReserveMotionIndex(DWORD dwIndex); - static void SetSoundIndex(DWORD dwIndex); - static void ClearSoundIndex(); - static void InsertSoundData(DWORD dwModelIndex, DWORD dwMotionIndex, float fTime, const char * c_szFileName); - static void InsertSoundData(NSound::TSoundDataVector * pSoundDataVector, const NSound::TSoundData & c_rSoundData); - static void Edit(); - static void UnEdit(); - static bool isEdit(); - static bool canEdit(); - - static void PlayMotion(BOOL bLoopFlag = FALSE); - - static void TimeProcess(); - - static void Refresh(); - static void RefreshEquipment(const TEquipmentDataList & c_rEquipmentDataList); - - static void RegisterSoundFileName(DWORD dwID, const char * c_szFileName); - static void ClearAllSoundFileName(); - - protected: - static BOOL GetCharacterDataPointer(DWORD dwIndex, TCharacterData ** ppCharacterData); - static BOOL GetCharacterMotionDataPointer(DWORD dwModelIndex, DWORD dwMotionIndex, TMotionData ** ppMotionData); - static BOOL GetCharacterSoundDataVector(DWORD dwModelIndex, DWORD dwMotionIndex, NSound::TSoundDataVector ** ppSoundDataVector); - static BOOL GetSoundFileName(DWORD dwSoundIndex, const char ** c_pszFileName); - static DWORD GetRandomMotionIndex(DWORD dwModelIndex); - - static void RegisterChangedDataObserver(IChangedDataObserver * pObserver); - - static void UpdateSound(); - - static void BlendMotion(DWORD dwIndex, float fBlendTime = 0.1f); - - static void DestroyEffect(); - - protected: - static int ms_iMode; - static int ms_icurType; - static bool ms_isEdit; - static bool ms_PlayFlag; - static bool ms_LoopFlag; - static DWORD ms_dwLocalFrame; - static float ms_fLocalTime; - static float ms_fLimitTime; - static int ms_iFrameCount; - static int ms_iLoopCount; - static int ms_icurLoopCount; - static float ms_fMotionStartTime; - static float ms_fElapsedTime; - static TTimeNodeList ms_TimeNodeList; - - static DWORD ms_dwModelIndex; - static DWORD ms_dwShapeIndex; - static DWORD ms_dwMotionIndex; - static DWORD ms_dwSoundIndex; - - static CRaceDataAccessor ms_RaceData; - static CRaceManagerAccessor ms_RaceManager; - static CActorInstanceAccessor ms_ActorInstance; - static CEffectData * ms_pEffectData; - - // Character - static TCharacterDataMap ms_CharacterDataMap; - static TChangedDataObserverList ms_ChangedDataObserverList; - // Effect - static CDynamicPool ms_EffectInstancePool; - static TEffectInstanceList ms_EffectInstanceList; - // Sound - static TSoundFileNameMap ms_SoundFileNameMap; - static TReserveMotionDeque ms_ReserveMotionDeque; - // Item - static TItemDataMap ms_ItemDataMap; -}; \ No newline at end of file diff --git a/SoundArranger/ModelViewer.cpp b/SoundArranger/ModelViewer.cpp deleted file mode 100644 index 482f4a3c..00000000 --- a/SoundArranger/ModelViewer.cpp +++ /dev/null @@ -1,187 +0,0 @@ -#include "StdAfx.h" -#include "ModelViewer.h" - -#include -#include - -float g_frClearColor = 0.1f; -float g_fgClearColor = 0.1f; -float g_fbClearColor = 0.2f; - -///////////////////////////////////////////////////////////////////////////// -// CModelViewer - -IMPLEMENT_DYNCREATE(CModelViewer, CView) - -CModelViewer::CModelViewer() -{ - m_bMButtonDown = false; - m_hWnd = NULL; - m_bVisible = TRUE; - - m_fDistance = 1500.0f; - m_fPitch = 30.0f; - m_fRotation = 45.0f; - - m_xMousePosition = 0; - m_yMousePosition = 0; -} - -CModelViewer::~CModelViewer() -{ -} - -BEGIN_MESSAGE_MAP(CModelViewer, CView) - //{{AFX_MSG_MAP(CModelViewer) - ON_WM_CREATE() - ON_WM_MOUSEMOVE() - ON_WM_MBUTTONDOWN() - ON_WM_MBUTTONUP() - ON_WM_MOUSEWHEEL() - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CModelViewer drawing - -void CModelViewer::OnDraw(CDC* pDC) -{ - CDocument* pDoc = GetDocument(); - // TODO: add draw code here -} - -///////////////////////////////////////////////////////////////////////////// -// CModelViewer diagnostics - -#ifdef _DEBUG -void CModelViewer::AssertValid() const -{ - CView::AssertValid(); -} - -void CModelViewer::Dump(CDumpContext& dc) const -{ - CView::Dump(dc); -} -#endif //_DEBUG - -///////////////////////////////////////////////////////////////////////////// -// CModelViewer message handlers - -int CModelViewer::OnCreate(LPCREATESTRUCT lpCreateStruct) -{ - if (CView::OnCreate(lpCreateStruct) == -1) - return -1; - - m_hWnd = GetSafeHwnd(); - return 0; -} - -////////////////////////////////////////////////////////////////////////// - -void CModelViewer::Render() -{ - CRect WindowRect; - GetWindowRect(&WindowRect); - - m_Screen.SetClearColor(g_frClearColor, g_fgClearColor, g_fbClearColor, 1.0f); - - m_Screen.Begin(); - m_Screen.Clear(); - - m_Screen.SetPerspective(20.0f, float(WindowRect.Width())/float(WindowRect.Height()), 100.0f, 15000.0f); - m_Screen.SetPositionCamera(0.0f, 0.0f, 100.0f, m_fDistance, m_fPitch, m_fRotation); - - STATEMANAGER.SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE); - m_Screen.SetDiffuseOperation(); - m_Screen.SetDiffuseColor(1.0f, 1.0f, 1.0f); - - // Render Model - if (isModel() && isMotion()) - { - m_Screen.SetDiffuseOperation(); - D3DXMATRIX matIdentity; - D3DXMatrixIdentity(&matIdentity); - ms_ActorInstance.__SetLocalTime(GetLocalTime()); - ms_ActorInstance.Update(); - ms_ActorInstance.Deform(); - ms_ActorInstance.UpdateAttachingInstances(); - - if (m_bVisible) - ms_ActorInstance.Render(); - - if (ms_PlayFlag) - ms_ActorInstance.UpdateFrame(); - } - // Render Model - - // Render Effect - TEffectInstanceList::iterator itor = ms_EffectInstanceList.begin(); - for (; itor != ms_EffectInstanceList.end();) - { - CEffectInstance * pInstance = *itor; - - pInstance->Update(); - pInstance->Render(); - - if (!pInstance->isAlive()) - { - pInstance->Clear(); - ms_EffectInstancePool.Free(pInstance); - itor = ms_EffectInstanceList.erase(itor); - } - else - { - ++itor; - } - } - // Render Effect - CEffectManager::Instance().Update(); - CEffectManager::Instance().Render(); - CFlyingManager::Instance().Update(); - CFlyingManager::Instance().Render(); - - m_Screen.End(); - m_Screen.Show(m_hWnd); -} - -void CModelViewer::OnMouseMove(UINT nFlags, CPoint point) -{ - if (m_bMButtonDown) - { - m_fRotation = m_fRotation - float(m_xMousePosition - point.x) * 0.3f; - m_fPitch = fMINMAX(-90.0f, m_fPitch - float(m_yMousePosition - point.y) * 0.3f, 90.0f); - - m_xMousePosition = point.x; - m_yMousePosition = point.y; - } - - CView::OnMouseMove(nFlags, point); -} - -void CModelViewer::OnMButtonDown(UINT nFlags, CPoint point) -{ - m_bMButtonDown = true; - m_xMousePosition = point.x; - m_yMousePosition = point.y; - CView::OnMButtonDown(nFlags, point); - SetCapture(); -} - -void CModelViewer::OnMButtonUp(UINT nFlags, CPoint point) -{ - m_bMButtonDown = false; - CView::OnMButtonUp(nFlags, point); - ReleaseCapture(); -} - -BOOL CModelViewer::OnMouseWheel(UINT nFlags, short zDelta, CPoint pt) -{ - m_fDistance = fMINMAX(500.0f, m_fDistance - (float) zDelta, 10000.0f); - return CView::OnMouseWheel(nFlags, zDelta, pt); -} - -void CModelViewer::ToggleVisable() -{ - m_bVisible = 1 - m_bVisible; -} diff --git a/SoundArranger/ModelViewer.h b/SoundArranger/ModelViewer.h deleted file mode 100644 index 3ee822ae..00000000 --- a/SoundArranger/ModelViewer.h +++ /dev/null @@ -1,64 +0,0 @@ -#pragma once - -#include "Manager.h" - -///////////////////////////////////////////////////////////////////////////// -// CModelViewer view - -class CModelViewer : public CView, public CManager -{ -protected: - CModelViewer(); // protected constructor used by dynamic creation - DECLARE_DYNCREATE(CModelViewer) - -// Attributes -public: - -// Operations -public: - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CModelViewer) - protected: - virtual void OnDraw(CDC* pDC); // overridden to draw this view - //}}AFX_VIRTUAL - -// Implementation -protected: - virtual ~CModelViewer(); -#ifdef _DEBUG - virtual void AssertValid() const; - virtual void Dump(CDumpContext& dc) const; -#endif - - // Generated message map functions -protected: - //{{AFX_MSG(CModelViewer) - afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct); - afx_msg void OnMouseMove(UINT nFlags, CPoint point); - afx_msg void OnMButtonDown(UINT nFlags, CPoint point); - afx_msg void OnMButtonUp(UINT nFlags, CPoint point); - afx_msg BOOL OnMouseWheel(UINT nFlags, short zDelta, CPoint pt); - //}}AFX_MSG - DECLARE_MESSAGE_MAP() - -public: - void Render(); - void ToggleVisable(); - -protected: - HWND m_hWnd; - bool m_bMButtonDown; - BOOL m_bVisible; - CScreen m_Screen; - - float m_fDistance; - float m_fPitch; - float m_fRotation; - - LONG m_xMousePosition; - LONG m_yMousePosition; -}; - -///////////////////////////////////////////////////////////////////////////// diff --git a/SoundArranger/PageCtrl.cpp b/SoundArranger/PageCtrl.cpp deleted file mode 100644 index 4ef7f6a6..00000000 --- a/SoundArranger/PageCtrl.cpp +++ /dev/null @@ -1,232 +0,0 @@ -// PageCtrl.cpp : implementation file -// -// °ÔÀÓ°³¹ßÀÚ¿ë ¸Ê¿¡µðÅÍ -// ÀúÀÛ±ÇÀÚ (c) 2001 ½Å¿ë¿ì (grace77@hanimail.com) -// -// ÀÌ ÇÁ·Î±×·¥ÀÇ ¸ðµç ±Ç¸®´Â ÀúÀÛ±ÇÀÚ¿¡°Ô ÀÖ½À´Ï´Ù. -// ÀúÀÛ±ÇÀÚÀÇ µ¿ÀǾøÀÌ ÇÁ·Î±×·¥À» ¼³Ä¡/»ç¿ë/¼öÁ¤/¹èÆ÷ÇÒ ¼ö ¾ø½À´Ï´Ù. - -#include "stdafx.h" -#include "PageCtrl.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// CPageCtrl dialog - - -CPageCtrl::CPageCtrl(UINT nIDTemplate, CWnd* pParent /*=NULL*/) -: CDialog(nIDTemplate, pParent) -{ - //{{AFX_DATA_INIT(CPageCtrl) - // NOTE: the ClassWizard will add member initialization here - //}}AFX_DATA_INIT - - m_nScrollPos = 0; -} - -void CPageCtrl::DoDataExchange(CDataExchange* pDX) -{ - CDialog::DoDataExchange(pDX); - //{{AFX_DATA_MAP(CPageCtrl) - // NOTE: the ClassWizard will add DDX and DDV calls here - //}}AFX_DATA_MAP -} - - -BEGIN_MESSAGE_MAP(CPageCtrl, CDialog) - //{{AFX_MSG_MAP(CPageCtrl) - ON_WM_LBUTTONDOWN() - ON_WM_LBUTTONUP() - ON_WM_MOUSEMOVE() - ON_WM_MOUSEWHEEL() - ON_WM_SETCURSOR() - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CPageCtrl message handlers - -void CPageCtrl::CalcLayout() -{ - CRect drc, prc; - GetClientRect(&drc); - GetParent()->GetClientRect(&prc); - - if (prc.Width() >= drc.Width()) - { - int gap = (prc.Width() - drc.Width())/2; - CRect rc = drc; - rc.left += gap; - rc.right += gap; - MoveWindow(&rc); - } - - // recalc scroll window - int dy = 0; - - if (m_nScrollPos + dy < 0) - { - - int max_pos = 0; - if (drc.Height() > prc.Height()) max_pos = drc.Height() - prc.Height(); - - if (m_nScrollPos + dy > -max_pos) - { - ScrollWindow(0, dy); - m_nScrollPos += dy; - } - else - { - ScrollWindow(0, -max_pos - m_nScrollPos); - m_nScrollPos = -max_pos; - } - } - else - { - ScrollWindow(0, -m_nScrollPos); - m_nScrollPos = 0; - } -} - -void CPageCtrl::OnLButtonDown(UINT nFlags, CPoint point) -{ - // TODO: Add your message handler code here and/or call default - SetFocus(); - - SetCapture(); - m_pt = point; - - CDialog::OnLButtonDown(nFlags, point); -} - -void CPageCtrl::OnMouseMove(UINT nFlags, CPoint point) -{ - // TODO: Add your message handler code here and/or call default - if (nFlags == MK_LBUTTON) - { - int dy = point.y - m_pt.y; - - if (m_nScrollPos + dy < 0) - { - CRect drc, prc; - GetClientRect(&drc); - GetParent()->GetClientRect(&prc); - - int max_pos = 0; - if (drc.Height() > prc.Height()) - max_pos = drc.Height() - prc.Height(); - - if (m_nScrollPos + dy > -max_pos) - { - ScrollWindow(0, dy); - m_nScrollPos += dy; - } - else - { - ScrollWindow(0, -max_pos - m_nScrollPos); - m_nScrollPos = -max_pos; - } - } - else - { - ScrollWindow(0, -m_nScrollPos); - m_nScrollPos = 0; - } - } - - m_pt = point; - - CDialog::OnMouseMove(nFlags, point); -} - -void CPageCtrl::OnLButtonUp(UINT nFlags, CPoint point) -{ - // TODO: Add your message handler code here and/or call default - ReleaseCapture(); - - CDialog::OnLButtonUp(nFlags, point); -} - - -void CPageCtrl::OnOK() -{ -} - -void CPageCtrl::OnCancel() -{ - -} - -BOOL CPageCtrl::EnableWindow(BOOL bEnable) -{ - CWnd *pWnd = GetWindow(GW_CHILD); - while (pWnd != NULL) - { - pWnd->EnableWindow(bEnable); - pWnd = pWnd->GetNextWindow(); - } - - return TRUE; -} - -BOOL CPageCtrl::OnMouseWheel(UINT nFlags, short zDelta, CPoint pt) -{ - // TODO: Add your message handler code here and/or call default - int dy = zDelta/6; - - if (m_nScrollPos + dy < 0) - { - CRect drc, prc; - GetClientRect(&drc); - GetParent()->GetClientRect(&prc); - - int max_pos = 0; - if (drc.Height() > prc.Height()) max_pos = drc.Height() - prc.Height(); - - if (m_nScrollPos + dy > -max_pos) - { - ScrollWindow(0, dy); - m_nScrollPos += dy; - } - else - { - ScrollWindow(0, -max_pos - m_nScrollPos); - m_nScrollPos = -max_pos; - } - } - else - { - ScrollWindow(0, -m_nScrollPos); - m_nScrollPos = 0; - } - - return CDialog::OnMouseWheel(nFlags, zDelta, pt); -} - - -BOOL CPageCtrl::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message) -{ - // TODO: Add your message handler code here and/or call default - CRect drc, prc; - GetClientRect(&drc); - GetParent()->GetClientRect(&prc); - - if (nHitTest == HTCLIENT) - if (drc.Height() > prc.Height()) - { - SetCursor(AfxGetApp()->LoadCursor(IDC_VIEWMOVE)); - return FALSE; - } - - return CDialog::OnSetCursor(pWnd, nHitTest, message); -} - -void CPageCtrl::UpdateUI() -{ - -} diff --git a/SoundArranger/PageCtrl.h b/SoundArranger/PageCtrl.h deleted file mode 100644 index af6dde99..00000000 --- a/SoundArranger/PageCtrl.h +++ /dev/null @@ -1,67 +0,0 @@ -// PageCtrl.h : header file -// -// °ÔÀÓ°³¹ßÀÚ¿ë ¸Ê¿¡µðÅÍ -// ÀúÀÛ±ÇÀÚ (c) 2001 ½Å¿ë¿ì (grace77@hanimail.com) -// -// ÀÌ ÇÁ·Î±×·¥ÀÇ ¸ðµç ±Ç¸®´Â ÀúÀÛ±ÇÀÚ¿¡°Ô ÀÖ½À´Ï´Ù. -// ÀúÀÛ±ÇÀÚÀÇ µ¿ÀǾøÀÌ ÇÁ·Î±×·¥À» ¼³Ä¡/»ç¿ë/¼öÁ¤/¹èÆ÷ÇÒ ¼ö ¾ø½À´Ï´Ù. - -#if !defined(AFX_PAGECTRL_H__E5A7FC20_2B95_11D4_B73E_004F4C02CAF7__INCLUDED_) -#define AFX_PAGECTRL_H__E5A7FC20_2B95_11D4_B73E_004F4C02CAF7__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -///////////////////////////////////////////////////////////////////////////// -// CPageCtrl dialog - -class CPageCtrl : public CDialog -{ -// Construction -public: - virtual void UpdateUI() = 0; - - virtual void OnCancel(); - virtual void OnOK(); - void CalcLayout(); - - BOOL EnableWindow(BOOL bEnable = TRUE); - - CPageCtrl(UINT nIDTemplate, CWnd* pParent = NULL); // standard constructor - -// Dialog Data - //{{AFX_DATA(CPageCtrl) - enum { IDD = 0 }; - // NOTE: the ClassWizard will add data members here - //}}AFX_DATA - - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CPageCtrl) - public: - protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL - -// Implementation -protected: - CPoint m_pt; - int m_nScrollPos; - - // Generated message map functions - //{{AFX_MSG(CPageCtrl) - afx_msg void OnLButtonDown(UINT nFlags, CPoint point); - afx_msg void OnLButtonUp(UINT nFlags, CPoint point); - afx_msg void OnMouseMove(UINT nFlags, CPoint point); - afx_msg BOOL OnMouseWheel(UINT nFlags, short zDelta, CPoint pt); - afx_msg BOOL OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message); - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_PAGECTRL_H__E5A7FC20_2B95_11D4_B73E_004F4C02CAF7__INCLUDED_) diff --git a/SoundArranger/PageMotionProperty.cpp b/SoundArranger/PageMotionProperty.cpp deleted file mode 100644 index 67ad38fe..00000000 --- a/SoundArranger/PageMotionProperty.cpp +++ /dev/null @@ -1,122 +0,0 @@ -// PageMotionProperty.cpp : implementation file -// - -#include "stdafx.h" -#include "soundarranger.h" -#include "PageMotionProperty.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// CPageMotionProperty dialog - - -CPageMotionProperty::CPageMotionProperty(CWnd* pParent /*=NULL*/) - : CPageCtrl(CPageMotionProperty::IDD, pParent) -{ - m_ChangedModelObserver.SetOwner(this); - RegisterChangedDataObserver(&m_ChangedModelObserver); - //{{AFX_DATA_INIT(CPageMotionProperty) - // NOTE: the ClassWizard will add member initialization here - //}}AFX_DATA_INIT -} - - -void CPageMotionProperty::DoDataExchange(CDataExchange* pDX) -{ - CPageCtrl::DoDataExchange(pDX); - //{{AFX_DATA_MAP(CPageMotionProperty) - DDX_Control(pDX, IDC_MOTION_PROPERTY_SHAPE_LIST, m_ctrlShapeList); - //}}AFX_DATA_MAP -} - - -BEGIN_MESSAGE_MAP(CPageMotionProperty, CPageCtrl) - //{{AFX_MSG_MAP(CPageMotionProperty) - ON_LBN_SELCHANGE(IDC_MOTION_PROPERTY_SHAPE_LIST, OnChangeShape) - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CPageMotionProperty normal functions - -BOOL CPageMotionProperty::Create(CWnd * pParent) -{ - if (!CPageCtrl::Create(CPageMotionProperty::IDD, pParent)) - return FALSE; - - ShowWindow(SW_SHOW); - return TRUE; -} - -void CPageMotionProperty::UpdateUI() -{ -} - -void CPageMotionProperty::OnChangedModel() -{ - // Change Name - TCharacterData * pCharacterData; - if (GetCharacterDataPointer(GetCurrentModelIndex(), &pCharacterData)) - { - SetDlgItemText(IDC_MOTION_PROPERTY_MODEL_NAME, pCharacterData->strName.c_str()); - } - SetDlgItemText(IDC_MOTION_PROPERTY_MOTION_NAME, "None"); - SetDlgItemText(IDC_MOTION_PROPERTY_DESCRIPTION, ""); - SetDlgItemText(IDC_MOTION_PROPERTY_DESCRIPTION, "0.0"); - - // Update ShapeList - m_ctrlShapeList.ResetContent(); - m_ctrlShapeList.InsertString(0, ""); - m_ctrlShapeList.SelectString(-1, ""); - - int iItemNumber = 1; - - if (ms_RaceData.HasShape()) - { - CRaceDataAccessor::TShapeDictIterator itor = ms_RaceData.GetShapeDictIterator(); - do { - int iShapeNumber = ms_RaceData.GetShapeNumber(itor); - CFilename strModelFileName = ms_RaceData.GetShapeModelFileName(itor); - m_ctrlShapeList.InsertString(iItemNumber, strModelFileName.GetName().c_str()); - m_ctrlShapeList.SetItemData(iItemNumber, iShapeNumber); - ++iItemNumber; - - if (ms_dwShapeIndex == DWORD(iShapeNumber)) - { - m_ctrlShapeList.SelectString(-1, strModelFileName.GetName().c_str()); - } - } while (ms_RaceData.GetNextIterator(itor)); - } -} - -void CPageMotionProperty::OnChangedMotion() -{ - SetDlgItemText(IDC_MOTION_PROPERTY_DESCRIPTION, ""); - - TCharacterData * pCharacterData; - if (!GetCharacterDataPointer(GetCurrentModelIndex(), &pCharacterData)) - return; - - TMotionDataMap::iterator itor = pCharacterData->MotionDataMap.find(GetCurrentMotionIndex()); - if (pCharacterData->MotionDataMap.end() == itor) - return; - - SetDlgItemText(IDC_MOTION_PROPERTY_MOTION_NAME, itor->second.strName.c_str()); - SetDialogFloatText(GetSafeHwnd(), IDC_MOTION_PROPERTY_MOTION_TIME, ms_ActorInstance.GetMotionDuration(0)); -} - -///////////////////////////////////////////////////////////////////////////// -// CPageMotionProperty message handlers - -void CPageMotionProperty::OnChangeShape() -{ - int iCurSel = m_ctrlShapeList.GetCurSel(); - ms_dwShapeIndex = DWORD(m_ctrlShapeList.GetItemData(iCurSel)); - - Refresh(); -} diff --git a/SoundArranger/PageMotionProperty.h b/SoundArranger/PageMotionProperty.h deleted file mode 100644 index 38b331a1..00000000 --- a/SoundArranger/PageMotionProperty.h +++ /dev/null @@ -1,66 +0,0 @@ -#if !defined(AFX_PAGEMOTIONPROPERTY_H__271F65D1_7783_438A_AAD3_09ABC2BFA2A7__INCLUDED_) -#define AFX_PAGEMOTIONPROPERTY_H__271F65D1_7783_438A_AAD3_09ABC2BFA2A7__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 -// PageMotionProperty.h : header file -// - -#include "Manager.h" - -///////////////////////////////////////////////////////////////////////////// -// CPageMotionProperty dialog - -class CPageMotionProperty : public CPageCtrl, public CManager -{ -// Construction -public: - CPageMotionProperty(CWnd* pParent = NULL); // standard constructor - - BOOL Create(CWnd * pParent); - void UpdateUI(); - -// Dialog Data - //{{AFX_DATA(CPageMotionProperty) - enum { IDD = IDD_PAGE_MOTION_PROPERTY }; - CListBox m_ctrlShapeList; - //}}AFX_DATA - - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CPageMotionProperty) - protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL - -// Implementation -protected: - - // Generated message map functions - //{{AFX_MSG(CPageMotionProperty) - afx_msg void OnChangeShape(); - //}}AFX_MSG - DECLARE_MESSAGE_MAP() - -public: - void OnChangedModel(); - void OnChangedMotion(); - -protected: - class CChangedModelObserver : public CManager::IChangedDataObserver - { - public: - void SetOwner(CPageMotionProperty * pOwner) { m_pOwner = pOwner; } - void OnChangedModel() { m_pOwner->OnChangedModel(); } - void OnChangedMotion() { m_pOwner->OnChangedMotion(); } - protected: - CPageMotionProperty * m_pOwner; - } m_ChangedModelObserver; -}; - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_PAGEMOTIONPROPERTY_H__271F65D1_7783_438A_AAD3_09ABC2BFA2A7__INCLUDED_) diff --git a/SoundArranger/PageSoundList.cpp b/SoundArranger/PageSoundList.cpp deleted file mode 100644 index b4566873..00000000 --- a/SoundArranger/PageSoundList.cpp +++ /dev/null @@ -1,135 +0,0 @@ -// PageSoundList.cpp : implementation file -// - -#include "stdafx.h" -#include "SoundArranger.h" -#include "PageSoundList.h" -#include "Util.h" -#include "SoundDataLoader.h" -#include - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// CPageSoundList dialog - - -CPageSoundList::CPageSoundList(CWnd* pParent /*=NULL*/) - : CPageCtrl(CPageSoundList::IDD, pParent) -{ - m_ChangedSoundObserver.SetOwner(this); - RegisterChangedDataObserver(&m_ChangedSoundObserver); - //{{AFX_DATA_INIT(CPageSoundList) - // NOTE: the ClassWizard will add member initialization here - //}}AFX_DATA_INIT -} - - -void CPageSoundList::DoDataExchange(CDataExchange* pDX) -{ - CPageCtrl::DoDataExchange(pDX); - //{{AFX_DATA_MAP(CPageSoundList) - DDX_Control(pDX, IDC_SOUND_LIST, m_ctrlSoundList); - //}}AFX_DATA_MAP -} - - -BEGIN_MESSAGE_MAP(CPageSoundList, CPageCtrl) - //{{AFX_MSG_MAP(CPageSoundList) - ON_NOTIFY(TVN_SELCHANGED, IDC_SOUND_LIST, OnSelchangedSoundList) - ON_BN_CLICKED(IDC_SOUND_PLAY, OnSoundPlay) - ON_NOTIFY(NM_DBLCLK, IDC_SOUND_LIST, OnDblclkSoundList) - ON_NOTIFY(TVN_BEGINDRAG, IDC_SOUND_LIST, OnBegindragSoundList) - ON_BN_CLICKED(IDC_SOUND_REFRESH, OnSoundRefresh) - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CPageSoundList normal functions - -BOOL CPageSoundList::Create(CWnd * pParent) -{ - if (!CPageCtrl::Create(IDD, pParent)) - return FALSE; - - CreateHighColorImageList(IDB_SOUND_TREE_ITEM, &m_TreeItemImage); - m_ctrlSoundList.SetImageList(&m_TreeItemImage, TVSIL_NORMAL); - - CSoundDataLoader SoundDataLoader; - SoundDataLoader.SetTreeControler(&m_ctrlSoundList); - SoundDataLoader.Create("wav;mp3", "sound", TRUE); - - ShowWindow(SW_SHOW); - return TRUE; -} - -void CPageSoundList::UpdateUI() -{ -} - -void CPageSoundList::OnChangedSound() -{ - if (0 == GetCurrentSoundIndex()) - { - m_ctrlSoundList.SelectItem(NULL); - } -} - -///////////////////////////////////////////////////////////////////////////// -// CPageSoundList message handlers - -void CPageSoundList::OnSelchangedSoundList(NMHDR* pNMHDR, LRESULT* pResult) -{ - NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR; - - HTREEITEM hTreeItem = pNMTreeView->itemNew.hItem; - - if (hTreeItem) - { - DWORD dwIndex = m_ctrlSoundList.GetItemData(hTreeItem); - SetSoundIndex(dwIndex); - } - - *pResult = 0; -} - -void CPageSoundList::OnSoundPlay() -{ - const char * c_szFileName; - if (!GetSoundFileName(GetCurrentSoundIndex(), &c_szFileName)) - return; - - CSoundManager::Instance().PlaySound2D(c_szFileName); -} - -void CPageSoundList::OnDblclkSoundList(NMHDR* pNMHDR, LRESULT* pResult) -{ - HTREEITEM hTreeItem = m_ctrlSoundList.GetSelectedItem(); - - if (!hTreeItem) - return; - - OnSoundPlay(); - *pResult = 0; -} - -void CPageSoundList::OnBegindragSoundList(NMHDR* pNMHDR, LRESULT* pResult) -{ - NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR; - m_ctrlSoundList.SelectItem(pNMTreeView->itemNew.hItem); - *pResult = 0; -} - -void CPageSoundList::OnSoundRefresh() -{ - m_ctrlSoundList.DeleteAllItems(); - ClearAllSoundFileName(); - - CSoundDataLoader SoundDataLoader2; - SoundDataLoader2.SetTreeControler(&m_ctrlSoundList); - SoundDataLoader2.Create("wav;mp3", "sound", TRUE); -} diff --git a/SoundArranger/PageSoundList.h b/SoundArranger/PageSoundList.h deleted file mode 100644 index f1d86ba6..00000000 --- a/SoundArranger/PageSoundList.h +++ /dev/null @@ -1,68 +0,0 @@ -#if !defined(AFX_PAGESOUNDLIST_H__9DDBD3CE_2B4B_4B02_9446_2A0258A49340__INCLUDED_) -#define AFX_PAGESOUNDLIST_H__9DDBD3CE_2B4B_4B02_9446_2A0258A49340__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 -// PageSoundList.h : header file -// - -#include "Manager.h" - -///////////////////////////////////////////////////////////////////////////// -// CPageSoundList dialog - -class CPageSoundList : public CPageCtrl, public CManager -{ -// Construction -public: - CPageSoundList(CWnd* pParent = NULL); // standard constructor - - BOOL Create(CWnd * pParent); - void UpdateUI(); - - void OnChangedSound(); - -// Dialog Data - //{{AFX_DATA(CPageSoundList) - enum { IDD = IDD_PAGE_SOUND_LIST }; - CTreeCtrl m_ctrlSoundList; - //}}AFX_DATA - - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CPageSoundList) - protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL - -// Implementation -protected: - - // Generated message map functions - //{{AFX_MSG(CPageSoundList) - afx_msg void OnSelchangedSoundList(NMHDR* pNMHDR, LRESULT* pResult); - afx_msg void OnSoundPlay(); - afx_msg void OnDblclkSoundList(NMHDR* pNMHDR, LRESULT* pResult); - afx_msg void OnBegindragSoundList(NMHDR* pNMHDR, LRESULT* pResult); - afx_msg void OnSoundRefresh(); - //}}AFX_MSG - DECLARE_MESSAGE_MAP() - -protected: - class CChangedDataObserver : public CManager::IChangedDataObserver - { - public: - void SetOwner(CPageSoundList * pOwner) { m_pOwner = pOwner; } - void OnChangedSound() { m_pOwner->OnChangedSound(); } - protected: - CPageSoundList * m_pOwner; - } m_ChangedSoundObserver; - CImageList m_TreeItemImage; -}; - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_PAGESOUNDLIST_H__9DDBD3CE_2B4B_4B02_9446_2A0258A49340__INCLUDED_) diff --git a/SoundArranger/RaceDataAccessor.cpp b/SoundArranger/RaceDataAccessor.cpp deleted file mode 100644 index 5e696bd4..00000000 --- a/SoundArranger/RaceDataAccessor.cpp +++ /dev/null @@ -1,50 +0,0 @@ -#include "StdAfx.h" -#include "RaceDataAccessor.h" - -BOOL CRaceDataAccessor::HasShape() -{ - return !m_kMap_dwShapeKey_kShape.empty(); -} - -CRaceDataAccessor::TShapeDictIterator CRaceDataAccessor::GetShapeDictIterator() -{ - return m_kMap_dwShapeKey_kShape.begin(); -} - -BOOL CRaceDataAccessor::GetNextIterator(TShapeDictIterator & rIterator) -{ - ++rIterator; - return rIterator != m_kMap_dwShapeKey_kShape.end(); -} - -DWORD CRaceDataAccessor::GetShapeNumber(TShapeDictIterator & rIterator) -{ - if (m_kMap_dwShapeKey_kShape.end() == m_kMap_dwShapeKey_kShape.find(rIterator->first)) - { - assert(!"CRaceDataAccessor::GetShapeIndex() - Can't find iterator"); - return 0; - } - - return rIterator->first; -} - -const char * CRaceDataAccessor::GetShapeModelFileName(TShapeDictIterator & rIterator) -{ - if (m_kMap_dwShapeKey_kShape.end() == m_kMap_dwShapeKey_kShape.find(rIterator->first)) - { - assert(!"CRaceDataAccessor::GetShapeIndex() - Can't find iterator"); - return 0; - } - - SShape & rShape = rIterator->second; - - return rShape.m_stModelFileName.c_str(); -} - -CRaceDataAccessor::CRaceDataAccessor() -{ -} - -CRaceDataAccessor::~CRaceDataAccessor() -{ -} diff --git a/SoundArranger/RaceDataAccessor.h b/SoundArranger/RaceDataAccessor.h deleted file mode 100644 index 4435aa83..00000000 --- a/SoundArranger/RaceDataAccessor.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include - -class CRaceDataAccessor : public CRaceData -{ - public: - typedef std::map TShapeDict; - typedef TShapeDict::iterator TShapeDictIterator; - - public: - CRaceDataAccessor(); - virtual ~CRaceDataAccessor(); - - BOOL HasShape(); - - // Iterator - TShapeDictIterator GetShapeDictIterator(); - BOOL GetNextIterator(TShapeDictIterator & rIterator); - - DWORD GetShapeNumber(TShapeDictIterator & rIterator); - const char * GetShapeModelFileName(TShapeDictIterator & rIterator); -}; \ No newline at end of file diff --git a/SoundArranger/RaceManagerAccessor.cpp b/SoundArranger/RaceManagerAccessor.cpp deleted file mode 100644 index 94d753a6..00000000 --- a/SoundArranger/RaceManagerAccessor.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "StdAfx.h" -#include "RaceManagerAccessor.h" - -void CRaceManagerAccessor::SetRaceData(DWORD dwID, CRaceData * pRaceData) -{ - assert(pRaceData); - - pRaceData->SetRace(dwID); - m_RaceDataMap.insert(TRaceDataMap::value_type(dwID, pRaceData)); - - Tracenf("CRaceManagerAccessor::SetRaceData(dwRaceIndex=%d)", dwID); -} - -void CRaceManagerAccessor::DestroyAccessor() -{ - m_RaceDataMap.clear(); -} - -CRaceManagerAccessor::CRaceManagerAccessor() -{ -} - -CRaceManagerAccessor::~CRaceManagerAccessor() -{ -} diff --git a/SoundArranger/RaceManagerAccessor.h b/SoundArranger/RaceManagerAccessor.h deleted file mode 100644 index 16de1bbb..00000000 --- a/SoundArranger/RaceManagerAccessor.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include - -class CRaceManagerAccessor : public CRaceManager -{ - public: - CRaceManagerAccessor(); - virtual ~CRaceManagerAccessor(); - - void DestroyAccessor(); - - void SetRaceData(DWORD dwID, CRaceData * pRaceData); -}; diff --git a/SoundArranger/ResModelList.cpp b/SoundArranger/ResModelList.cpp deleted file mode 100644 index d4eb71a6..00000000 --- a/SoundArranger/ResModelList.cpp +++ /dev/null @@ -1,53 +0,0 @@ -// ResModelList.cpp : implementation file -// - -#include "stdafx.h" -#include "SoundArranger.h" -#include "ResModelList.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// CResModelList - -CResModelList::CResModelList() -{ -} - -CResModelList::~CResModelList() -{ -} - - -BEGIN_MESSAGE_MAP(CResModelList, CTreeCtrl) - //{{AFX_MSG_MAP(CResModelList) - ON_NOTIFY_REFLECT(TVN_SELCHANGED, OnSelchanged) - ON_NOTIFY_REFLECT(NM_DBLCLK, OnDblclk) - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CResModelList message handlers - -void CResModelList::OnSelchanged(NMHDR* pNMHDR, LRESULT* pResult) -{ - NM_TREEVIEW* pNMTreeView = (NM_TREEVIEW*)pNMHDR; - - HTREEITEM hTreeItem = pNMTreeView->itemNew.hItem; - SetModelIndex(GetItemData(hTreeItem)); - - *pResult = 0; -} - -void CResModelList::OnDblclk(NMHDR* pNMHDR, LRESULT* pResult) -{ - PlayMotion(); - - ///// - - *pResult = 0; -} diff --git a/SoundArranger/ResModelList.h b/SoundArranger/ResModelList.h deleted file mode 100644 index 2fe995d5..00000000 --- a/SoundArranger/ResModelList.h +++ /dev/null @@ -1,51 +0,0 @@ -#if !defined(AFX_RESMODELLIST_H__E4DE4162_35C5_40D3_8943_CD98E7A02BCC__INCLUDED_) -#define AFX_RESMODELLIST_H__E4DE4162_35C5_40D3_8943_CD98E7A02BCC__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 -// ResModelList.h : header file -// - -#include "Manager.h" - -///////////////////////////////////////////////////////////////////////////// -// CResModelList window - -class CResModelList : public CTreeCtrl, public CManager -{ -// Construction -public: - CResModelList(); - -// Attributes -public: - -// Operations -public: - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CResModelList) - //}}AFX_VIRTUAL - -// Implementation -public: - virtual ~CResModelList(); - - // Generated message map functions -protected: - //{{AFX_MSG(CResModelList) - afx_msg void OnSelchanged(NMHDR* pNMHDR, LRESULT* pResult); - afx_msg void OnDblclk(NMHDR* pNMHDR, LRESULT* pResult); - //}}AFX_MSG - - DECLARE_MESSAGE_MAP() -}; - -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_RESMODELLIST_H__E4DE4162_35C5_40D3_8943_CD98E7A02BCC__INCLUDED_) diff --git a/SoundArranger/ResMotionList.cpp b/SoundArranger/ResMotionList.cpp deleted file mode 100644 index 803f730e..00000000 --- a/SoundArranger/ResMotionList.cpp +++ /dev/null @@ -1,132 +0,0 @@ -// CResMotionList.cpp : implementation file -// - -#include "stdafx.h" -#include "SoundArranger.h" -#include "ResMotionList.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// CResMotionList - -CResMotionList::CResMotionList() -{ - m_ChangedModelObserver.SetOwner(this); - RegisterChangedDataObserver(&m_ChangedModelObserver); -} - -CResMotionList::~CResMotionList() -{ -} - - -BEGIN_MESSAGE_MAP(CResMotionList, CListCtrl) - //{{AFX_MSG_MAP(CResMotionList) - ON_NOTIFY_REFLECT(NM_DBLCLK, OnDblclk) - ON_WM_LBUTTONDOWN() - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CResMotionList normal functions - -void CResMotionList::OnChangedModel() -{ - TCharacterData * pCharacterData; - if (!GetCharacterDataPointer(GetCurrentModelIndex(), &pCharacterData)) - return; - - DeleteAllItems(); - m_ItemDataMap.clear(); - - DWORD dwCount = 0; - TMotionDataMap::iterator itor = pCharacterData->MotionDataMap.begin(); - for (; itor != pCharacterData->MotionDataMap.end(); ++itor, ++dwCount) - { - DWORD dwCRC32 = itor->first; - TMotionData & rMotionData = itor->second; - - DWORD dwSelectedIndex = InsertItem(dwCount, _T(rMotionData.strName.c_str())); - std::string strName = GetItemText(dwSelectedIndex, 0); - - // ERROR Check - if (m_ItemDataMap.find(strName) != m_ItemDataMap.end()) - { - Tracef(" ERROR!! CResMotionList::OnChangedModel - There is already same motion name [%s]\n", strName.c_str()); - } - // ERROR Check - - if (GetCurrentMotionIndex() == dwCRC32) - { - CListCtrl::SetItemState(dwSelectedIndex, LVIS_SELECTED, LVIS_SELECTED); - } - - m_ItemDataMap.insert(std::map::value_type(strName, dwCRC32)); - } - - if (0 == CListCtrl::GetSelectedCount()) - if (CListCtrl::GetItemCount()) - { - CListCtrl::SetItemState(0, LVIS_SELECTED, LVIS_SELECTED); - std::string strItemName = CListCtrl::GetItemText(0, 0); - SetMotionIndex(m_ItemDataMap[strItemName]); - } -} - -void CResMotionList::OnChangedMotion() -{ - // ±âÁ¸¿¡ ¼±Åà µÇ¾îÀÖ´ø ¸ð¼Ç°ú ÇöÀçÀÇ ¸ð¼ÇÀÌ ´Ù¸£¸é ´Ù½Ã ¼±ÅÃÇÑ´Ù. - TCharacterData * pCharacterData; - if (!GetCharacterDataPointer(GetCurrentModelIndex(), &pCharacterData)) - return; - - TMotionDataMap::iterator itorMotion = pCharacterData->MotionDataMap.find(GetCurrentMotionIndex()); - if (pCharacterData->MotionDataMap.end() != itorMotion) - { - TMotionData & rMotionData = itorMotion->second; - - for (int i = 0; i < CListCtrl::GetItemCount(); ++i) - { - CString strItemName = CListCtrl::GetItemText(i, 0); - if (0 == rMotionData.strName.compare(strItemName)) - { - CListCtrl::SetItemState(i, LVIS_SELECTED, LVIS_SELECTED); - return; - } - } - } -} - -///////////////////////////////////////////////////////////////////////////// -// CResMotionList message handlers - -void CResMotionList::OnDblclk(NMHDR* pNMHDR, LRESULT* pResult) -{ - PlayMotion(); - - ///// - - *pResult = 0; -} - -// NOTE : OnItemChanged·Î ChangeSoundIndex¸¦ ÇÏÁö ¾Ê´Â´Ù. »óÀ§¿¡¼­ ¹Ù²ï Á¤º¸¸¦ ÂüÁ¶ ÇÏ¿© -// SelÀ» ¹Ù²Ù´Â °æ¿ìµµ Àֱ⠶§¹®ÀÌ´Ù. ¸¸¾àOnItemChanged·Î ó¸® ÇÏ°Ô µÇ¸é ¿©·¯¹ø (ȤÀº ¹«ÇÑ) -// ¼ÂÆà µÇ´Â °æ¿ì°¡ »ý±æ ¼ö ÀÖ´Ù. - [levites] -// FIXME : Å°·Î ¼¿À» ¹Ù²Ù´Â °æ¿ì¿¡ Àû¿ë µÇÁö ¾Ê´Â´Ù. - [levites] -void CResMotionList::OnLButtonDown(UINT nFlags, CPoint point) -{ - int iIndex = HitTest(point, NULL); - - if (-1 != iIndex) - { - std::string strName = GetItemText(iIndex, 0); - SetMotionIndex(m_ItemDataMap[strName]); - } - - CListCtrl::OnLButtonDown(nFlags, point); -} diff --git a/SoundArranger/ResMotionList.h b/SoundArranger/ResMotionList.h deleted file mode 100644 index b631756a..00000000 --- a/SoundArranger/ResMotionList.h +++ /dev/null @@ -1,65 +0,0 @@ -#if !defined(AFX_CResMotionList_H__5C5858FF_EAD5_49DE_A499_9285854C7ADD__INCLUDED_) -#define AFX_CResMotionList_H__5C5858FF_EAD5_49DE_A499_9285854C7ADD__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 -// CResMotionList.h : header file -// - -#include "Manager.h" - -///////////////////////////////////////////////////////////////////////////// -// CResMotionList window - -class CResMotionList : public CListCtrl, public CManager -{ -// Construction -public: - CResMotionList(); - -// Attributes -public: - -// Operations -public: - void OnChangedModel(); - void OnChangedMotion(); - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CResMotionList) - //}}AFX_VIRTUAL - -// Implementation -public: - virtual ~CResMotionList(); - - // Generated message map functions -protected: - //{{AFX_MSG(CResMotionList) - afx_msg void OnDblclk(NMHDR* pNMHDR, LRESULT* pResult); - afx_msg void OnLButtonDown(UINT nFlags, CPoint point); - //}}AFX_MSG - - DECLARE_MESSAGE_MAP() - -protected: - class CChangedModelObserver : public CManager::IChangedDataObserver - { - public: - void SetOwner(CResMotionList * pOwner) { m_pOwner = pOwner; } - void OnChangedModel() { m_pOwner->OnChangedModel(); } - void OnChangedMotion() { m_pOwner->OnChangedMotion(); } - protected: - CResMotionList * m_pOwner; - } m_ChangedModelObserver; - std::map m_ItemDataMap; -}; - -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_CResMotionList_H__5C5858FF_EAD5_49DE_A499_9285854C7ADD__INCLUDED_) diff --git a/SoundArranger/ResSoundData.cpp b/SoundArranger/ResSoundData.cpp deleted file mode 100644 index a5f779d5..00000000 --- a/SoundArranger/ResSoundData.cpp +++ /dev/null @@ -1,80 +0,0 @@ -// ResSoundData.cpp : implementation file -// - -#include "stdafx.h" -#include "SoundArranger.h" -#include "ResSoundData.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// CResSoundData dialog -CResSoundData::CResSoundData(CWnd* pParent /*=NULL*/) : CDialog(CResSoundData::IDD, pParent) -{ - //{{AFX_DATA_INIT(CResSoundData) - // NOTE: the ClassWizard will add member initialization here - //}}AFX_DATA_INIT -} - -void CResSoundData::DoDataExchange(CDataExchange* pDX) -{ - CDialog::DoDataExchange(pDX); - //{{AFX_DATA_MAP(CResSoundData) - // NOTE: the ClassWizard will add DDX and DDV calls here - //}}AFX_DATA_MAP -} - -BEGIN_MESSAGE_MAP(CResSoundData, CDialog) - //{{AFX_MSG_MAP(CResSoundData) - ON_WM_CLOSE() - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CResSoundData Normal Functions - -void CResSoundData::ClearSoundData() -{ - SetDlgItemText(IDC_SOUND_DATA_TIME, ""); - SetDlgItemText(IDC_SOUND_DATA_NAME, ""); - SetDlgItemText(IDC_SOUND_DATA_PERCENTAGE, ""); -} - -void CResSoundData::UpdateSoundData(float fTime, const char * c_szSoundFileName) -{ - char szTime[64]; - sprintf(szTime, "%f", fTime); - SetDlgItemText(IDC_SOUND_DATA_TIME, szTime); - SetDlgItemText(IDC_SOUND_DATA_NAME, c_szSoundFileName); -} -///////////////////////////////////////////////////////////////////////////// -// CResSoundData message handlers - -BOOL CResSoundData::Create(CWnd * pParent) -{ - if (!CDialog::Create(IDD, pParent)) - return FALSE; - - SetWindowPos(NULL, 0, 0, 0, 0, TRUE); - - return TRUE; -} - -void CResSoundData::OnClose() -{ - return; -} - -void CResSoundData::OnOK() -{ - return; -} - -void CResSoundData::OnCancel() -{ - return; -} diff --git a/SoundArranger/ResSoundData.h b/SoundArranger/ResSoundData.h deleted file mode 100644 index aea319f8..00000000 --- a/SoundArranger/ResSoundData.h +++ /dev/null @@ -1,52 +0,0 @@ -#if !defined(AFX_RESSOUNDDATA_H__105B318D_7F9D_4834_AA40_644F8AB1A655__INCLUDED_) -#define AFX_RESSOUNDDATA_H__105B318D_7F9D_4834_AA40_644F8AB1A655__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 -// ResSoundData.h : header file -// - -///////////////////////////////////////////////////////////////////////////// -// CResSoundData dialog - -class CResSoundData : public CDialog -{ -// Construction -public: - CResSoundData(CWnd* pParent = NULL); // standard constructor - BOOL Create(CWnd * pParent); - -// Dialog Data - //{{AFX_DATA(CResSoundData) - enum { IDD = IDD_SOUND_DATA }; - // NOTE: the ClassWizard will add data members here - //}}AFX_DATA - - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CResSoundData) - protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL - -// Implementation -protected: - virtual void OnOK(); - virtual void OnCancel(); - // Generated message map functions - //{{AFX_MSG(CResSoundData) - afx_msg void OnClose(); - //}}AFX_MSG - DECLARE_MESSAGE_MAP() - -public: - void ClearSoundData(); - void UpdateSoundData(float fTime, const char * c_szSoundFileName); -}; - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_RESSOUNDDATA_H__105B318D_7F9D_4834_AA40_644F8AB1A655__INCLUDED_) diff --git a/SoundArranger/ST_SplitterWnd.cpp b/SoundArranger/ST_SplitterWnd.cpp deleted file mode 100644 index 0ddb7222..00000000 --- a/SoundArranger/ST_SplitterWnd.cpp +++ /dev/null @@ -1,419 +0,0 @@ -// Project : general base class -// Compiler : Visual C++ 5.0 / 6.0 -// Plattform : Windows 95/98, Windows NT 3.51/4.0/2000 -// File : ST_SplitterWnd.cpp -// Programmer : dz, SoftToys -// Copyright : 2001 SoftToys -// Contact : info@softtoys.com -// Description : base class for handling splitter windows -// History : 02.Sept. 2001 Version 1.0 -// - - -#include "stdafx.h" -#include "ST_SplitterWnd.h" - -#ifdef _DEBUG -#undef THIS_FILE -static char THIS_FILE[]=__FILE__; -#define new DEBUG_NEW -#endif - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// - -ST_SplitterWnd::ST_SplitterWnd(int nLevel/* = 0*/) : m_nHiddenCol(-1),m_nHiddenRow(-1), - m_sRegKey(_T("SplitterWnd")) , m_nLevel(nLevel) -{ - m_nPaneSize[0] = 100; - m_nPaneSize[1] = 100; - m_nPaneMinSize[0] = 10; - m_nPaneMinSize[1] = 10; - m_pSubSplitterWnd[0] = NULL; - m_pSubSplitterWnd[1] = NULL; - m_nCurrentView[0] = 0; - m_nCurrentView[1] = 0; -} - -ST_SplitterWnd::~ST_SplitterWnd() -{ - SaveToRegistry(); -} - -bool ST_SplitterWnd::Create(CWnd* pParentWnd, CRuntimeClass* pView1, CRuntimeClass* pView2, - CCreateContext* pContext, bool bVertical,int nID) -{ - int nRow, nCol; - m_bVertical = bVertical; - if (bVertical) { - nRow = 1; - nCol = 2; - } - else { - nRow = 2; - nCol = 1; - } - VERIFY(CreateStatic(pParentWnd,nRow,nCol,WS_CHILD|WS_VISIBLE|WS_BORDER,nID)); - if (pView1 != NULL) { - VERIFY(CreateView(0,0,pView1,CSize(100,100),pContext)); - } - if (pView2 != NULL) { - if (bVertical) { - VERIFY(CreateView(0,1,pView2,CSize(100,100),pContext)); - } - else { - VERIFY(CreateView(1,0,pView2,CSize(100,100),pContext)); - } - } - return(true); -} - -void ST_SplitterWnd::SetInitialStatus() -{ - int c,r; - CString sSubKey; - sSubKey.Format(_T("Panes_%d"),m_nLevel); - CString s; - s = AfxGetApp()->GetProfileString(m_sRegKey,sSubKey,_T("-1 150 -1 150")); - sscanf(s,_T("%d %d %d %d"),&c,&m_nPaneSize[0],&r,&m_nPaneSize[1]); - - if (IsSplittverticaly()) { - SetColumnInfo(0,m_nPaneSize[0],m_nPaneMinSize[0]); - SetColumnInfo(1,m_nPaneSize[1],m_nPaneMinSize[1]); - if (c > -1) ToggleSide(c); - if (c == -1) RecalcLayout(); - } - else { - SetRowInfo(0,m_nPaneSize[0],m_nPaneMinSize[0]); - SetRowInfo(1,m_nPaneSize[1],m_nPaneMinSize[1]); - if (r > -1) ToggleSide(r); - if (r == -1) RecalcLayout(); - } - if (m_pSubSplitterWnd[0] != NULL) m_pSubSplitterWnd[0]->SetInitialStatus(); - if (m_pSubSplitterWnd[1] != NULL) m_pSubSplitterWnd[1]->SetInitialStatus(); -} - - - -void ST_SplitterWnd::SaveToRegistry() -{ - CString s; - CString sSubKey; - sSubKey.Format(_T("Panes_%d"),m_nLevel); - - RememberSize(); - if (m_nPaneSize[0] == -1) m_nPaneSize[0] = 100; - if (m_nPaneSize[1] == -1) m_nPaneSize[1] = 100; - - s.Format(_T("%d %d %d %d"),m_nHiddenCol,m_nPaneSize[0],m_nHiddenRow,m_nPaneSize[1]); - AfxGetApp()->WriteProfileString(m_sRegKey,sSubKey,s); - - if (m_pSubSplitterWnd[0] != NULL) m_pSubSplitterWnd[0]->SaveToRegistry(); - if (m_pSubSplitterWnd[1] != NULL) m_pSubSplitterWnd[1]->SaveToRegistry(); -} - -bool ST_SplitterWnd::IsSideHidden(int nSide /* = LEFT_SIDE */) -{ - if (IsSplittverticaly()) { - if (m_nHiddenCol == nSide) { - return(true); - } - } - else { - if (m_nHiddenRow == nSide) { - return(true); - } - } - return(false); -} - - -void ST_SplitterWnd::ShowColumn() -{ - ASSERT_VALID(this); - ASSERT(m_nCols < m_nMaxCols); - ASSERT(m_nHiddenCol != -1); - - int colNew = m_nHiddenCol; - m_nHiddenCol = -1; - m_nCols++; // add a column - ASSERT(m_nCols == m_nMaxCols); - - // fill the hidden column - int col; - for (int row = 0; row < m_nRows; row++) - { - CWnd* pPaneShow = GetDlgItem( - AFX_IDW_PANE_FIRST + row * 16 + m_nCols); - ASSERT(pPaneShow != NULL); - pPaneShow->ShowWindow(SW_SHOWNA); - - for (col = m_nCols - 2; col >= colNew; col--) - { - CWnd* pPane = GetPane(row, col); - ASSERT(pPane != NULL); - pPane->SetDlgCtrlID(IdFromRowCol(row, col + 1)); - } - - pPaneShow->SetDlgCtrlID(IdFromRowCol(row, colNew)); - } - // new panes have been created -- recalculate layout - RecalcLayout(); -} - -void ST_SplitterWnd::HideColumn(int colHide) -{ - ASSERT_VALID(this); - ASSERT(m_nCols > 1); - ASSERT(colHide < m_nCols); - ASSERT(m_nHiddenCol == -1); - if (m_nHiddenCol != -1) return; - - RememberSize(); - - m_nHiddenCol = colHide; - - // if the column has an active window -- change it - int rowActive, colActive; - if (GetActivePane(&rowActive, &colActive) != NULL && - colActive == colHide) - { - if (++colActive >= m_nCols) - colActive = 0; - SetActivePane(rowActive, colActive); - } - - // hide all column panes - for (int row = 0; row < m_nRows; row++) - { - CWnd* pPaneHide = GetPane(row, colHide); - ASSERT(pPaneHide != NULL); - pPaneHide->ShowWindow(SW_HIDE); - pPaneHide->SetDlgCtrlID( - AFX_IDW_PANE_FIRST + row * 16 + m_nCols); - - for (int col = colHide + 1; col < m_nCols; col++) - { - CWnd* pPane = GetPane(row, col); - ASSERT(pPane != NULL); - pPane->SetDlgCtrlID(IdFromRowCol(row, col - 1)); - } - } - m_nCols--; - m_pColInfo[m_nCols].nCurSize = m_pColInfo[colHide].nCurSize; - RecalcLayout(); -} - - -void ST_SplitterWnd::ShowRow() -{ - ASSERT_VALID(this); - ASSERT(m_nRows < m_nMaxRows); - ASSERT(m_nHiddenRow != -1); - - int rowNew = m_nHiddenRow; - m_nHiddenRow = -1; - m_nRows++; // add a row - ASSERT(m_nRows == m_nMaxRows); - - // fill the hidden row - int row; - for (int col = 0; col < m_nCols; col++) - { - CWnd* pPaneShow = GetDlgItem( - AFX_IDW_PANE_FIRST + m_nRows * 16 + col); - ASSERT(pPaneShow != NULL); - pPaneShow->ShowWindow(SW_SHOWNA); - - for (row = m_nRows - 2; row >= rowNew; row--) - { - CWnd* pPane = GetPane(row, col); - ASSERT(pPane != NULL); - pPane->SetDlgCtrlID(IdFromRowCol(row + 1, col)); - } - - pPaneShow->SetDlgCtrlID(IdFromRowCol(rowNew, col)); - } - - // new panes have been created -- recalculate layout - RecalcLayout(); -} - -void ST_SplitterWnd::HideRow(int rowHide) -{ - ASSERT_VALID(this); - ASSERT(m_nRows > 1); - ASSERT(rowHide < m_nRows); - ASSERT(m_nHiddenRow == -1); - if (m_nHiddenRow != -1) return; - - RememberSize(); - - m_nHiddenRow = rowHide; - - // if the column has an active window -- change it - int rowActive, colActive; - if (GetActivePane(&rowActive, &colActive) != NULL && - rowActive == rowHide) - { - if (++rowActive >= m_nRows) - rowActive = 0; - SetActivePane(rowActive, colActive); - } - - // hide all row panes - for (int col = 0; col < m_nCols; col++) - { - CWnd* pPaneHide = GetPane(rowHide, col); - ASSERT(pPaneHide != NULL); - pPaneHide->ShowWindow(SW_HIDE); - pPaneHide->SetDlgCtrlID( - AFX_IDW_PANE_FIRST + m_nRows * 16); - - for (int row = rowHide + 1; row < m_nRows; row++) - { - CWnd* pPane = GetPane(row, col); - ASSERT(pPane != NULL); - pPane->SetDlgCtrlID(IdFromRowCol(row - 1, col)); - } - } - m_nRows--; - m_pRowInfo[m_nRows].nCurSize = m_pRowInfo[rowHide].nCurSize; - - RecalcLayout(); -} - - -void ST_SplitterWnd::ToggleSide(int rc) -{ - if (IsSplittverticaly()) { - if (m_nHiddenCol == -1) { - // can only hide this row, if the other row in not hidden - HideColumn(rc); - } - else if (m_nHiddenCol == rc) { - // show this row, only if this row is hidden - ShowColumn(); - } - } - else { - if (m_nHiddenRow == -1) { - // can only hide this column, if the other colum in not hidden - HideRow(rc); - } - else if (m_nHiddenRow == rc) { - // show this column, only if this column is hidden - ShowRow(); - } - } -} - -void ST_SplitterWnd::RememberSize() -{ - if (m_pSubSplitterWnd[0] != NULL) m_pSubSplitterWnd[0]->RememberSize(); - if (m_pSubSplitterWnd[1] != NULL) m_pSubSplitterWnd[1]->RememberSize(); - - if (IsSplittverticaly()) { - if (m_nHiddenCol == -1) { // if not hidden - GetColumnInfo(0,m_nPaneSize[0],m_nPaneMinSize[0]); - GetColumnInfo(1,m_nPaneSize[1],m_nPaneMinSize[1]); - } - } - else { - if (m_nHiddenRow == -1) { // if not hidden - GetRowInfo(0,m_nPaneSize[0],m_nPaneMinSize[0]); - GetRowInfo(1,m_nPaneSize[1],m_nPaneMinSize[1]); - } - } -} - -ST_SplitterWnd* ST_SplitterWnd::AddSubDivision(int nSide, - CRuntimeClass* pView1,CRuntimeClass* pView2,CCreateContext* pContext,bool bVertical) -{ - ASSERT((nSide == 0) || (nSide == 1)); - ASSERT(m_pSubSplitterWnd[nSide] == NULL); - - int nRow, nCol; - SideToRowCol(nSide,&nRow,&nCol); - - int nID = IdFromRowCol(nRow,nCol); - m_pSubSplitterWnd[nSide] = new ST_SplitterWnd(m_nLevel+1); - m_pSubSplitterWnd[nSide]->Create(this,pView1,pView2,pContext,bVertical,nID); - return(m_pSubSplitterWnd[nSide]); -} - -bool ST_SplitterWnd::HideView(int nRow,int nCol) -{ - CWnd* pWnd = GetPane(nRow,nCol); - if (!pWnd) return(false); - pWnd->SetDlgCtrlID(0); - pWnd->ShowWindow(SW_HIDE); - return(true); -} - - -bool ST_SplitterWnd::ShowView(int nRow,int nCol,CWnd* pWnd) -{ - pWnd->SetDlgCtrlID(IdFromRowCol(nRow, nCol)); - pWnd->ShowWindow(SW_SHOW); - return(true); -} - - -int ST_SplitterWnd::AddView(int nSide, CRuntimeClass * pViewClass, CCreateContext* pContext) -{ - int nRow, nCol; - SideToRowCol(nSide,&nRow,&nCol); - - // hide the current view of the pane if there is a view attached already - if (GetDlgItem(IdFromRowCol(nRow, nCol))) { - HideView(nRow, nCol); - } - - // create the new view, if fail, set the previous view current - if (CreateView(nRow, nCol, pViewClass, CSize(10,10), pContext) == 0) return -1; - - // get and store the new view - CWnd* pWnd = GetPane(nRow, nCol); - m_views[nSide].push_back(pWnd); - m_nCurrentView[nSide] = m_views[nSide].size() - 1; - - ShowView(nRow, nCol,pWnd); - - RedrawWindow(); - return(m_nCurrentView[nSide]); - -} - - -void ST_SplitterWnd::SwitchToView(int nSide, int nViewIX /* = -1 */) -{ - // if the View is -1 then just use the next view... - if (nViewIX == -1) - { - nViewIX = m_nCurrentView[nSide] + 1; - - if (nViewIX >= (signed) m_views[nSide].size()) - nViewIX = 0; // rollover to first view - } - - CWnd* pWnd = m_views[nSide][nViewIX]; - - int nRow, nCol; - - if (IsSideHidden(LEFT_SIDE)) { - nRow = 0; - nCol = 0; - } - else { - SideToRowCol(nSide,&nRow,&nCol); - } - HideView(nRow, nCol); - ShowView(nRow, nCol, pWnd); - - m_nCurrentView[nSide] = nViewIX; - RecalcLayout(); - RedrawWindow(); -} - diff --git a/SoundArranger/ST_SplitterWnd.h b/SoundArranger/ST_SplitterWnd.h deleted file mode 100644 index 23746b22..00000000 --- a/SoundArranger/ST_SplitterWnd.h +++ /dev/null @@ -1,107 +0,0 @@ -// Project : general base class -// Compiler : Visual C++ 5.0 / 6.0 -// Plattform : Windows 95/98, Windows NT 3.51/4.0/2000 -// File : ST_SplitterWnd.h -// Programmer : dz, SoftToys -// Copyright : 2001 SoftToys -// Contact : info@softtoys.com -// Description : base class for handling splitter windows -// History : 02.Sept. 2001 Version 1.0 -// - -/* - Credits: Oleg Galkin, the methods ShowColumn and HideColumn are taken from - an article posted by Oleg Galkin on www.codeguru.com - - Caroline Englebienne, Adrian Roman and Dongik Shin helped with their - excellent articles about the switching views on www.codeguru.com and - www.codeproject.com. - -*/ - - - -#if !defined(AFX_ST_SPLITTERWND_H__6C9C6214_ED01_4243_A840_63FEDCE65D1E__INCLUDED_) -#define AFX_ST_SPLITTERWND_H__6C9C6214_ED01_4243_A840_63FEDCE65D1E__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -#pragma warning(disable:4786) -#include -using namespace std; - -#define LEFT_SIDE 0 -#define RIGHT_SIDE 1 -#define TOP_SIDE LEFT_SIDE -#define BOTTOM_SIDE RIGHT_SIDE - - -class ST_SplitterWnd : public CSplitterWnd -{ -public: - ST_SplitterWnd(int nLevel = 0); - virtual ~ST_SplitterWnd(); - - bool Create(CWnd* pParentWnd, CRuntimeClass* pView1, CRuntimeClass* pView2, CCreateContext* pContext , bool bVertical = true, int nID = AFX_IDW_PANE_FIRST); - - void SetInitialStatus(); // restore position and visibility - inline void SetMinSize(int i, int x) {ASSERT(i >= 0 && i <= 2); m_nPaneMinSize[i] = x;}; - - bool IsSideHidden(int nSide = 0); // true if pane is hidden - void ToggleSide(int row); // Show or hide row of column - void SetRegistryKey(LPCSTR p) {m_sRegKey = p;}; - - inline bool IsSplittverticaly() {return(m_bVertical);}; - - ST_SplitterWnd* m_pSubSplitterWnd[2]; // 0=Left/Top, 1=Right/Bottom - - ST_SplitterWnd* AddSubDivision(int nSide, CRuntimeClass* pView1, CRuntimeClass* pView2, - CCreateContext* pContext,bool bVertical); - - /* support for switching views */ - int AddView(int nSide, CRuntimeClass * pViewClass, CCreateContext* pContext); - void SwitchToView(int nSide,int nViewIX = -1); - -protected: - - inline void SideToRowCol(int nSide, int* nRow, int* nCol) - { - if (m_bVertical) { - *nRow = 0; - *nCol = nSide; - } - else { - *nRow = nSide; - *nCol = 0; - } - }; - - void ShowRow(); // show row - void HideRow(int rowHide); // hide row - void ShowColumn(); // show column - void HideColumn(int colHide); // hide column - - void SaveToRegistry(); - void RememberSize(); - - /* support for switching views */ - bool HideView(int nRow, int nCol); - bool ShowView(int nRow, int nCol,CWnd* pWnd); - - int m_nHiddenCol; - int m_nHiddenRow; - int m_nPaneSize[2]; - int m_nPaneMinSize[2]; - bool m_bVertical; - CString m_sRegKey; - int m_nLevel; - - /* support for switching views */ - vector m_views[2]; - int m_nCurrentView[2]; // side as index - -}; - -#endif // !defined(AFX_ST_SPLITTERWND_H__6C9C6214_ED01_4243_A840_63FEDCE65D1E__INCLUDED_) diff --git a/SoundArranger/SoundArranger.cpp b/SoundArranger/SoundArranger.cpp deleted file mode 100644 index 266eb8fd..00000000 --- a/SoundArranger/SoundArranger.cpp +++ /dev/null @@ -1,184 +0,0 @@ -// SoundArranger.cpp : Defines the class behaviors for the application. -// - -#include "stdafx.h" -#include "SoundArranger.h" - -#include "MainFrm.h" -#include "ChildFrm.h" -#include "SoundArrangerDoc.h" -#include "SoundArrangerView.h" - -#pragma comment(linker, "/NODEFAULTLIB:libci.lib") - -#pragma comment( lib, "granny2.lib" ) -#pragma comment( lib, "mss32.lib" ) -#pragma comment( lib, "SpeedTreeRT.lib" ) -//#pragma comment( lib, "version.lib" ) -//#pragma comment( lib, "python22.lib" ) -//#pragma comment( lib, "imagehlp.lib" ) -//#pragma comment( lib, "devil.lib" ) -//#pragma comment( lib, "winmm.lib" ) -//#pragma comment( lib, "imm32.lib" ) -//#pragma comment( lib, "oldnames.lib" ) -//#pragma comment( lib, "dinput8.lib" ) -//#pragma comment( lib, "dxguid.lib" ) -//#pragma comment( lib, "ws2_32.lib" ) - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// CSoundArrangerApp - -BEGIN_MESSAGE_MAP(CSoundArrangerApp, CWinApp) - //{{AFX_MSG_MAP(CSoundArrangerApp) - ON_COMMAND(ID_APP_ABOUT, OnAppAbout) - //}}AFX_MSG_MAP - // Standard file based document commands - ON_COMMAND(ID_FILE_NEW, CWinApp::OnFileNew) - ON_COMMAND(ID_FILE_OPEN, CWinApp::OnFileOpen) - // Standard print setup command - ON_COMMAND(ID_FILE_PRINT_SETUP, CWinApp::OnFilePrintSetup) -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CSoundArrangerApp construction - -CSoundArrangerApp::CSoundArrangerApp() -{ - timeBeginPeriod(1); -} - -CSoundArrangerApp::~CSoundArrangerApp() -{ - if (m_pMainWnd) - { - delete m_pMainWnd; - m_pMainWnd = NULL; - } - - timeEndPeriod(1); -} -///////////////////////////////////////////////////////////////////////////// -// The one and only CSoundArrangerApp object - -CSoundArrangerApp theApp; - -///////////////////////////////////////////////////////////////////////////// -// CSoundArrangerApp initialization - -BOOL CSoundArrangerApp::InitInstance() -{ - AfxEnableControlContainer(); - - // Change the registry key under which our settings are stored. - SetRegistryKey(_T("Local AppWizard-Generated Applications")); - - LoadStdProfileSettings(); // Load standard INI file options (including MRU) - - // Register document templates - - //CMultiDocTemplate* pDocTemplate; - //pDocTemplate = new CMultiDocTemplate( - //IDR_SOUNDATYPE, - //RUNTIME_CLASS(CSoundArrangerDoc), - //RUNTIME_CLASS(CChildFrame), // custom MDI child frame - //RUNTIME_CLASS(CSoundArrangerView)); - //AddDocTemplate(pDocTemplate); - - // create main MDI Frame window - CMainFrame * pMainFrame = new CMainFrame; - - if (!pMainFrame->LoadFrame(IDR_MAINFRAME)) - return FALSE; - - m_pMainWnd = pMainFrame; - - // Parse command line for standard shell commands, DDE, file open - CCommandLineInfo cmdInfo; - ParseCommandLine(cmdInfo); - - // Dispatch commands specified on the command line - if (!ProcessShellCommand(cmdInfo)) - return FALSE; - - pMainFrame->ShowWindow(m_nCmdShow); - pMainFrame->UpdateWindow(); - - return TRUE; -} - - -///////////////////////////////////////////////////////////////////////////// -// CAboutDlg dialog used for App About - -class CAboutDlg : public CDialog -{ -public: - CAboutDlg(); - -// Dialog Data - //{{AFX_DATA(CAboutDlg) - enum { IDD = IDD_ABOUTBOX }; - //}}AFX_DATA - - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CAboutDlg) - protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL - -// Implementation -protected: - //{{AFX_MSG(CAboutDlg) - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; - -CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD) -{ - //{{AFX_DATA_INIT(CAboutDlg) - //}}AFX_DATA_INIT -} - -void CAboutDlg::DoDataExchange(CDataExchange* pDX) -{ - CDialog::DoDataExchange(pDX); - //{{AFX_DATA_MAP(CAboutDlg) - //}}AFX_DATA_MAP -} - -BEGIN_MESSAGE_MAP(CAboutDlg, CDialog) - //{{AFX_MSG_MAP(CAboutDlg) - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -// App command to run the dialog -void CSoundArrangerApp::OnAppAbout() -{ - CAboutDlg aboutDlg; - aboutDlg.DoModal(); -} - -///////////////////////////////////////////////////////////////////////////// -// CSoundArrangerApp message handlers - -BOOL CSoundArrangerApp::OnIdle(LONG lCount) -{ -// static long s_lLastTime = timeGetTime(); -// long lcurTime = timeGetTime(); -// Tracef("[%d] %d / %d\n", lCount, lcurTime, lcurTime - s_lLastTime); -// s_lLastTime = lcurTime; - - if (CWinApp::OnIdle(lCount)) - return TRUE; - - CMainFrame * pFrame = (CMainFrame*)AfxGetMainWnd(); - pFrame->Process(); - - return TRUE; -} diff --git a/SoundArranger/SoundArranger.h b/SoundArranger/SoundArranger.h deleted file mode 100644 index c58be9dc..00000000 --- a/SoundArranger/SoundArranger.h +++ /dev/null @@ -1,49 +0,0 @@ -// SoundArranger.h : main header file for the SOUNDARRANGER application -// - -#if !defined(AFX_SOUNDARRANGER_H__F3734219_CC5E_4942_A36C_940BDA48E21D__INCLUDED_) -#define AFX_SOUNDARRANGER_H__F3734219_CC5E_4942_A36C_940BDA48E21D__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -#ifndef __AFXWIN_H__ - #error include 'stdafx.h' before including this file for PCH -#endif - -#include "resource.h" // main symbols - -///////////////////////////////////////////////////////////////////////////// -// CSoundArrangerApp: -// See SoundArranger.cpp for the implementation of this class -// - -class CSoundArrangerApp : public CWinApp -{ -public: - CSoundArrangerApp(); - ~CSoundArrangerApp(); - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CSoundArrangerApp) - public: - virtual BOOL InitInstance(); - virtual BOOL OnIdle(LONG lCount); - //}}AFX_VIRTUAL - -// Implementation - //{{AFX_MSG(CSoundArrangerApp) - afx_msg void OnAppAbout(); - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; - - -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SOUNDARRANGER_H__F3734219_CC5E_4942_A36C_940BDA48E21D__INCLUDED_) diff --git a/SoundArranger/SoundArranger.rc b/SoundArranger/SoundArranger.rc deleted file mode 100644 index f75d2abe..00000000 --- a/SoundArranger/SoundArranger.rc +++ /dev/null @@ -1,483 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Korean resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_KOR) -#ifdef _WIN32 -LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT -#pragma code_page(949) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE MOVEABLE PURE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE MOVEABLE PURE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE MOVEABLE PURE -BEGIN - "#define _AFX_NO_SPLITTER_RESOURCES\r\n" - "#define _AFX_NO_OLE_RESOURCES\r\n" - "#define _AFX_NO_TRACKER_RESOURCES\r\n" - "#define _AFX_NO_PROPERTY_RESOURCES\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_KOR)\r\n" - "LANGUAGE 18, 1\r\n" - "#pragma code_page(949)\r\n" - "#include ""res\\SoundArranger.rc2"" // Microsoft Visual C++ì—ì„œ 편집ë˜ì§€ ì•Šì€ ë¦¬ì†ŒìŠ¤\r\n" - "#include ""afxres.rc"" // 표준 구성 요소\r\n" - "#include ""afxprint.rc"" // ì¸ì‡„ 미리 보기 리소스\r\n" - "#endif\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDR_MAINFRAME ICON DISCARDABLE "res\\SoundArranger.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDR_TOOLBAR BITMAP MOVEABLE PURE "res\\ToolBar.bmp" -IDB_TOOLBAR BITMAP DISCARDABLE "res\\PlayToolBar.bmp" -IDR_TOOLBAR_WINDOW BITMAP DISCARDABLE "res\\WindowToolBar_Small.bmp" -IDB_TOOLBAR_WINDOW BITMAP DISCARDABLE "res\\WindowToolBar.bmp" -IDR_TOOLBAR_MODE BITMAP DISCARDABLE "res\\ModeToolBar.bmp" -IDB_SOUND_TREE_ITEM BITMAP DISCARDABLE "res\\SoundTreeItem.bmp" -IDB_MODEL_TREE_ITEM BITMAP DISCARDABLE "res\\ModelTreeItem.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDR_MAINFRAME MENU DISCARDABLE -BEGIN - POPUP "파ì¼(&F)" - BEGIN - MENUITEM "사운드 ë°ì´íƒ€ 저장하기 (Ctrl+S)", ID_APP_SAVE_SOUND_DATA - MENUITEM SEPARATOR - MENUITEM "ë내기(&X)", ID_APP_EXIT - END - POPUP "ìž‘ì—…(&W)" - BEGIN - POPUP "모드" - BEGIN - MENUITEM "ì—디트 모드 (F3)", ID_WORK_MODE_EDIT - MENUITEM "ë·° 모드 (F4)", ID_WORK_MODE_VIEW - END - MENUITEM SEPARATOR - MENUITEM "현재 ëª¨ë¸ ìŠ¤í¬ë¦° 샷 캡춰 (Print Screen)", - ID_WORK_SCREEN_SHOT_CAPTURE - MENUITEM "ë°ì´íƒ€ 리로드 (Ctrl+R)", ID_WORK_RELOAD_ALL_RESOURCE - MENUITEM "ì„ íƒëœ 사운드 취소 (ESC)", ID_CANCEL_SOUND - END - POPUP "보기(&V)" - BEGIN - MENUITEM "ë„구 모ìŒ(&T)", ID_VIEW_TOOLBAR - MENUITEM SEPARATOR - MENUITEM "ëª¨ë¸ ë¦¬ìŠ¤íŠ¸ ì°½", ID_VIEW_MODEL_LIST - MENUITEM "모션 리스트 ì°½", ID_VIEW_MOTION_LIST - MENUITEM "모션 ì •ë³´ ì°½", ID_VIEW_MOTION_PROPERTY - MENUITEM "사운드 리스트 ì°½", ID_VIEW_SOUND_LIST - END - POPUP "ë„움ë§(&H)" - BEGIN - MENUITEM "SoundArranger ì •ë³´(&A)...", ID_APP_ABOUT - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// - -IDR_MAINFRAME ACCELERATORS MOVEABLE PURE -BEGIN - "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT - "N", ID_APP_NEW, VIRTKEY, CONTROL, NOINVERT - "R", ID_WORK_RELOAD_ALL_RESOURCE, VIRTKEY, CONTROL, NOINVERT - "S", ID_APP_SAVE_SOUND_DATA, VIRTKEY, CONTROL, NOINVERT - "V", ID_EDIT_PASTE, VIRTKEY, CONTROL, NOINVERT - VK_BACK, ID_EDIT_UNDO, VIRTKEY, ALT, NOINVERT - VK_DELETE, ID_EDIT_CUT, VIRTKEY, SHIFT, NOINVERT - VK_ESCAPE, ID_CANCEL_SOUND, VIRTKEY, NOINVERT - VK_F1, ID_TOOLBAR_REVERSE, VIRTKEY, NOINVERT - VK_F2, ID_TOOLBAR_PLAY, VIRTKEY, NOINVERT - VK_F3, ID_TOOLBAR_PLAYLOOP, VIRTKEY, NOINVERT - VK_F4, ID_TOOLBAR_STOP, VIRTKEY, NOINVERT - VK_F5, ID_TOOLBAR_PAUSE, VIRTKEY, NOINVERT - VK_F5, ID_NEXT_PANE, VIRTKEY, SHIFT, NOINVERT - VK_F6, ID_PREV_PANE, VIRTKEY, SHIFT, NOINVERT - VK_INSERT, ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT - VK_INSERT, ID_EDIT_PASTE, VIRTKEY, SHIFT, NOINVERT - VK_SPACE, ID_KEYBOARD_PLAY, VIRTKEY, NOINVERT - "X", ID_EDIT_CUT, VIRTKEY, CONTROL, NOINVERT - "Z", ID_CHAR_VISIBLE_TOGGLE, VIRTKEY, NOINVERT - "Z", ID_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_ABOUTBOX DIALOG DISCARDABLE 0, 0, 235, 55 -STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "SoundArranger ì •ë³´" -FONT 9, "MS Shell Dlg" -BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20 - LTEXT "SoundArranger 버전 1.0",IDC_STATIC,40,10,119,8, - SS_NOPREFIX - LTEXT "Copyright (c) Ymir Entertainment 2003",IDC_STATIC,40,25, - 119,8 - DEFPUSHBUTTON "확ì¸",IDOK,178,7,50,16,WS_GROUP -END - -IDD_NEW_SOUNDDATA DIALOG DISCARDABLE 0, 0, 147, 171 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "New Sound Data" -FONT 9, "굴림" -BEGIN - EDITTEXT IDC_SOUNDDATA_NAME,9,27,97,14,ES_AUTOHSCROLL - PUSHBUTTON "&Proceed",IDC_SOUNDDATA_MAKE,31,147,39,15 - PUSHBUTTON "&Cancel",IDC_CANCEL,72,147,42,15 - PUSHBUTTON "&Browse",IDC_SOUNDDATA_SEARCH_AS,109,26,30,17 - GROUPBOX "File",IDC_STATIC,3,3,141,47 - GROUPBOX "Abstract",IDC_STATIC,3,58,141,60 - CONTROL "File ì§ì ‘ 사용",IDC_DIRECT_FILE,"Button", - BS_AUTORADIOBUTTON,9,13,59,10 - CONTROL "File ê°„ì ‘ 사용",IDC_ABSTRACT_FILE,"Button", - BS_AUTORADIOBUTTON,9,68,59,10 - COMBOBOX IDC_ABSTRACT_LIST,18,82,114,525,CBS_DROPDOWN | CBS_SORT | - WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_ABSTRACT_SUB_LIST,18,98,114,525,CBS_DROPDOWN | - CBS_SORT | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_SOUNDDATA_PERCENTAGE,29,126,108,12,ES_CENTER | - ES_AUTOHSCROLL - LTEXT "확률",IDC_STATIC,9,128,15,8 -END - -IDD_SOUND_DATA DIALOGEX 0, 0, 250, 27 -STYLE DS_MODALFRAME | WS_CAPTION -CAPTION "Sound Data" -FONT 9, "굴림", 0, 0, 0x1 -BEGIN - LTEXT "Time",IDC_STATIC,5,5,18,8 - LTEXT "Name",IDC_STATIC,4,16,20,8 - CTEXT "",IDC_SOUND_DATA_TIME,28,3,221,10,0,WS_EX_STATICEDGE - CTEXT "",IDC_SOUND_DATA_NAME,28,15,221,10,0,WS_EX_STATICEDGE -END - -IDD_PAGE_SOUND_LIST DIALOG DISCARDABLE 0, 0, 110, 220 -STYLE WS_CHILD -FONT 9, "굴림" -BEGIN - CONTROL "Tree1",IDC_SOUND_LIST,"SysTreeView32",TVS_HASBUTTONS | - TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | - WS_BORDER | WS_TABSTOP,3,18,104,201 - PUSHBUTTON "PLAY",IDC_SOUND_PLAY,3,3,49,12 - PUSHBUTTON "Refresh",IDC_SOUND_REFRESH,58,3,49,12 -END - -IDD_PAGE_MOTION_PROPERTY DIALOG DISCARDABLE 0, 0, 110, 108 -STYLE WS_CHILD -FONT 9, "굴림" -BEGIN - CTEXT "Model",IDC_STATIC,4,9,20,8 - LTEXT "None",IDC_MOTION_PROPERTY_MODEL_NAME,28,8,79,11, - SS_SUNKEN - CTEXT "Motion",IDC_STATIC,3,22,24,8 - LTEXT "None",IDC_MOTION_PROPERTY_MOTION_NAME,28,21,79,11, - SS_SUNKEN - LISTBOX IDC_MOTION_PROPERTY_SHAPE_LIST,4,49,102,54,LBS_SORT | - LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - CTEXT "Time",IDC_STATIC,3,34,24,8 - LTEXT "None",IDC_MOTION_PROPERTY_MOTION_TIME,28,34,79,11, - SS_SUNKEN -END - -IDD_DIALOG_MOTION_VIEW_MODE DIALOG DISCARDABLE 0, 0, 97, 141 -STYLE DS_MODALFRAME | WS_CAPTION -CAPTION "Motion View Mode" -FONT 9, "굴림" -BEGIN - LISTBOX IDC_BASIS_MOTION_LIST,3,13,91,35,LBS_SORT | - LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - LTEXT "기본 모션",IDC_STATIC,3,3,31,8 - LTEXT "예약 모션",IDC_STATIC,3,53,31,8 - LISTBOX IDC_RESERVE_MOTION_LIST,3,63,91,75,LBS_SORT | - LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP -END - - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "041203b5" - BEGIN - VALUE "Comments", "\0" - VALUE "CompanyName", "Ymir Entertainment\0" - VALUE "FileDescription", "Sound Tool\0" - VALUE "FileVersion", "1.0.0.1\0" - VALUE "InternalName", "SoundArranger.exe\0" - VALUE "LegalCopyright", "(c) Ymir Entertainment. All rights reserved.\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "SoundArranger.exe\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Sound Arranger\0" - VALUE "ProductVersion", "1.0.0.1\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x412, 949 - END -END - -#endif // !_MAC - - -///////////////////////////////////////////////////////////////////////////// -// -// Toolbar -// - -IDR_TOOLBAR TOOLBAR MOVEABLE PURE 19, 31 -BEGIN - BUTTON ID_TOOLBAR_REVERSE - SEPARATOR - BUTTON ID_TOOLBAR_PLAY - BUTTON ID_TOOLBAR_PLAYLOOP - BUTTON ID_TOOLBAR_STOP - BUTTON ID_TOOLBAR_PAUSE -END - -IDR_TOOLBAR_WINDOW TOOLBAR DISCARDABLE 36, 31 -BEGIN - BUTTON ID_VIEW_MODEL_LIST - BUTTON ID_VIEW_MOTION_LIST - BUTTON ID_VIEW_MOTION_PROPERTY - BUTTON ID_VIEW_SOUND_LIST -END - -IDR_TOOLBAR_MODE TOOLBAR DISCARDABLE 36, 31 -BEGIN - BUTTON ID_WORK_MODE_EDIT - BUTTON ID_WORK_MODE_VIEW -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Cursor -// - -IDC_ADD_SOUND CURSOR DISCARDABLE "res\\New_Sound.cur" -IDC_VIEWMOVE CURSOR DISCARDABLE "res\\viewmode.cur" -IDC_CHANGE_SOUND CURSOR DISCARDABLE "res\\Change_Sound.cur" - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDR_MAINFRAME "SoundArranger" - IDR_SoundArrangerTYPE "\nSoundArranger\nSoundArranger" -END - -STRINGTABLE DISCARDABLE -BEGIN - AFX_IDS_APP_TITLE "SoundArranger" - AFX_IDS_IDLEMESSAGE "준비" -END - -STRINGTABLE DISCARDABLE -BEGIN - ID_INDICATOR_EXT "EXT" - ID_INDICATOR_CAPS "CAP" - ID_INDICATOR_NUM "NUM" - ID_INDICATOR_SCRL "SCRL" - ID_INDICATOR_OVR "OVR" - ID_INDICATOR_REC "REC" -END - -STRINGTABLE DISCARDABLE -BEGIN - ID_APP_NEW "새 문서를 만듭니다.\n새로 만들기" -END - -STRINGTABLE DISCARDABLE -BEGIN - ID_FILE_CLOSE "액티브 문서를 닫습니다.\n닫기" - ID_FILE_PAGE_SETUP "ì¸ì‡„ ì˜µì…˜ì„ ë³€ê²½í•©ë‹ˆë‹¤.\n페ì´ì§€ 설정" - ID_FILE_PRINT_SETUP "프린터 ë° ì¸ì‡„ ì˜µì…˜ì„ ë³€ê²½í•©ë‹ˆë‹¤.\nì¸ì‡„ 설정" - ID_FILE_PRINT "액티브 문서를 ì¸ì‡„합니다.\nì¸ì‡„" - ID_FILE_PRINT_PREVIEW "ì „ì²´ 페ì´ì§€ë¥¼ 표시합니다.\nì¸ì‡„ 미리 보기" -END - -STRINGTABLE DISCARDABLE -BEGIN - ID_APP_ABOUT "프로그램 ì •ë³´, 버전 번호, ì €ìž‘ê¶Œì„ í‘œì‹œí•©ë‹ˆë‹¤.\nì •ë³´" - ID_APP_EXIT "문서를 저장할지를 묻고 ì‘ìš© í”„ë¡œê·¸ëž¨ì„ ë냅니다.\në내기" -END - -STRINGTABLE DISCARDABLE -BEGIN - ID_NEXT_PANE "ë‹¤ìŒ ì°½ìœ¼ë¡œ 전환합니다.\në‹¤ìŒ ì°½" - ID_PREV_PANE "ì´ì „ 창으로 전환합니다.\nì´ì „ ì°½" -END - -STRINGTABLE DISCARDABLE -BEGIN - ID_WINDOW_ARRANGE "ì°½ 맨 ì•„ëž˜ì— ì•„ì´ì½˜ì„ 정렬합니다.\nì•„ì´ì½˜ ì •ë ¬" - ID_WINDOW_CASCADE "ì°½ì´ ê²¹ì¹˜ë„ë¡ ê³„ë‹¨ì‹ìœ¼ë¡œ 정렬합니다.\nê³„ë‹¨ì‹ ì°½ ë°°ì—´" - ID_WINDOW_TILE_HORZ "ì°½ì´ ê²¹ì¹˜ì§€ ì•Šë„ë¡ ë°”ë‘‘íŒì‹ìœ¼ë¡œ 정렬합니다.\n바둑íŒì‹ ì°½ ë°°ì—´" - ID_WINDOW_TILE_VERT "ì°½ì´ ê²¹ì¹˜ì§€ ì•Šë„ë¡ ë°”ë‘‘íŒì‹ìœ¼ë¡œ 정렬합니다.\n바둑íŒì‹ ì°½ ë°°ì—´" - ID_WINDOW_SPLIT "활성 ì°½ì„ ì—¬ëŸ¬ ê°œì˜ ì°½ìœ¼ë¡œ 분할합니다.\n분할" -END - -STRINGTABLE DISCARDABLE -BEGIN - ID_EDIT_CLEAR "ì„ íƒ ì˜ì—­ì„ 지ì›ë‹ˆë‹¤.\n지우기" - ID_EDIT_CLEAR_ALL "모든 ê²ƒì„ ì§€ì›ë‹ˆë‹¤.\nëª¨ë‘ ì§€ìš°ê¸°" - ID_EDIT_COPY "ì„ íƒ ì˜ì—­ì„ 복사하여 í´ë¦½ë³´ë“œì— 넣습니다.\n복사" - ID_EDIT_CUT "ì„ íƒ ì˜ì—­ì„ 잘ë¼ë‚´ì–´ í´ë¦½ë³´ë“œì— 넣습니다.\n잘ë¼ë‚´ê¸°" - ID_EDIT_FIND "지정한 í…스트를 찾습니다.\n찾기" - ID_EDIT_PASTE "í´ë¦½ë³´ë“œ ë‚´ìš©ì„ ì‚½ìž…í•©ë‹ˆë‹¤.\n붙여넣기" - ID_EDIT_REPEAT "마지막 ìž‘ì—…ì„ ë°˜ë³µí•©ë‹ˆë‹¤.\n반복" - ID_EDIT_REPLACE "특정 í…스트를 다른 í…스트로 바꿉니다.\n바꾸기" - ID_EDIT_SELECT_ALL "ì „ì²´ 문서를 ì„ íƒí•©ë‹ˆë‹¤.\nëª¨ë‘ ì„ íƒ" - ID_EDIT_UNDO "마지막 ìž‘ì—… ì‹¤í–‰ì„ ì·¨ì†Œí•©ë‹ˆë‹¤.\n실행 취소" - ID_EDIT_REDO "ì´ì „ì— ì‹¤í–‰ ì·¨ì†Œëœ ìž‘ì—…ì„ ë‹¤ì‹œ 실행합니다.\n다시 실행" -END - -STRINGTABLE DISCARDABLE -BEGIN - ID_VIEW_TOOLBAR "ë„구 모ìŒì„ 표시하거나 숨ê¹ë‹ˆë‹¤.\në„구 ëª¨ìŒ ì„¤ì •/í•´ì œ" -END - -STRINGTABLE DISCARDABLE -BEGIN - AFX_IDS_SCSIZE "ì°½ í¬ê¸°ë¥¼ 변경합니다." - AFX_IDS_SCMOVE "ì°½ 위치를 변경합니다." - AFX_IDS_SCMINIMIZE "ì°½ì„ ì•„ì´ì½˜ìœ¼ë¡œ 축소합니다." - AFX_IDS_SCMAXIMIZE "ì°½ì„ ì „ì²´ 화면 í¬ê¸°ë¡œ 확대합니다." - AFX_IDS_SCNEXTWINDOW "ë‹¤ìŒ ë¬¸ì„œ 창으로 전환합니다." - AFX_IDS_SCPREVWINDOW "ì´ì „ 문서 창으로 전환합니다." - AFX_IDS_SCCLOSE "문서를 저장할 것ì¸ì§€ 확ì¸í•˜ê³  활성 ì°½ì„ ë‹«ìŠµë‹ˆë‹¤." -END - -STRINGTABLE DISCARDABLE -BEGIN - AFX_IDS_SCRESTORE "ì°½ì„ ë³´í†µ í¬ê¸°ë¡œ ë³µì›í•©ë‹ˆë‹¤." - AFX_IDS_SCTASKLIST "ìž‘ì—… ëª©ë¡ í™œì„±í™”" - AFX_IDS_MDICHILD "ì´ ì°½ì„ í™œì„±í™”í•©ë‹ˆë‹¤." -END - -STRINGTABLE DISCARDABLE -BEGIN - AFX_IDS_PREVIEW_CLOSE "ì¸ì‡„ 미리 보기 모드를 닫습니다.\n미리 보기 취소" -END - -STRINGTABLE DISCARDABLE -BEGIN - ID_TOOLBAR_REVERSE "ë˜ëŒë¦¬ê¸° (F1)" - ID_TOOLBAR_PLAY "ìž¬ìƒ (F2)" - ID_TOOLBAR_STOP "정지 (F4)" - ID_TOOLBAR_PAUSE "ìž ì‹œ 멈춤 (F5)" - ID_TOOLBAR_PLAYLOOP "반복 ìž¬ìƒ (F3)" - ID_VIEW_MODEL_LIST "ëª¨ë¸ ë¦¬ìŠ¤íŠ¸ ì°½\nëª¨ë¸ ë¦¬ìŠ¤íŠ¸ ì°½" -END - -STRINGTABLE DISCARDABLE -BEGIN - ID_VIEW_MOTION_LIST "모션 리스트 ì°½\n모션 리스트 ì°½" - ID_VIEW_MOTION_PROPERTY "모션 ì •ë³´ ì°½\n모션 ì •ë³´ ì°½" - ID_VIEW_SOUND_LIST "사운드 리스트 ì°½\n사운드 리스트 ì°½" -END - -#endif // Korean resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// -#define _AFX_NO_SPLITTER_RESOURCES -#define _AFX_NO_OLE_RESOURCES -#define _AFX_NO_TRACKER_RESOURCES -#define _AFX_NO_PROPERTY_RESOURCES - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_KOR) -LANGUAGE 18, 1 -#pragma code_page(949) -#include "res\SoundArranger.rc2" // Microsoft Visual C++ì—ì„œ 편집ë˜ì§€ ì•Šì€ ë¦¬ì†ŒìŠ¤ -#include "afxres.rc" // 표준 구성 요소 -#include "afxprint.rc" // ì¸ì‡„ 미리 보기 리소스 -#endif - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/SoundArranger/SoundArranger.vcproj b/SoundArranger/SoundArranger.vcproj deleted file mode 100644 index bd4020b0..00000000 --- a/SoundArranger/SoundArranger.vcproj +++ /dev/null @@ -1,1075 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SoundArranger/SoundArrangerDoc.cpp b/SoundArranger/SoundArrangerDoc.cpp deleted file mode 100644 index 771f02d0..00000000 --- a/SoundArranger/SoundArrangerDoc.cpp +++ /dev/null @@ -1,75 +0,0 @@ -// SoundArrangerDoc.cpp : implementation of the CSoundArrangerDoc class -// - -#include "stdafx.h" -#include "SoundArranger.h" - -#include "SoundArrangerDoc.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// CSoundArrangerDoc - -IMPLEMENT_DYNCREATE(CSoundArrangerDoc, CDocument) - -BEGIN_MESSAGE_MAP(CSoundArrangerDoc, CDocument) - //{{AFX_MSG_MAP(CSoundArrangerDoc) - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CSoundArrangerDoc construction/destruction - -CSoundArrangerDoc::CSoundArrangerDoc() -{ -} - -CSoundArrangerDoc::~CSoundArrangerDoc() -{ -} - -BOOL CSoundArrangerDoc::OnNewDocument() -{ - if (!CDocument::OnNewDocument()) - return FALSE; - - return TRUE; -} - - - -///////////////////////////////////////////////////////////////////////////// -// CSoundArrangerDoc serialization - -void CSoundArrangerDoc::Serialize(CArchive& ar) -{ - if (ar.IsStoring()) - { - } - else - { - } -} - -///////////////////////////////////////////////////////////////////////////// -// CSoundArrangerDoc diagnostics - -#ifdef _DEBUG -void CSoundArrangerDoc::AssertValid() const -{ - CDocument::AssertValid(); -} - -void CSoundArrangerDoc::Dump(CDumpContext& dc) const -{ - CDocument::Dump(dc); -} -#endif //_DEBUG - -///////////////////////////////////////////////////////////////////////////// -// CSoundArrangerDoc commands diff --git a/SoundArranger/SoundArrangerDoc.h b/SoundArranger/SoundArrangerDoc.h deleted file mode 100644 index 88aaf1ac..00000000 --- a/SoundArranger/SoundArrangerDoc.h +++ /dev/null @@ -1,55 +0,0 @@ -// SoundArrangerDoc.h : interface of the CSoundArrangerDoc class -// -///////////////////////////////////////////////////////////////////////////// - -#if !defined(AFX_SOUNDARRANGERDOC_H__0A47B197_2A73_48C8_BE08_B7B3FB7ABA96__INCLUDED_) -#define AFX_SOUNDARRANGERDOC_H__0A47B197_2A73_48C8_BE08_B7B3FB7ABA96__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - - -class CSoundArrangerDoc : public CDocument -{ -protected: // create from serialization only - CSoundArrangerDoc(); - DECLARE_DYNCREATE(CSoundArrangerDoc) - -// Attributes -public: - -// Operations -public: - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CSoundArrangerDoc) - public: - virtual BOOL OnNewDocument(); - virtual void Serialize(CArchive& ar); - //}}AFX_VIRTUAL - -// Implementation -public: - virtual ~CSoundArrangerDoc(); -#ifdef _DEBUG - virtual void AssertValid() const; - virtual void Dump(CDumpContext& dc) const; -#endif - -protected: - -// Generated message map functions -protected: - //{{AFX_MSG(CSoundArrangerDoc) - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; - -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SOUNDARRANGERDOC_H__0A47B197_2A73_48C8_BE08_B7B3FB7ABA96__INCLUDED_) diff --git a/SoundArranger/SoundArrangerView.cpp b/SoundArranger/SoundArrangerView.cpp deleted file mode 100644 index 48bfaf08..00000000 --- a/SoundArranger/SoundArrangerView.cpp +++ /dev/null @@ -1,94 +0,0 @@ -// SoundArrangerView.cpp : implementation of the CSoundArrangerView class -// - -#include "stdafx.h" -#include "SoundArranger.h" - -#include "SoundArrangerDoc.h" -#include "SoundArrangerView.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// CSoundArrangerView - -IMPLEMENT_DYNCREATE(CSoundArrangerView, CView) - -BEGIN_MESSAGE_MAP(CSoundArrangerView, CView) - //{{AFX_MSG_MAP(CSoundArrangerView) - //}}AFX_MSG_MAP - // Standard printing commands - ON_COMMAND(ID_FILE_PRINT, CView::OnFilePrint) - ON_COMMAND(ID_FILE_PRINT_DIRECT, CView::OnFilePrint) - ON_COMMAND(ID_FILE_PRINT_PREVIEW, CView::OnFilePrintPreview) -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CSoundArrangerView construction/destruction - -CSoundArrangerView::CSoundArrangerView() -{ -} - -CSoundArrangerView::~CSoundArrangerView() -{ -} - -BOOL CSoundArrangerView::PreCreateWindow(CREATESTRUCT& cs) -{ - return CView::PreCreateWindow(cs); -} - -///////////////////////////////////////////////////////////////////////////// -// CSoundArrangerView drawing - -void CSoundArrangerView::OnDraw(CDC* pDC) -{ - CSoundArrangerDoc* pDoc = GetDocument(); - ASSERT_VALID(pDoc); -} - -///////////////////////////////////////////////////////////////////////////// -// CSoundArrangerView printing - -BOOL CSoundArrangerView::OnPreparePrinting(CPrintInfo* pInfo) -{ - // default preparation - return DoPreparePrinting(pInfo); -} - -void CSoundArrangerView::OnBeginPrinting(CDC* /*pDC*/, CPrintInfo* /*pInfo*/) -{ -} - -void CSoundArrangerView::OnEndPrinting(CDC* /*pDC*/, CPrintInfo* /*pInfo*/) -{ -} - -///////////////////////////////////////////////////////////////////////////// -// CSoundArrangerView diagnostics - -#ifdef _DEBUG -void CSoundArrangerView::AssertValid() const -{ - CView::AssertValid(); -} - -void CSoundArrangerView::Dump(CDumpContext& dc) const -{ - CView::Dump(dc); -} - -CSoundArrangerDoc* CSoundArrangerView::GetDocument() // non-debug version is inline -{ - ASSERT(m_pDocument->IsKindOf(RUNTIME_CLASS(CSoundArrangerDoc))); - return (CSoundArrangerDoc*)m_pDocument; -} -#endif //_DEBUG - -///////////////////////////////////////////////////////////////////////////// -// CSoundArrangerView message handlers diff --git a/SoundArranger/SoundArrangerView.h b/SoundArranger/SoundArrangerView.h deleted file mode 100644 index 9799800b..00000000 --- a/SoundArranger/SoundArrangerView.h +++ /dev/null @@ -1,65 +0,0 @@ -// SoundArrangerView.h : interface of the CSoundArrangerView class -// -///////////////////////////////////////////////////////////////////////////// - -#if !defined(AFX_SOUNDARRANGERVIEW_H__273D8B8A_C7B0_4959_A8E5_394CE1151263__INCLUDED_) -#define AFX_SOUNDARRANGERVIEW_H__273D8B8A_C7B0_4959_A8E5_394CE1151263__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - - -class CSoundArrangerView : public CView -{ -protected: // create from serialization only - CSoundArrangerView(); - DECLARE_DYNCREATE(CSoundArrangerView) - -// Attributes -public: - CSoundArrangerDoc* GetDocument(); - -// Operations -public: - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CSoundArrangerView) - public: - virtual void OnDraw(CDC* pDC); // overridden to draw this view - virtual BOOL PreCreateWindow(CREATESTRUCT& cs); - protected: - virtual BOOL OnPreparePrinting(CPrintInfo* pInfo); - virtual void OnBeginPrinting(CDC* pDC, CPrintInfo* pInfo); - virtual void OnEndPrinting(CDC* pDC, CPrintInfo* pInfo); - //}}AFX_VIRTUAL - -// Implementation -public: - virtual ~CSoundArrangerView(); -#ifdef _DEBUG - virtual void AssertValid() const; - virtual void Dump(CDumpContext& dc) const; -#endif - -protected: - -// Generated message map functions -protected: - //{{AFX_MSG(CSoundArrangerView) - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; - -#ifndef _DEBUG // debug version in SoundArrangerView.cpp -inline CSoundArrangerDoc* CSoundArrangerView::GetDocument() - { return (CSoundArrangerDoc*)m_pDocument; } -#endif - -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SOUNDARRANGERVIEW_H__273D8B8A_C7B0_4959_A8E5_394CE1151263__INCLUDED_) diff --git a/SoundArranger/SoundArranger_VC71.vcproj b/SoundArranger/SoundArranger_VC71.vcproj deleted file mode 100644 index b1f9ca9c..00000000 --- a/SoundArranger/SoundArranger_VC71.vcproj +++ /dev/null @@ -1,436 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SoundArranger/SoundDataLoader.cpp b/SoundArranger/SoundDataLoader.cpp deleted file mode 100644 index 3d694c2b..00000000 --- a/SoundArranger/SoundDataLoader.cpp +++ /dev/null @@ -1,57 +0,0 @@ -#include "StdAfx.h" -#include "SoundDataLoader.h" - -bool CSoundDataLoader::OnFolder(const char* c_szFilter, const char* c_szPathName, const char* c_szFileName) -{ - assert(m_pTreeControler); - - std::string stPathName = ""; - stPathName += c_szPathName; - stPathName += c_szFileName; - - HTREEITEM hFolderItem = m_pTreeControler->InsertItem(c_szFileName, 0, 1, m_hParentItem, TVI_SORT); - - CSoundDataLoader SoundDataLoader; - SoundDataLoader.SetTreeControler(m_pTreeControler); - SoundDataLoader.SetParentItem(hFolderItem); - SoundDataLoader.Create(c_szFilter, stPathName.c_str(), TRUE); - return true; -} - -bool CSoundDataLoader::OnFile(const char* c_szPathName, const char* c_szFileName) -{ - HTREEITEM hTreeItem = m_pTreeControler->InsertItem(c_szFileName, 2, 2, m_hParentItem, TVI_SORT); - - ///// - - std::string strTemporaryFullFileName; - std::string strFullFileName; - strTemporaryFullFileName = c_szPathName; - strTemporaryFullFileName += c_szFileName; - StringPath(strTemporaryFullFileName.c_str(), strFullFileName); - - DWORD dwCRC32 = GetCaseCRC32(strFullFileName.c_str(), strFullFileName.length()); - m_pTreeControler->SetItemData(hTreeItem, dwCRC32); - RegisterSoundFileName(dwCRC32, strFullFileName.c_str()); - - return true; -} - -void CSoundDataLoader::SetTreeControler(CTreeCtrl * pTreeControler) -{ - m_pTreeControler = pTreeControler; -} - - -void CSoundDataLoader::SetParentItem(HTREEITEM hParentItem) -{ - m_hParentItem = hParentItem; -} - -CSoundDataLoader::CSoundDataLoader() -: m_pTreeControler(NULL), m_hParentItem(TVI_ROOT) -{ -} -CSoundDataLoader::~CSoundDataLoader() -{ -} \ No newline at end of file diff --git a/SoundArranger/SoundDataLoader.h b/SoundArranger/SoundDataLoader.h deleted file mode 100644 index 76d3535c..00000000 --- a/SoundArranger/SoundDataLoader.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include -#include "Manager.h" - -class CSoundDataLoader : public CDir, public CManager -{ - public: - CSoundDataLoader(); - virtual ~CSoundDataLoader(); - - void SetTreeControler(CTreeCtrl * pTreeControler); - void SetParentItem(HTREEITEM hParentItem); - - bool OnFolder(const char* c_szFilter, const char* c_szPathName, const char* c_szFileName); - bool OnFile(const char* c_szPathName, const char* c_szFileName); - - protected: - CTreeCtrl * m_pTreeControler; - HTREEITEM m_hParentItem; -}; diff --git a/SoundArranger/StdAfx.cpp b/SoundArranger/StdAfx.cpp deleted file mode 100644 index 5a73766f..00000000 --- a/SoundArranger/StdAfx.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// SoundArranger.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - - - diff --git a/SoundArranger/StdAfx.h b/SoundArranger/StdAfx.h deleted file mode 100644 index 40cada03..00000000 --- a/SoundArranger/StdAfx.h +++ /dev/null @@ -1,43 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#if !defined(AFX_STDAFX_H__C90865C1_9498_4EA0_91AC_54CF78198D01__INCLUDED_) -#define AFX_STDAFX_H__C90865C1_9498_4EA0_91AC_54CF78198D01__INCLUDED_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - -#pragma warning(disable:4503) - -#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers - -#include // MFC core and standard components -#include // MFC extensions -#include // MFC Automation classes -#include // MFC support for Internet Explorer 4 Common Controls -#ifndef _AFX_NO_AFXCMN_SUPPORT -#include // MFC support for Windows Common Controls -#endif // _AFX_NO_AFXCMN_SUPPORT - -#include "../EterLib/StdAfx.h" -#include "../EterGrnLib/StdAfx.h" -#include "../GameLib/StdAfx.h" -#include "../ScriptLib/StdAfx.h" -#include "../milesLib/StdAfx.h" - -#include "UI_DockingBar/sizecbar.h" -#include "UI_DockingBar/scbarg.h" -#include "UI_DockingBar/scbarcf.h" -#include "UI_ToolBar/TrueColorToolBar.h" -#include "PageCtrl.h" - -#include "Resource.h" -#include "Util.h" - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__C90865C1_9498_4EA0_91AC_54CF78198D01__INCLUDED_) diff --git a/SoundArranger/UI_DockingBar/scbarcf.cpp b/SoundArranger/UI_DockingBar/scbarcf.cpp deleted file mode 100644 index b1ed446d..00000000 --- a/SoundArranger/UI_DockingBar/scbarcf.cpp +++ /dev/null @@ -1,234 +0,0 @@ -///////////////////////////////////////////////////////////////////////// -// -// CSizingControlBarCF Version 2.43 -// -// Created: Dec 21, 1998 Last Modified: August 03, 2000 -// -// See the official site at www.datamekanix.com for documentation and -// the latest news. -// -///////////////////////////////////////////////////////////////////////// -// Copyright (C) 1998-2000 by Cristi Posea. All rights reserved. -// -// This code is free for personal and commercial use, providing this -// notice remains intact in the source files and all eventual changes are -// clearly marked with comments. -// -// You must obtain the author's consent before you can include this code -// in a software library. -// -// No warrantee of any kind, express or implied, is included with this -// software; use at your own risk, responsibility for damages (if any) to -// anyone resulting from the use of this software rests entirely with the -// user. -// -// Send bug reports, bug fixes, enhancements, requests, flames, etc. to -// cristi@datamekanix.com or post them at the message board at the site. -///////////////////////////////////////////////////////////////////////// - -#include -#include "scbarcf.h" - -///////////////////////////////////////////////////////////////////////// -// CSizingControlBarCF - -IMPLEMENT_DYNAMIC(CSizingControlBarCF, baseCSizingControlBarCF); - -int CALLBACK EnumFontFamProc(ENUMLOGFONT FAR *lpelf, - NEWTEXTMETRIC FAR *lpntm, - int FontType, - LPARAM lParam) -{ - UNUSED_ALWAYS(lpelf); - UNUSED_ALWAYS(lpntm); - UNUSED_ALWAYS(FontType); - UNUSED_ALWAYS(lParam); - - return 0; -} - -CSizingControlBarCF::CSizingControlBarCF() -{ - m_bActive = FALSE; - - CDC dc; - dc.CreateCompatibleDC(NULL); - - m_sFontFace = (::EnumFontFamilies(dc.m_hDC, - _T("Tahoma"), (FONTENUMPROC) EnumFontFamProc, 0) == 0) ? - _T("Tahoma") : _T("Arial"); - - dc.DeleteDC(); - -} - -BEGIN_MESSAGE_MAP(CSizingControlBarCF, baseCSizingControlBarCF) - //{{AFX_MSG_MAP(CSizingControlBarCF) - //}}AFX_MSG_MAP - ON_MESSAGE(WM_SETTEXT, OnSetText) -END_MESSAGE_MAP() - -void CSizingControlBarCF::OnUpdateCmdUI(CFrameWnd* pTarget, BOOL bDisableIfNoHndler) -{ - baseCSizingControlBarCF::OnUpdateCmdUI(pTarget, bDisableIfNoHndler); - - if (!HasGripper()) - return; - - BOOL bNeedPaint = FALSE; - - CWnd* pFocus = GetFocus(); - BOOL bActiveOld = m_bActive; - - m_bActive = (pFocus->GetSafeHwnd() && IsChild(pFocus)); - - if (m_bActive != bActiveOld) - bNeedPaint = TRUE; - - if (bNeedPaint) - SendMessage(WM_NCPAINT); -} - -// gradient defines (if not already defined) -#ifndef COLOR_GRADIENTACTIVECAPTION -#define COLOR_GRADIENTACTIVECAPTION 27 -#define COLOR_GRADIENTINACTIVECAPTION 28 -#define SPI_GETGRADIENTCAPTIONS 0x1008 -#endif - -void CSizingControlBarCF::NcPaintGripper(CDC* pDC, CRect rcClient) -{ - if (!HasGripper()) - return; - - // compute the caption rectangle - BOOL bHorz = IsHorzDocked(); - CRect rcGrip = rcClient; - CRect rcBtn = m_biHide.GetRect(); - if (bHorz) - { // right side gripper - rcGrip.left -= m_cyGripper + 1; - rcGrip.right = rcGrip.left + 11; - rcGrip.top = rcBtn.bottom + 3; - } - else - { // gripper at top - rcGrip.top -= m_cyGripper + 1; - rcGrip.bottom = rcGrip.top + 11; - rcGrip.right = rcBtn.left - 3; - } - rcGrip.InflateRect(bHorz ? 1 : 0, bHorz ? 0 : 1); - - // draw the caption background - //CBrush br; - COLORREF clrCptn = m_bActive ? - ::GetSysColor(COLOR_ACTIVECAPTION) : - ::GetSysColor(COLOR_INACTIVECAPTION); - - // query gradient info (usually TRUE for Win98/Win2k) - BOOL bGradient = FALSE; - ::SystemParametersInfo(SPI_GETGRADIENTCAPTIONS, 0, &bGradient, 0); - - if (!bGradient) - pDC->FillSolidRect(&rcGrip, clrCptn); // solid color - else - { - // gradient from left to right or from bottom to top - // get second gradient color (the right end) - COLORREF clrCptnRight = m_bActive ? - ::GetSysColor(COLOR_GRADIENTACTIVECAPTION) : - ::GetSysColor(COLOR_GRADIENTINACTIVECAPTION); - - // this will make 2^6 = 64 fountain steps - int nShift = 6; - int nSteps = 1 << nShift; - - for (int i = 0; i < nSteps; i++) - { - // do a little alpha blending - int nR = (GetRValue(clrCptn) * (nSteps - i) + - GetRValue(clrCptnRight) * i) >> nShift; - int nG = (GetGValue(clrCptn) * (nSteps - i) + - GetGValue(clrCptnRight) * i) >> nShift; - int nB = (GetBValue(clrCptn) * (nSteps - i) + - GetBValue(clrCptnRight) * i) >> nShift; - - COLORREF cr = RGB(nR, nG, nB); - - // then paint with the resulting color - CRect r2 = rcGrip; - if (bHorz) - { - r2.bottom = rcGrip.bottom - - ((i * rcGrip.Height()) >> nShift); - r2.top = rcGrip.bottom - - (((i + 1) * rcGrip.Height()) >> nShift); - if (r2.Height() > 0) - pDC->FillSolidRect(r2, cr); - } - else - { - r2.left = rcGrip.left + - ((i * rcGrip.Width()) >> nShift); - r2.right = rcGrip.left + - (((i + 1) * rcGrip.Width()) >> nShift); - if (r2.Width() > 0) - pDC->FillSolidRect(r2, cr); - } - } - } - - // draw the caption text - first select a font - CFont font; - int ppi = pDC->GetDeviceCaps(LOGPIXELSX); - int pointsize = MulDiv(85, 96, ppi); // 8.5 points at 96 ppi - - LOGFONT lf; - BOOL bFont = font.CreatePointFont(pointsize, m_sFontFace); - if (bFont) - { - // get the text color - COLORREF clrCptnText = m_bActive ? - ::GetSysColor(COLOR_CAPTIONTEXT) : - ::GetSysColor(COLOR_INACTIVECAPTIONTEXT); - - int nOldBkMode = pDC->SetBkMode(TRANSPARENT); - COLORREF clrOldText = pDC->SetTextColor(clrCptnText); - - if (bHorz) - { - // rotate text 90 degrees CCW if horizontally docked - font.GetLogFont(&lf); - font.DeleteObject(); - lf.lfEscapement = 900; - font.CreateFontIndirect(&lf); - } - - CFont* pOldFont = pDC->SelectObject(&font); - CString sTitle; - GetWindowText(sTitle); - - CPoint ptOrg = bHorz ? - CPoint(rcGrip.left - 1, rcGrip.bottom - 3) : - CPoint(rcGrip.left + 3, rcGrip.top - 1); - - pDC->ExtTextOut(ptOrg.x, ptOrg.y, - ETO_CLIPPED, rcGrip, sTitle, NULL); - - pDC->SelectObject(pOldFont); - pDC->SetBkMode(nOldBkMode); - pDC->SetTextColor(clrOldText); - } - - // draw the button - m_biHide.Paint(pDC); -} - -LRESULT CSizingControlBarCF::OnSetText(WPARAM wParam, LPARAM lParam) -{ - LRESULT lResult = baseCSizingControlBarCF::OnSetText(wParam, lParam); - - SendMessage(WM_NCPAINT); - - return lResult; -} diff --git a/SoundArranger/UI_DockingBar/scbarcf.h b/SoundArranger/UI_DockingBar/scbarcf.h deleted file mode 100644 index eee83ad9..00000000 --- a/SoundArranger/UI_DockingBar/scbarcf.h +++ /dev/null @@ -1,76 +0,0 @@ -///////////////////////////////////////////////////////////////////////// -// -// CSizingControlBarCF Version 2.43 -// -// Created: Dec 21, 1998 Last Modified: August 03, 2000 -// -// See the official site at www.datamekanix.com for documentation and -// the latest news. -// -///////////////////////////////////////////////////////////////////////// -// Copyright (C) 1998-2000 by Cristi Posea. All rights reserved. -// -// This code is free for personal and commercial use, providing this -// notice remains intact in the source files and all eventual changes are -// clearly marked with comments. -// -// You must obtain the author's consent before you can include this code -// in a software library. -// -// No warrantee of any kind, express or implied, is included with this -// software; use at your own risk, responsibility for damages (if any) to -// anyone resulting from the use of this software rests entirely with the -// user. -// -// Send bug reports, bug fixes, enhancements, requests, flames, etc. to -// cristi@datamekanix.com or post them at the message board at the site. -///////////////////////////////////////////////////////////////////////// - -#if !defined(__SCBARCF_H__) -#define __SCBARCF_H__ - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 -// scbarcf.h : header file -// - -///////////////////////////////////////////////////////////////////////// -// CSizingControlBarCF - -#ifndef baseCSizingControlBarCF -#define baseCSizingControlBarCF CSizingControlBarG -#endif - -class CSizingControlBarCF : public baseCSizingControlBarCF -{ - DECLARE_DYNAMIC(CSizingControlBarCF) - -// Construction -public: - CSizingControlBarCF(); - -// Overridables - virtual void OnUpdateCmdUI(CFrameWnd* pTarget, BOOL bDisableIfNoHndler); - -// Implementation -protected: - // implementation helpers - virtual void NcPaintGripper(CDC* pDC, CRect rcClient); - -protected: - BOOL m_bActive; // a child has focus - CString m_sFontFace; - -// Generated message map functions -protected: - //{{AFX_MSG(CSizingControlBarCF) - //}}AFX_MSG - afx_msg LRESULT OnSetText(WPARAM wParam, LPARAM lParam); - - DECLARE_MESSAGE_MAP() -}; - -///////////////////////////////////////////////////////////////////////// - -#endif // !defined(__SCBARCF_H__) diff --git a/SoundArranger/UI_DockingBar/scbarg.cpp b/SoundArranger/UI_DockingBar/scbarg.cpp deleted file mode 100644 index 19eba8be..00000000 --- a/SoundArranger/UI_DockingBar/scbarg.cpp +++ /dev/null @@ -1,240 +0,0 @@ -///////////////////////////////////////////////////////////////////////// -// -// CSizingControlBarG Version 2.43 -// -// Created: Jan 24, 1998 Last Modified: August 03, 2000 -// -// See the official site at www.datamekanix.com for documentation and -// the latest news. -// -///////////////////////////////////////////////////////////////////////// -// Copyright (C) 1998-2000 by Cristi Posea. All rights reserved. -// -// This code is free for personal and commercial use, providing this -// notice remains intact in the source files and all eventual changes are -// clearly marked with comments. -// -// You must obtain the author's consent before you can include this code -// in a software library. -// -// No warrantee of any kind, express or implied, is included with this -// software; use at your own risk, responsibility for damages (if any) to -// anyone resulting from the use of this software rests entirely with the -// user. -// -// Send bug reports, bug fixes, enhancements, requests, flames, etc. to -// cristi@datamekanix.com or post them at the message board at the site. -///////////////////////////////////////////////////////////////////////// - -// sizecbar.cpp : implementation file -// - -#include "stdafx.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////// -// CSizingControlBarG - -IMPLEMENT_DYNAMIC(CSizingControlBarG, baseCSizingControlBarG); - -CSizingControlBarG::CSizingControlBarG() -{ - m_cyGripper = 12; -} - -CSizingControlBarG::~CSizingControlBarG() -{ -} - -BEGIN_MESSAGE_MAP(CSizingControlBarG, baseCSizingControlBarG) - //{{AFX_MSG_MAP(CSizingControlBarG) - ON_WM_NCLBUTTONUP() - ON_WM_NCHITTEST() - //}}AFX_MSG_MAP - ON_MESSAGE(WM_SETTEXT, OnSetText) -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////// -// CSizingControlBarG message handlers - -///////////////////////////////////////////////////////////////////////// -// Mouse Handling -// - -void CSizingControlBarG::OnNcLButtonUp(UINT nHitTest, CPoint point) -{ - if (nHitTest == HTCLOSE) - m_pDockSite->ShowControlBar(this, FALSE, FALSE); // hide - - baseCSizingControlBarG::OnNcLButtonUp(nHitTest, point); -} - -void CSizingControlBarG::NcCalcClient(LPRECT pRc, UINT nDockBarID) -{ - CRect rcBar(pRc); // save the bar rect - - // subtract edges - baseCSizingControlBarG::NcCalcClient(pRc, nDockBarID); - - if (!HasGripper()) - return; - - CRect rc(pRc); // the client rect as calculated by the base class - - BOOL bHorz = (nDockBarID == AFX_IDW_DOCKBAR_TOP) || - (nDockBarID == AFX_IDW_DOCKBAR_BOTTOM); - - if (bHorz) - rc.DeflateRect(m_cyGripper, 0, 0, 0); - else - rc.DeflateRect(0, m_cyGripper, 0, 0); - - // set position for the "x" (hide bar) button - CPoint ptOrgBtn; - if (bHorz) - ptOrgBtn = CPoint(rc.left - 13, rc.top); - else - ptOrgBtn = CPoint(rc.right - 12, rc.top - 13); - - m_biHide.Move(ptOrgBtn - rcBar.TopLeft()); - - *pRc = rc; -} - -void CSizingControlBarG::NcPaintGripper(CDC* pDC, CRect rcClient) -{ - if (!HasGripper()) - return; - - // paints a simple "two raised lines" gripper - // override this if you want a more sophisticated gripper - CRect gripper = rcClient; - CRect rcbtn = m_biHide.GetRect(); - BOOL bHorz = IsHorzDocked(); - - gripper.DeflateRect(1, 1); - if (bHorz) - { // gripper at left - gripper.left -= m_cyGripper; - gripper.right = gripper.left + 3; - gripper.top = rcbtn.bottom + 3; - } - else - { // gripper at top - gripper.top -= m_cyGripper; - gripper.bottom = gripper.top + 3; - gripper.right = rcbtn.left - 3; - } - - pDC->Draw3dRect(gripper, ::GetSysColor(COLOR_BTNHIGHLIGHT), - ::GetSysColor(COLOR_BTNSHADOW)); - - gripper.OffsetRect(bHorz ? 3 : 0, bHorz ? 0 : 3); - - pDC->Draw3dRect(gripper, ::GetSysColor(COLOR_BTNHIGHLIGHT), - ::GetSysColor(COLOR_BTNSHADOW)); - - m_biHide.Paint(pDC); -} - -LRESULT CSizingControlBarG::OnNcHitTest(CPoint point) -{ - CRect rcBar; - GetWindowRect(rcBar); - - UINT nRet = baseCSizingControlBarG::OnNcHitTest(point); - if (nRet != HTCLIENT) - return nRet; - - CRect rc = m_biHide.GetRect(); - rc.OffsetRect(rcBar.TopLeft()); - if (rc.PtInRect(point)) - return HTCLOSE; - - return HTCLIENT; -} - -///////////////////////////////////////////////////////////////////////// -// CSizingControlBarG implementation helpers - -void CSizingControlBarG::OnUpdateCmdUI(CFrameWnd* pTarget, - BOOL bDisableIfNoHndler) -{ - UNUSED_ALWAYS(bDisableIfNoHndler); - UNUSED_ALWAYS(pTarget); - - if (!HasGripper()) - return; - - BOOL bNeedPaint = FALSE; - - CPoint pt; - ::GetCursorPos(&pt); - BOOL bHit = (OnNcHitTest(pt) == HTCLOSE); - BOOL bLButtonDown = (::GetKeyState(VK_LBUTTON) < 0); - - BOOL bWasPushed = m_biHide.bPushed; - m_biHide.bPushed = bHit && bLButtonDown; - - BOOL bWasRaised = m_biHide.bRaised; - m_biHide.bRaised = bHit && !bLButtonDown; - - bNeedPaint |= (m_biHide.bPushed ^ bWasPushed) || - (m_biHide.bRaised ^ bWasRaised); - - if (bNeedPaint) - SendMessage(WM_NCPAINT); -} - -///////////////////////////////////////////////////////////////////////// -// CSCBButton - -CSCBButton::CSCBButton() -{ - bRaised = FALSE; - bPushed = FALSE; -} - -void CSCBButton::Paint(CDC* pDC) -{ - CRect rc = GetRect(); - - if (bPushed) - pDC->Draw3dRect(rc, ::GetSysColor(COLOR_BTNSHADOW), - ::GetSysColor(COLOR_BTNHIGHLIGHT)); - else - if (bRaised) - pDC->Draw3dRect(rc, ::GetSysColor(COLOR_BTNHIGHLIGHT), - ::GetSysColor(COLOR_BTNSHADOW)); - - COLORREF clrOldTextColor = pDC->GetTextColor(); - pDC->SetTextColor(::GetSysColor(COLOR_BTNTEXT)); - int nPrevBkMode = pDC->SetBkMode(TRANSPARENT); - CFont font; - int ppi = pDC->GetDeviceCaps(LOGPIXELSX); - int pointsize = MulDiv(60, 96, ppi); // 6 points at 96 ppi - font.CreatePointFont(pointsize, _T("Marlett")); - CFont* oldfont = pDC->SelectObject(&font); - - pDC->TextOut(ptOrg.x + 2, ptOrg.y + 2, CString(_T("r"))); // x-like - - pDC->SelectObject(oldfont); - pDC->SetBkMode(nPrevBkMode); - pDC->SetTextColor(clrOldTextColor); -} - -BOOL CSizingControlBarG::HasGripper() const -{ -#if defined(_SCB_MINIFRAME_CAPTION) || !defined(_SCB_REPLACE_MINIFRAME) - // if the miniframe has a caption, don't display the gripper - if (IsFloating()) - return FALSE; -#endif //_SCB_MINIFRAME_CAPTION - - return TRUE; -} \ No newline at end of file diff --git a/SoundArranger/UI_DockingBar/scbarg.h b/SoundArranger/UI_DockingBar/scbarg.h deleted file mode 100644 index 26a56265..00000000 --- a/SoundArranger/UI_DockingBar/scbarg.h +++ /dev/null @@ -1,111 +0,0 @@ -///////////////////////////////////////////////////////////////////////// -// -// CSizingControlBarG Version 2.43 -// -// Created: Jan 24, 1998 Last Modified: August 03, 2000 -// -// See the official site at www.datamekanix.com for documentation and -// the latest news. -// -///////////////////////////////////////////////////////////////////////// -// Copyright (C) 1998-2000 by Cristi Posea. All rights reserved. -// -// This code is free for personal and commercial use, providing this -// notice remains intact in the source files and all eventual changes are -// clearly marked with comments. -// -// You must obtain the author's consent before you can include this code -// in a software library. -// -// No warrantee of any kind, express or implied, is included with this -// software; use at your own risk, responsibility for damages (if any) to -// anyone resulting from the use of this software rests entirely with the -// user. -// -// Send bug reports, bug fixes, enhancements, requests, flames, etc. to -// cristi@datamekanix.com or post them at the message board at the site. -///////////////////////////////////////////////////////////////////////// - -#if !defined(__SCBARG_H__) -#define __SCBARG_H__ - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 - -///////////////////////////////////////////////////////////////////////// -// CSCBButton (button info) helper class - -class CSCBButton -{ -public: - CSCBButton(); - - void Move(CPoint ptTo) {ptOrg = ptTo; }; - CRect GetRect() { return CRect(ptOrg, CSize(11, 11)); }; - void Paint(CDC* pDC); - - BOOL bPushed; - BOOL bRaised; - -protected: - CPoint ptOrg; -}; - -///////////////////////////////////////////////////////////////////////// -// CSizingControlBar control bar - -#ifndef baseCSizingControlBarG -#define baseCSizingControlBarG CSizingControlBar -#endif - -class CSizingControlBarG : public baseCSizingControlBarG -{ - DECLARE_DYNAMIC(CSizingControlBarG); - -// Construction -public: - CSizingControlBarG(); - -// Attributes -public: - virtual BOOL HasGripper() const; - -// Operations -public: - -// Overridables - virtual void OnUpdateCmdUI(CFrameWnd* pTarget, BOOL bDisableIfNoHndler); - -// Overrides -public: - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CSizingControlBarG) - //}}AFX_VIRTUAL - -// Implementation -public: - virtual ~CSizingControlBarG(); - -protected: - // implementation helpers - virtual void NcPaintGripper(CDC* pDC, CRect rcClient); - virtual void NcCalcClient(LPRECT pRc, UINT nDockBarID); - -protected: - int m_cyGripper; - - CSCBButton m_biHide; - -// Generated message map functions -protected: - //{{AFX_MSG(CSizingControlBarG) - afx_msg LRESULT OnNcHitTest(CPoint point); - afx_msg void OnNcLButtonUp(UINT nHitTest, CPoint point); - //}}AFX_MSG - - DECLARE_MESSAGE_MAP() -}; - -#endif // !defined(__SCBARG_H__) - diff --git a/SoundArranger/UI_DockingBar/sizecbar.cpp b/SoundArranger/UI_DockingBar/sizecbar.cpp deleted file mode 100644 index e1a7bc6d..00000000 --- a/SoundArranger/UI_DockingBar/sizecbar.cpp +++ /dev/null @@ -1,1412 +0,0 @@ -///////////////////////////////////////////////////////////////////////// -// -// CSizingControlBar Version 2.43 -// -// Created: Jan 24, 1998 Last Modified: August 03, 2000 -// -// See the official site at www.datamekanix.com for documentation and -// the latest news. -// -///////////////////////////////////////////////////////////////////////// -// Copyright (C) 1998-2000 by Cristi Posea. All rights reserved. -// -// This code is free for personal and commercial use, providing this -// notice remains intact in the source files and all eventual changes are -// clearly marked with comments. -// -// You must obtain the author's consent before you can include this code -// in a software library. -// -// No warrantee of any kind, express or implied, is included with this -// software; use at your own risk, responsibility for damages (if any) to -// anyone resulting from the use of this software rests entirely with the -// user. -// -// Send bug reports, bug fixes, enhancements, requests, flames, etc. to -// cristi@datamekanix.com or post them at the message board at the site. -// -// The sources and a short version of the docs are also available at -// www.codeproject.com . Look for a "Docking Windows" section and check -// the version to be sure you get the latest one ;) -// -// Hint: These classes are intended to be used as base classes. Do not -// simply add your code to these file - instead create a new class -// derived from one of CSizingControlBarXX classes and put there what -// you need. See CMyBar classes in the demo projects for examples. -// Modify this file only to fix bugs, and don't forget to send me a copy. -///////////////////////////////////////////////////////////////////////// -// Acknowledgements: -// o Thanks to Harlan R. Seymour for his continuous support during -// development of this code. -// o Thanks to Dundas Software for the opportunity -// to test this code on real-life applications. -// o Some ideas for the gripper came from the CToolBarEx flat toolbar -// by Joerg Koenig. Thanks, Joerg! -// o Thanks to Robert Wolpow for the code on which CDockContext based -// dialgonal resizing is based. -// o Thanks to the following people for various bug fixes and/or -// enhancements: Chris Maunder, Jakawan Ratiwanich, Udo Schaefer, -// Anatoly Ivasyuk, Peter Hauptmann. -// o And, of course, many thanks to all of you who used this code, -// for the invaluable feedback I received. -///////////////////////////////////////////////////////////////////////// - -// sizecbar.cpp : implementation file -// - -#include "stdafx.h" -#include "sizecbar.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////// -// CSizingControlBar - -IMPLEMENT_DYNAMIC(CSizingControlBar, baseCSizingControlBar); - -CSizingControlBar::CSizingControlBar() -{ - m_szMinHorz = CSize(33, 32); - m_szMinVert = CSize(33, 32); - m_szMinFloat = CSize(37, 32); - m_szHorz = CSize(200, 200); - m_szVert = CSize(200, 200); - m_szFloat = CSize(200, 200); - m_bTracking = FALSE; - m_bKeepSize = FALSE; - m_bParentSizing = FALSE; - m_cxEdge = 5; - m_bDragShowContent = FALSE; - m_nDockBarID = 0; - m_dwSCBStyle = 0; -} - -CSizingControlBar::~CSizingControlBar() -{ -} - -BEGIN_MESSAGE_MAP(CSizingControlBar, baseCSizingControlBar) - //{{AFX_MSG_MAP(CSizingControlBar) - ON_WM_CREATE() - ON_WM_PAINT() - ON_WM_NCPAINT() - ON_WM_NCCALCSIZE() - ON_WM_WINDOWPOSCHANGING() - ON_WM_CAPTURECHANGED() - ON_WM_SETTINGCHANGE() - ON_WM_LBUTTONUP() - ON_WM_MOUSEMOVE() - ON_WM_NCLBUTTONDOWN() - ON_WM_LBUTTONDOWN() - ON_WM_LBUTTONDBLCLK() - ON_WM_RBUTTONDOWN() - ON_WM_NCMOUSEMOVE() - ON_WM_NCHITTEST() - ON_WM_CLOSE() - ON_WM_SIZE() - //}}AFX_MSG_MAP - ON_MESSAGE(WM_SETTEXT, OnSetText) -END_MESSAGE_MAP() - -// old creation method, still here for compatibility reasons -BOOL CSizingControlBar::Create(LPCTSTR lpszWindowName, CWnd* pParentWnd, - CSize sizeDefault, BOOL bHasGripper, - UINT nID, DWORD dwStyle) -{ - UNUSED_ALWAYS(bHasGripper); - - m_szHorz = m_szVert = m_szFloat = sizeDefault; - return Create(lpszWindowName, pParentWnd, nID, dwStyle); -} - -// preffered creation method -BOOL CSizingControlBar::Create(LPCTSTR lpszWindowName, - CWnd* pParentWnd, UINT nID, - DWORD dwStyle) -{ - // must have a parent - ASSERT_VALID(pParentWnd); - // cannot be both fixed and dynamic - // (CBRS_SIZE_DYNAMIC is used for resizng when floating) - ASSERT (!((dwStyle & CBRS_SIZE_FIXED) && - (dwStyle & CBRS_SIZE_DYNAMIC))); - - m_dwStyle = dwStyle & CBRS_ALL; // save the control bar styles - - // register and create the window - skip CControlBar::Create() - CString wndclass = ::AfxRegisterWndClass(CS_DBLCLKS, - ::LoadCursor(NULL, IDC_ARROW), - ::GetSysColorBrush(COLOR_BTNFACE), 0); - - dwStyle &= ~CBRS_ALL; // keep only the generic window styles - dwStyle |= WS_CLIPCHILDREN; // prevents flashing - - if (!CWnd::Create(wndclass, lpszWindowName, dwStyle, - CRect(0, 0, 0, 0), pParentWnd, nID)) - return FALSE; - - return TRUE; -} - -///////////////////////////////////////////////////////////////////////// -// CSizingControlBar operations -#if defined(_SCB_REPLACE_MINIFRAME) && !defined(_SCB_MINIFRAME_CAPTION) -void CSizingControlBar::EnableDocking(DWORD dwDockStyle) -{ - // must be CBRS_ALIGN_XXX or CBRS_FLOAT_MULTI only - ASSERT((dwDockStyle & ~(CBRS_ALIGN_ANY|CBRS_FLOAT_MULTI)) == 0); - // cannot have the CBRS_FLOAT_MULTI style - ASSERT((dwDockStyle & CBRS_FLOAT_MULTI) == 0); - // the bar must have CBRS_SIZE_DYNAMIC style - ASSERT((m_dwStyle & CBRS_SIZE_DYNAMIC) != 0); - - m_dwDockStyle = dwDockStyle; - if (m_pDockContext == NULL) - m_pDockContext = new CSCBDockContext(this); - - // permanently wire the bar's owner to its current parent - if (m_hWndOwner == NULL) - m_hWndOwner = ::GetParent(m_hWnd); -} -#endif - -///////////////////////////////////////////////////////////////////////// -// CSizingControlBar message handlers - -int CSizingControlBar::OnCreate(LPCREATESTRUCT lpCreateStruct) -{ - if (baseCSizingControlBar::OnCreate(lpCreateStruct) == -1) - return -1; - - // query SPI_GETDRAGFULLWINDOWS system parameter - // OnSettingChange() will update m_bDragShowContent - m_bDragShowContent = FALSE; - ::SystemParametersInfo(SPI_GETDRAGFULLWINDOWS, 0, - &m_bDragShowContent, 0); - - // uncomment this line if you want raised borders -// m_dwSCBStyle |= SCBS_SHOWEDGES; - - return 0; -} - - -LRESULT CSizingControlBar::OnSetText(WPARAM wParam, LPARAM lParam) -{ - UNUSED_ALWAYS(wParam); - - LRESULT lResult = CWnd::Default(); - - if (IsFloating() && - GetParentFrame()->IsKindOf(RUNTIME_CLASS(CMiniDockFrameWnd))) - { - m_pDockBar->SetWindowText((LPCTSTR) lParam); // update dockbar - GetParentFrame()->DelayRecalcLayout(); // refresh miniframe - } - - return lResult; -} - -const BOOL CSizingControlBar::IsFloating() const -{ - return !IsHorzDocked() && !IsVertDocked(); -} - -const BOOL CSizingControlBar::IsHorzDocked() const -{ - return (m_nDockBarID == AFX_IDW_DOCKBAR_TOP || - m_nDockBarID == AFX_IDW_DOCKBAR_BOTTOM); -} - -const BOOL CSizingControlBar::IsVertDocked() const -{ - return (m_nDockBarID == AFX_IDW_DOCKBAR_LEFT || - m_nDockBarID == AFX_IDW_DOCKBAR_RIGHT); -} - -const BOOL CSizingControlBar::IsSideTracking() const -{ - // don't call this when not tracking - ASSERT(m_bTracking && !IsFloating()); - - return (m_htEdge == HTLEFT || m_htEdge == HTRIGHT) ? - IsHorzDocked() : IsVertDocked(); -} - -CSize CSizingControlBar::CalcFixedLayout(BOOL bStretch, BOOL bHorz) -{ - if (bStretch) // the bar is stretched (is not the child of a dockbar) - if (bHorz) - return CSize(32767, m_szHorz.cy); - else - return CSize(m_szVert.cx, 32767); - - // dirty cast - we need access to protected CDockBar members - CSCBDockBar* pDockBar = (CSCBDockBar*) m_pDockBar; - - // force imediate RecalcDelayShow() for all sizing bars on the row - // with delayShow/delayHide flags set to avoid IsVisible() problems - CSCBArray arrSCBars; - GetRowSizingBars(arrSCBars); - AFX_SIZEPARENTPARAMS layout; - layout.hDWP = pDockBar->m_bLayoutQuery ? - NULL : ::BeginDeferWindowPos(arrSCBars.GetSize()); - for (int i = 0; i < arrSCBars.GetSize(); i++) - if (arrSCBars[i]->m_nStateFlags & (delayHide|delayShow)) - arrSCBars[i]->RecalcDelayShow(&layout); - if (layout.hDWP != NULL) - ::EndDeferWindowPos(layout.hDWP); - - // get available length - CRect rc = pDockBar->m_rectLayout; - if (rc.IsRectEmpty()) - m_pDockSite->GetClientRect(&rc); - int nLengthTotal = bHorz ? rc.Width() + 2 : rc.Height() - 2; - - if (IsVisible() && !IsFloating() && - m_bParentSizing && arrSCBars[0] == this) - if (NegotiateSpace(nLengthTotal, (bHorz != FALSE))) - AlignControlBars(); - - m_bParentSizing = FALSE; - - if (bHorz) - return CSize(max(m_szMinHorz.cx, m_szHorz.cx), - max(m_szMinHorz.cy, m_szHorz.cy)); - - return CSize(max(m_szMinVert.cx, m_szVert.cx), - max(m_szMinVert.cy, m_szVert.cy)); -} - -CSize CSizingControlBar::CalcDynamicLayout(int nLength, DWORD dwMode) -{ - if (dwMode & (LM_HORZDOCK | LM_VERTDOCK)) // docked ? - { - if (nLength == -1) - m_bParentSizing = TRUE; - - return baseCSizingControlBar::CalcDynamicLayout(nLength, dwMode); - } - - if (dwMode & LM_MRUWIDTH) return m_szFloat; - if (dwMode & LM_COMMIT) return m_szFloat; // already committed - -#ifndef _SCB_REPLACE_MINIFRAME - // check for dialgonal resizing hit test - int nHitTest = m_pDockContext->m_nHitTest; - if (IsFloating() && - (nHitTest == HTTOPLEFT || nHitTest == HTBOTTOMLEFT || - nHitTest == HTTOPRIGHT || nHitTest == HTBOTTOMRIGHT)) - { - CPoint ptCursor; - ::GetCursorPos(&ptCursor); - - CRect rFrame, rBar; - GetParentFrame()->GetWindowRect(&rFrame); - GetWindowRect(&rBar); - - if (nHitTest == HTTOPLEFT || nHitTest == HTBOTTOMLEFT) - { - m_szFloat.cx = rFrame.left + rBar.Width() - ptCursor.x; - m_pDockContext->m_rectFrameDragHorz.left = - min(ptCursor.x, rFrame.left + rBar.Width() - m_szMinFloat.cx); - } - - if (nHitTest == HTTOPLEFT || nHitTest == HTTOPRIGHT) - { - m_szFloat.cy = rFrame.top + rBar.Height() - ptCursor.y; - m_pDockContext->m_rectFrameDragHorz.top = - min(ptCursor.y, rFrame.top + rBar.Height() - m_szMinFloat.cy); - } - - if (nHitTest == HTTOPRIGHT || nHitTest == HTBOTTOMRIGHT) - m_szFloat.cx = rBar.Width() + ptCursor.x - rFrame.right; - - if (nHitTest == HTBOTTOMLEFT || nHitTest == HTBOTTOMRIGHT) - m_szFloat.cy = rBar.Height() + ptCursor.y - rFrame.bottom; - } - else -#endif //_SCB_REPLACE_MINIFRAME - ((dwMode & LM_LENGTHY) ? m_szFloat.cy : m_szFloat.cx) = nLength; - - m_szFloat.cx = max(m_szFloat.cx, m_szMinFloat.cx); - m_szFloat.cy = max(m_szFloat.cy, m_szMinFloat.cy); - - return m_szFloat; -} - -void CSizingControlBar::OnWindowPosChanging(WINDOWPOS FAR* lpwndpos) -{ - // force non-client recalc if moved or resized - lpwndpos->flags |= SWP_FRAMECHANGED; - - baseCSizingControlBar::OnWindowPosChanging(lpwndpos); - - // find on which side are we docked - m_nDockBarID = GetParent()->GetDlgCtrlID(); - - if (!IsFloating()) - if (lpwndpos->flags & SWP_SHOWWINDOW) - m_bKeepSize = TRUE; -} - -///////////////////////////////////////////////////////////////////////// -// Mouse Handling -// -void CSizingControlBar::OnLButtonDown(UINT nFlags, CPoint point) -{ - if (m_pDockBar != NULL) - { - // start the drag - ASSERT(m_pDockContext != NULL); - ClientToScreen(&point); - m_pDockContext->StartDrag(point); - } - else - CWnd::OnLButtonDown(nFlags, point); -} - -void CSizingControlBar::OnLButtonDblClk(UINT nFlags, CPoint point) -{ - if (m_pDockBar != NULL) - { - // toggle docking - ASSERT(m_pDockContext != NULL); - m_pDockContext->ToggleDocking(); - } - else - CWnd::OnLButtonDblClk(nFlags, point); -} - -void CSizingControlBar::OnNcLButtonDown(UINT nHitTest, CPoint point) -{ - UNUSED_ALWAYS(point); - - if (m_bTracking || IsFloating()) - return; - - if ((nHitTest >= HTSIZEFIRST) && (nHitTest <= HTSIZELAST)) - StartTracking(nHitTest, point); // sizing edge hit -} - -void CSizingControlBar::OnLButtonUp(UINT nFlags, CPoint point) -{ - if (m_bTracking) - StopTracking(); - - baseCSizingControlBar::OnLButtonUp(nFlags, point); -} - -void CSizingControlBar::OnRButtonDown(UINT nFlags, CPoint point) -{ - if (m_bTracking) - StopTracking(); - - baseCSizingControlBar::OnRButtonDown(nFlags, point); -} - -void CSizingControlBar::OnMouseMove(UINT nFlags, CPoint point) -{ - if (m_bTracking) - { - CPoint ptScreen = point; - ClientToScreen(&ptScreen); - - OnTrackUpdateSize(ptScreen); - } - - baseCSizingControlBar::OnMouseMove(nFlags, point); -} - -void CSizingControlBar::OnCaptureChanged(CWnd *pWnd) -{ - if (m_bTracking && (pWnd != this)) - StopTracking(); - - baseCSizingControlBar::OnCaptureChanged(pWnd); -} - -void CSizingControlBar::OnNcCalcSize(BOOL bCalcValidRects, - NCCALCSIZE_PARAMS FAR* lpncsp) -{ - UNUSED_ALWAYS(bCalcValidRects); - -#ifndef _SCB_REPLACE_MINIFRAME - // Enable diagonal resizing for floating miniframe - if (IsFloating()) - { - CFrameWnd* pFrame = GetParentFrame(); - if (pFrame != NULL && - pFrame->IsKindOf(RUNTIME_CLASS(CMiniFrameWnd))) - { - DWORD dwStyle = ::GetWindowLong(pFrame->m_hWnd, GWL_STYLE); - if ((dwStyle & MFS_4THICKFRAME) != 0) - { - pFrame->ModifyStyle(MFS_4THICKFRAME, 0); // clear - GetParent()->ModifyStyle(0, WS_CLIPCHILDREN); - } - } - } -#endif _SCB_REPLACE_MINIFRAME - - // compute the the client area - m_dwSCBStyle &= ~SCBS_EDGEALL; - - // add resizing edges between bars on the same row - if (!IsFloating() && m_pDockBar != NULL) - { - CSCBArray arrSCBars; - int nThis; - GetRowSizingBars(arrSCBars, nThis); - - BOOL bHorz = IsHorzDocked(); - if (nThis > 0) - m_dwSCBStyle |= bHorz ? SCBS_EDGELEFT : SCBS_EDGETOP; - - if (nThis < arrSCBars.GetUpperBound()) - m_dwSCBStyle |= bHorz ? SCBS_EDGERIGHT : SCBS_EDGEBOTTOM; - } - - NcCalcClient(&lpncsp->rgrc[0], m_nDockBarID); -} - -void CSizingControlBar::NcCalcClient(LPRECT pRc, UINT nDockBarID) -{ - CRect rc(pRc); - - rc.DeflateRect(3, 5, 3, 3); - if (nDockBarID != AFX_IDW_DOCKBAR_FLOAT) - rc.DeflateRect(2, 0, 2, 2); - - switch(nDockBarID) - { - case AFX_IDW_DOCKBAR_TOP: - m_dwSCBStyle |= SCBS_EDGEBOTTOM; - break; - case AFX_IDW_DOCKBAR_BOTTOM: - m_dwSCBStyle |= SCBS_EDGETOP; - break; - case AFX_IDW_DOCKBAR_LEFT: - m_dwSCBStyle |= SCBS_EDGERIGHT; - break; - case AFX_IDW_DOCKBAR_RIGHT: - m_dwSCBStyle |= SCBS_EDGELEFT; - break; - } - - // make room for edges only if they will be painted - if (m_dwSCBStyle & SCBS_SHOWEDGES) - rc.DeflateRect( - (m_dwSCBStyle & SCBS_EDGELEFT) ? m_cxEdge : 0, - (m_dwSCBStyle & SCBS_EDGETOP) ? m_cxEdge : 0, - (m_dwSCBStyle & SCBS_EDGERIGHT) ? m_cxEdge : 0, - (m_dwSCBStyle & SCBS_EDGEBOTTOM) ? m_cxEdge : 0); - - *pRc = rc; -} - -void CSizingControlBar::OnNcPaint() -{ - // get window DC that is clipped to the non-client area - CWindowDC dc(this); - - CRect rcClient, rcBar; - GetClientRect(rcClient); - ClientToScreen(rcClient); - GetWindowRect(rcBar); - rcClient.OffsetRect(-rcBar.TopLeft()); - rcBar.OffsetRect(-rcBar.TopLeft()); - - CDC mdc; - mdc.CreateCompatibleDC(&dc); - - CBitmap bm; - bm.CreateCompatibleBitmap(&dc, rcBar.Width(), rcBar.Height()); - CBitmap* pOldBm = mdc.SelectObject(&bm); - - // draw borders in non-client area - CRect rcDraw = rcBar; - DrawBorders(&mdc, rcDraw); - - // erase the NC background - mdc.FillRect(rcDraw, CBrush::FromHandle( - (HBRUSH) GetClassLong(m_hWnd, GCL_HBRBACKGROUND))); - - if (m_dwSCBStyle & SCBS_SHOWEDGES) - { - CRect rcEdge; // paint the sizing edges - for (int i = 0; i < 4; i++) - if (GetEdgeRect(rcBar, GetEdgeHTCode(i), rcEdge)) - mdc.Draw3dRect(rcEdge, ::GetSysColor(COLOR_BTNHIGHLIGHT), - ::GetSysColor(COLOR_BTNSHADOW)); - } - - NcPaintGripper(&mdc, rcClient); - - // client area is not our bussiness :) - dc.IntersectClipRect(rcBar); - dc.ExcludeClipRect(rcClient); - - dc.BitBlt(0, 0, rcBar.Width(), rcBar.Height(), &mdc, 0, 0, SRCCOPY); - - ReleaseDC(&dc); - - mdc.SelectObject(pOldBm); - bm.DeleteObject(); - mdc.DeleteDC(); -} - -void CSizingControlBar::NcPaintGripper(CDC* pDC, CRect rcClient) -{ - UNUSED_ALWAYS(pDC); - UNUSED_ALWAYS(rcClient); -} - -void CSizingControlBar::OnPaint() -{ - // overridden to skip border painting based on clientrect - CPaintDC dc(this); -} - -LRESULT CSizingControlBar::OnNcHitTest(CPoint point) -{ - CRect rcBar, rcEdge; - GetWindowRect(rcBar); - - if (!IsFloating()) - for (int i = 0; i < 4; i++) - if (GetEdgeRect(rcBar, GetEdgeHTCode(i), rcEdge)) - if (rcEdge.PtInRect(point)) - return GetEdgeHTCode(i); - - return HTCLIENT; -} - -void CSizingControlBar::OnSettingChange(UINT uFlags, LPCTSTR lpszSection) -{ - baseCSizingControlBar::OnSettingChange(uFlags, lpszSection); - - m_bDragShowContent = FALSE; - ::SystemParametersInfo(SPI_GETDRAGFULLWINDOWS, 0, - &m_bDragShowContent, 0); // update -} - -void CSizingControlBar::OnSize(UINT nType, int cx, int cy) -{ - UNUSED_ALWAYS(nType); - - if ((m_dwSCBStyle & SCBS_SIZECHILD) != 0) - { - // automatic child resizing - only one child is allowed - CWnd* pWnd = GetWindow(GW_CHILD); - if (pWnd != NULL) - { - pWnd->MoveWindow(0, 0, cx, cy); - ASSERT(pWnd->GetWindow(GW_HWNDNEXT) == NULL); - } - } -} - -void CSizingControlBar::OnClose() -{ - // do nothing: protection against accidentally destruction by the - // child control (i.e. if user hits Esc in a child editctrl) -} - -///////////////////////////////////////////////////////////////////////// -// CSizingControlBar implementation helpers - -void CSizingControlBar::StartTracking(UINT nHitTest, CPoint point) -{ - SetCapture(); - - // make sure no updates are pending - if (!m_bDragShowContent) - RedrawWindow(NULL, NULL, RDW_ALLCHILDREN | RDW_UPDATENOW); - - m_htEdge = nHitTest; - m_bTracking = TRUE; - - BOOL bHorz = IsHorzDocked(); - BOOL bHorzTracking = m_htEdge == HTLEFT || m_htEdge == HTRIGHT; - - m_nTrackPosOld = bHorzTracking ? point.x : point.y; - - CRect rcBar, rcEdge; - GetWindowRect(rcBar); - GetEdgeRect(rcBar, m_htEdge, rcEdge); - m_nTrackEdgeOfs = m_nTrackPosOld - - (bHorzTracking ? rcEdge.CenterPoint().x : rcEdge.CenterPoint().y); - - CSCBArray arrSCBars; - int nThis; - GetRowSizingBars(arrSCBars, nThis); - - m_nTrackPosMin = m_nTrackPosMax = m_nTrackPosOld; - if (!IsSideTracking()) - { - // calc minwidth as the max minwidth of the sizing bars on row - int nMinWidth = bHorz ? m_szMinHorz.cy : m_szMinVert.cx; - for (int i = 0; i < arrSCBars.GetSize(); i++) - nMinWidth = max(nMinWidth, bHorz ? - arrSCBars[i]->m_szMinHorz.cy : - arrSCBars[i]->m_szMinVert.cx); - int nExcessWidth = (bHorz ? m_szHorz.cy : m_szVert.cx) - nMinWidth; - - // the control bar cannot grow with more than the width of - // remaining client area of the mainframe - CRect rcT; - m_pDockSite->RepositionBars(0, 0xFFFF, AFX_IDW_PANE_FIRST, - reposQuery, &rcT, NULL, TRUE); - int nMaxWidth = bHorz ? rcT.Height() - 2 : rcT.Width() - 2; - - BOOL bTopOrLeft = m_htEdge == HTTOP || m_htEdge == HTLEFT; - - m_nTrackPosMin -= bTopOrLeft ? nMaxWidth : nExcessWidth; - m_nTrackPosMax += bTopOrLeft ? nExcessWidth : nMaxWidth; - } - else - { - // side tracking: - // max size is the actual size plus the amount the other - // sizing bars can be decreased until they reach their minsize - if (m_htEdge == HTBOTTOM || m_htEdge == HTRIGHT) - nThis++; - - for (int i = 0; i < arrSCBars.GetSize(); i++) - { - CSizingControlBar* pBar = arrSCBars[i]; - - int nExcessWidth = bHorz ? - pBar->m_szHorz.cx - pBar->m_szMinHorz.cx : - pBar->m_szVert.cy - pBar->m_szMinVert.cy; - - if (i < nThis) - m_nTrackPosMin -= nExcessWidth; - else - m_nTrackPosMax += nExcessWidth; - } - } - - OnTrackInvertTracker(); // draw tracker -} - -void CSizingControlBar::StopTracking() -{ - OnTrackInvertTracker(); // erase tracker - - m_bTracking = FALSE; - ReleaseCapture(); - - m_pDockSite->DelayRecalcLayout(); -} - -void CSizingControlBar::OnTrackUpdateSize(CPoint& point) -{ - ASSERT(!IsFloating()); - - BOOL bHorzTrack = m_htEdge == HTLEFT || m_htEdge == HTRIGHT; - - int nTrackPos = bHorzTrack ? point.x : point.y; - nTrackPos = max(m_nTrackPosMin, min(m_nTrackPosMax, nTrackPos)); - - int nDelta = nTrackPos - m_nTrackPosOld; - - if (nDelta == 0) - return; // no pos change - - OnTrackInvertTracker(); // erase tracker - - m_nTrackPosOld = nTrackPos; - - BOOL bHorz = IsHorzDocked(); - - CSize sizeNew = bHorz ? m_szHorz : m_szVert; - switch (m_htEdge) - { - case HTLEFT: sizeNew -= CSize(nDelta, 0); break; - case HTTOP: sizeNew -= CSize(0, nDelta); break; - case HTRIGHT: sizeNew += CSize(nDelta, 0); break; - case HTBOTTOM: sizeNew += CSize(0, nDelta); break; - } - - CSCBArray arrSCBars; - int nThis; - GetRowSizingBars(arrSCBars, nThis); - - if (!IsSideTracking()) - for (int i = 0; i < arrSCBars.GetSize(); i++) - { - CSizingControlBar* pBar = arrSCBars[i]; - // make same width (or height) - (bHorz ? pBar->m_szHorz.cy : pBar->m_szVert.cx) = - bHorz ? sizeNew.cy : sizeNew.cx; - } - else - { - int nGrowingBar = nThis; - BOOL bBefore = m_htEdge == HTTOP || m_htEdge == HTLEFT; - if (bBefore && nDelta > 0) - nGrowingBar--; - if (!bBefore && nDelta < 0) - nGrowingBar++; - if (nGrowingBar != nThis) - bBefore = !bBefore; - - // nGrowing is growing - nDelta = abs(nDelta); - CSizingControlBar* pBar = arrSCBars[nGrowingBar]; - (bHorz ? pBar->m_szHorz.cx : pBar->m_szVert.cy) += nDelta; - - // the others are shrinking - int nFirst = bBefore ? nGrowingBar - 1 : nGrowingBar + 1; - int nLimit = bBefore ? -1 : arrSCBars.GetSize(); - - for (int i = nFirst; nDelta != 0 && i != nLimit; i += (bBefore ? -1 : 1)) - { - CSizingControlBar* pBar = arrSCBars[i]; - - int nDeltaT = min(nDelta, - (bHorz ? pBar->m_szHorz.cx : pBar->m_szVert.cy) - - (bHorz ? pBar->m_szMinHorz.cx : pBar->m_szMinVert.cy)); - - (bHorz ? pBar->m_szHorz.cx : pBar->m_szVert.cy) -= nDeltaT; - nDelta -= nDeltaT; - } - } - - OnTrackInvertTracker(); // redraw tracker at new pos - - if (m_bDragShowContent) - m_pDockSite->DelayRecalcLayout(); -} - -void CSizingControlBar::OnTrackInvertTracker() -{ - ASSERT(m_bTracking); - - if (m_bDragShowContent) - return; // don't show tracker if DragFullWindows is on - - BOOL bHorz = IsHorzDocked(); - CRect rc, rcBar, rcDock, rcFrame; - GetWindowRect(rcBar); - m_pDockBar->GetWindowRect(rcDock); - m_pDockSite->GetWindowRect(rcFrame); - VERIFY(GetEdgeRect(rcBar, m_htEdge, rc)); - if (!IsSideTracking()) - rc = bHorz ? - CRect(rcDock.left + 1, rc.top, rcDock.right - 1, rc.bottom) : - CRect(rc.left, rcDock.top + 1, rc.right, rcDock.bottom - 1); - - BOOL bHorzTracking = m_htEdge == HTLEFT || m_htEdge == HTRIGHT; - int nOfs = m_nTrackPosOld - m_nTrackEdgeOfs; - nOfs -= bHorzTracking ? rc.CenterPoint().x : rc.CenterPoint().y; - rc.OffsetRect(bHorzTracking ? nOfs : 0, bHorzTracking ? 0 : nOfs); - rc.OffsetRect(-rcFrame.TopLeft()); - - CDC *pDC = m_pDockSite->GetDCEx(NULL, - DCX_WINDOW | DCX_CACHE | DCX_LOCKWINDOWUPDATE); - CBrush* pBrush = CDC::GetHalftoneBrush(); - CBrush* pBrushOld = pDC->SelectObject(pBrush); - - pDC->PatBlt(rc.left, rc.top, rc.Width(), rc.Height(), PATINVERT); - - pDC->SelectObject(pBrushOld); - m_pDockSite->ReleaseDC(pDC); -} - -BOOL CSizingControlBar::GetEdgeRect(CRect rcWnd, UINT nHitTest, - CRect& rcEdge) -{ - rcEdge = rcWnd; - if (m_dwSCBStyle & SCBS_SHOWEDGES) - rcEdge.DeflateRect(1, 1); - BOOL bHorz = IsHorzDocked(); - - switch (nHitTest) - { - case HTLEFT: - if (!(m_dwSCBStyle & SCBS_EDGELEFT)) return FALSE; - rcEdge.right = rcEdge.left + m_cxEdge; - rcEdge.DeflateRect(0, bHorz ? m_cxEdge: 0); - break; - case HTTOP: - if (!(m_dwSCBStyle & SCBS_EDGETOP)) return FALSE; - rcEdge.bottom = rcEdge.top + m_cxEdge; - rcEdge.DeflateRect(bHorz ? 0 : m_cxEdge, 0); - break; - case HTRIGHT: - if (!(m_dwSCBStyle & SCBS_EDGERIGHT)) return FALSE; - rcEdge.left = rcEdge.right - m_cxEdge; - rcEdge.DeflateRect(0, bHorz ? m_cxEdge: 0); - break; - case HTBOTTOM: - if (!(m_dwSCBStyle & SCBS_EDGEBOTTOM)) return FALSE; - rcEdge.top = rcEdge.bottom - m_cxEdge; - rcEdge.DeflateRect(bHorz ? 0 : m_cxEdge, 0); - break; - default: - ASSERT(FALSE); // invalid hit test code - } - return TRUE; -} - -UINT CSizingControlBar::GetEdgeHTCode(int nEdge) -{ - if (nEdge == 0) return HTLEFT; - if (nEdge == 1) return HTTOP; - if (nEdge == 2) return HTRIGHT; - if (nEdge == 3) return HTBOTTOM; - ASSERT(FALSE); // invalid edge code - return HTNOWHERE; -} - -void CSizingControlBar::GetRowInfo(int& nFirst, int& nLast, int& nThis) -{ - ASSERT_VALID(m_pDockBar); // verify bounds - - nThis = m_pDockBar->FindBar(this); - ASSERT(nThis != -1); - - int i, nBars = m_pDockBar->m_arrBars.GetSize(); - - // find the first and the last bar in row - for (nFirst = -1, i = nThis - 1; i >= 0 && nFirst == -1; i--) - if (m_pDockBar->m_arrBars[i] == NULL) - nFirst = i + 1; - for (nLast = -1, i = nThis + 1; i < nBars && nLast == -1; i++) - if (m_pDockBar->m_arrBars[i] == NULL) - nLast = i - 1; - - ASSERT((nLast != -1) && (nFirst != -1)); -} - -void CSizingControlBar::GetRowSizingBars(CSCBArray& arrSCBars) -{ - int nThis; // dummy - GetRowSizingBars(arrSCBars, nThis); -} - -void CSizingControlBar::GetRowSizingBars(CSCBArray& arrSCBars, int& nThis) -{ - arrSCBars.RemoveAll(); - - int nFirstT, nLastT, nThisT; - GetRowInfo(nFirstT, nLastT, nThisT); - - nThis = -1; - for (int i = nFirstT; i <= nLastT; i++) - { - CSizingControlBar* pBar = - (CSizingControlBar*) m_pDockBar->m_arrBars[i]; - if (HIWORD(pBar) == 0) continue; // placeholder - if (!pBar->IsVisible()) continue; - if (pBar->IsKindOf(RUNTIME_CLASS(CSizingControlBar))) - { - if (pBar == this) - nThis = arrSCBars.GetSize(); - - arrSCBars.Add(pBar); - } - } -} - -BOOL CSizingControlBar::NegotiateSpace(int nLengthTotal, BOOL bHorz) -{ - ASSERT(bHorz == IsHorzDocked()); - - int nFirst, nLast, nThis; - GetRowInfo(nFirst, nLast, nThis); - - int nLengthAvail = nLengthTotal; - int nLengthActual = 0; - int nLengthMin = 2; - int nWidthMax = 0; - CSizingControlBar* pBar; - - for (int i = nFirst; i <= nLast; i++) - { - pBar = (CSizingControlBar*) m_pDockBar->m_arrBars[i]; - if (HIWORD(pBar) == 0) continue; // placeholder - if (!pBar->IsVisible()) continue; - BOOL bIsSizingBar = - pBar->IsKindOf(RUNTIME_CLASS(CSizingControlBar)); - - int nLengthBar; // minimum length of the bar - if (bIsSizingBar) - nLengthBar = bHorz ? pBar->m_szMinHorz.cx - 2 : - pBar->m_szMinVert.cy - 2; - else - { - CRect rcBar; - pBar->GetWindowRect(&rcBar); - nLengthBar = bHorz ? rcBar.Width() - 2 : rcBar.Height() - 2; - } - - nLengthMin += nLengthBar; - if (nLengthMin > nLengthTotal) - { - // split the row after fixed bar - if (i < nThis) - { - m_pDockBar->m_arrBars.InsertAt(i + 1, - (CControlBar*) NULL); - return FALSE; - } - - // only this sizebar remains on the row, adjust it to minsize - if (i == nThis) - { - if (bHorz) - m_szHorz.cx = m_szMinHorz.cx; - else - m_szVert.cy = m_szMinVert.cy; - - return TRUE; // the dockbar will split the row for us - } - - // we have enough bars - go negotiate with them - m_pDockBar->m_arrBars.InsertAt(i, (CControlBar*) NULL); - nLast = i - 1; - break; - } - - if (bIsSizingBar) - { - nLengthActual += bHorz ? pBar->m_szHorz.cx - 2 : - pBar->m_szVert.cy - 2; - nWidthMax = max(nWidthMax, bHorz ? pBar->m_szHorz.cy : - pBar->m_szVert.cx); - } - else - nLengthAvail -= nLengthBar; - } - - CSCBArray arrSCBars; - GetRowSizingBars(arrSCBars); - int nNumBars = arrSCBars.GetSize(); - int nDelta = nLengthAvail - nLengthActual; - - // return faster when there is only one sizing bar per row (this one) - if (nNumBars == 1) - { - ASSERT(arrSCBars[0] == this); - - if (nDelta == 0) - return TRUE; - - m_bKeepSize = FALSE; - (bHorz ? m_szHorz.cx : m_szVert.cy) += nDelta; - - return TRUE; - } - - // make all the bars the same width - for (int i = 0; i < nNumBars; i++) - if (bHorz) - arrSCBars[i]->m_szHorz.cy = nWidthMax; - else - arrSCBars[i]->m_szVert.cx = nWidthMax; - - // distribute the difference between the bars, - // but don't shrink them below their minsizes - while (nDelta != 0) - { - int nDeltaOld = nDelta; - for (int i = 0; i < nNumBars; i++) - { - pBar = arrSCBars[i]; - int nLMin = bHorz ? - pBar->m_szMinHorz.cx : pBar->m_szMinVert.cy; - int nL = bHorz ? pBar->m_szHorz.cx : pBar->m_szVert.cy; - - if ((nL == nLMin) && (nDelta < 0) || // already at min length - pBar->m_bKeepSize) // or wants to keep its size - continue; - - // sign of nDelta - int nDelta2 = (nDelta == 0) ? 0 : ((nDelta < 0) ? -1 : 1); - - (bHorz ? pBar->m_szHorz.cx : pBar->m_szVert.cy) += nDelta2; - nDelta -= nDelta2; - if (nDelta == 0) break; - } - // clear m_bKeepSize flags - if ((nDeltaOld == nDelta) || (nDelta == 0)) - for (int i = 0; i < nNumBars; i++) - arrSCBars[i]->m_bKeepSize = FALSE; - } - - return TRUE; -} - -void CSizingControlBar::AlignControlBars() -{ - int nFirst, nLast, nThis; - GetRowInfo(nFirst, nLast, nThis); - - BOOL bHorz = IsHorzDocked(); - BOOL bNeedRecalc = FALSE; - int nAlign = bHorz ? -2 : 0; - - CRect rc, rcDock; - m_pDockBar->GetWindowRect(&rcDock); - - for (int i = nFirst; i <= nLast; i++) - { - CSizingControlBar* pBar = - (CSizingControlBar*) m_pDockBar->m_arrBars[i]; - if (HIWORD(pBar) == 0) continue; // placeholder - if (!pBar->IsVisible()) continue; - - pBar->GetWindowRect(&rc); - rc.OffsetRect(-rcDock.TopLeft()); - - if (pBar->IsKindOf(RUNTIME_CLASS(CSizingControlBar))) - rc = CRect(rc.TopLeft(), - bHorz ? pBar->m_szHorz : pBar->m_szVert); - - if ((bHorz ? rc.left : rc.top) != nAlign) - { - if (!bHorz) - rc.OffsetRect(0, nAlign - rc.top - 2); - else if (m_nDockBarID == AFX_IDW_DOCKBAR_TOP) - rc.OffsetRect(nAlign - rc.left, -2); - else - rc.OffsetRect(nAlign - rc.left, 0); - pBar->MoveWindow(rc); - bNeedRecalc = TRUE; - } - nAlign += (bHorz ? rc.Width() : rc.Height()) - 2; - } - - if (bNeedRecalc) - m_pDockSite->DelayRecalcLayout(); -} - -void CSizingControlBar::OnUpdateCmdUI(CFrameWnd* pTarget, - BOOL bDisableIfNoHndler) -{ - UNUSED_ALWAYS(bDisableIfNoHndler); - UNUSED_ALWAYS(pTarget); -} - -void CSizingControlBar::LoadState(LPCTSTR lpszProfileName) -{ - ASSERT_VALID(this); - ASSERT(GetSafeHwnd()); // must be called after Create() - -#if defined(_SCB_REPLACE_MINIFRAME) && !defined(_SCB_MINIFRAME_CAPTION) - // compensate the caption miscalculation in CFrameWnd::SetDockState() - CDockState state; - state.LoadState(lpszProfileName); - - UINT nID = GetDlgCtrlID(); - for (int i = 0; i < state.m_arrBarInfo.GetSize(); i++) - { - CControlBarInfo* pInfo = (CControlBarInfo*)state.m_arrBarInfo[i]; - ASSERT(pInfo != NULL); - if (!pInfo->m_bFloating) - continue; - - // this is a floating dockbar - check the ID array - for (int j = 0; j < pInfo->m_arrBarID.GetSize(); j++) - if ((DWORD) pInfo->m_arrBarID[j] == nID) - { - // found this bar - offset origin and save settings - pInfo->m_pointPos.x++; - pInfo->m_pointPos.y += - ::GetSystemMetrics(SM_CYSMCAPTION) + 1; - pInfo->SaveState(lpszProfileName, i); - } - } -#endif //_SCB_REPLACE_MINIFRAME && !_SCB_MINIFRAME_CAPTION - - CWinApp* pApp = AfxGetApp(); - - TCHAR szSection[256]; - wsprintf(szSection, _T("%s-SCBar-%d"), lpszProfileName, - GetDlgCtrlID()); - - m_szHorz.cx = max(m_szMinHorz.cx, (int) pApp->GetProfileInt( - szSection, _T("sizeHorzCX"), m_szHorz.cx)); - m_szHorz.cy = max(m_szMinHorz.cy, (int) pApp->GetProfileInt( - szSection, _T("sizeHorzCY"), m_szHorz.cy)); - - m_szVert.cx = max(m_szMinVert.cx, (int) pApp->GetProfileInt( - szSection, _T("sizeVertCX"), m_szVert.cx)); - m_szVert.cy = max(m_szMinVert.cy, (int) pApp->GetProfileInt( - szSection, _T("sizeVertCY"), m_szVert.cy)); - - m_szFloat.cx = max(m_szMinFloat.cx, (int) pApp->GetProfileInt( - szSection, _T("sizeFloatCX"), m_szFloat.cx)); - m_szFloat.cy = max(m_szMinFloat.cy, (int) pApp->GetProfileInt( - szSection, _T("sizeFloatCY"), m_szFloat.cy)); -} - -void CSizingControlBar::SaveState(LPCTSTR lpszProfileName) -{ - // place your SaveState or GlobalSaveState call in - // CMainFrame's OnClose() or DestroyWindow(), not in OnDestroy() - ASSERT_VALID(this); - ASSERT(GetSafeHwnd()); - - CWinApp* pApp = AfxGetApp(); - - TCHAR szSection[256]; - wsprintf(szSection, _T("%s-SCBar-%d"), lpszProfileName, - GetDlgCtrlID()); - - pApp->WriteProfileInt(szSection, _T("sizeHorzCX"), m_szHorz.cx); - pApp->WriteProfileInt(szSection, _T("sizeHorzCY"), m_szHorz.cy); - - pApp->WriteProfileInt(szSection, _T("sizeVertCX"), m_szVert.cx); - pApp->WriteProfileInt(szSection, _T("sizeVertCY"), m_szVert.cy); - - pApp->WriteProfileInt(szSection, _T("sizeFloatCX"), m_szFloat.cx); - pApp->WriteProfileInt(szSection, _T("sizeFloatCY"), m_szFloat.cy); -} - -void CSizingControlBar::GlobalLoadState(CFrameWnd* pFrame, - LPCTSTR lpszProfileName) -{ - POSITION pos = pFrame->m_listControlBars.GetHeadPosition(); - while (pos != NULL) - { - CSizingControlBar* pBar = - (CSizingControlBar*) pFrame->m_listControlBars.GetNext(pos); - ASSERT(pBar != NULL); - if (pBar->IsKindOf(RUNTIME_CLASS(CSizingControlBar))) - pBar->LoadState(lpszProfileName); - } -} - -void CSizingControlBar::GlobalSaveState(CFrameWnd* pFrame, - LPCTSTR lpszProfileName) -{ - POSITION pos = pFrame->m_listControlBars.GetHeadPosition(); - while (pos != NULL) - { - CSizingControlBar* pBar = - (CSizingControlBar*) pFrame->m_listControlBars.GetNext(pos); - ASSERT(pBar != NULL); - if (pBar->IsKindOf(RUNTIME_CLASS(CSizingControlBar))) - pBar->SaveState(lpszProfileName); - } -} - -#ifdef _SCB_REPLACE_MINIFRAME -#ifndef _SCB_MINIFRAME_CAPTION -///////////////////////////////////////////////////////////////////////////// -// CSCBDockContext Drag Operations - -static void AdjustRectangle(CRect& rect, CPoint pt) -{ - int nXOffset = (pt.x < rect.left) ? (pt.x - rect.left) : - (pt.x > rect.right) ? (pt.x - rect.right) : 0; - int nYOffset = (pt.y < rect.top) ? (pt.y - rect.top) : - (pt.y > rect.bottom) ? (pt.y - rect.bottom) : 0; - rect.OffsetRect(nXOffset, nYOffset); -} - -void CSCBDockContext::StartDrag(CPoint pt) -{ - ASSERT_VALID(m_pBar); - m_bDragging = TRUE; - - InitLoop(); - - ASSERT((m_pBar->m_dwStyle & CBRS_SIZE_DYNAMIC) != 0); - - // get true bar size (including borders) - CRect rect; - m_pBar->GetWindowRect(rect); - m_ptLast = pt; - CSize sizeHorz = m_pBar->CalcDynamicLayout(0, LM_HORZ | LM_HORZDOCK); - CSize sizeVert = m_pBar->CalcDynamicLayout(0, LM_VERTDOCK); - CSize sizeFloat = m_pBar->CalcDynamicLayout(0, LM_HORZ | LM_MRUWIDTH); - - m_rectDragHorz = CRect(rect.TopLeft(), sizeHorz); - m_rectDragVert = CRect(rect.TopLeft(), sizeVert); - - // calculate frame dragging rectangle - m_rectFrameDragHorz = CRect(rect.TopLeft(), sizeFloat); - -#ifdef _MAC - CMiniFrameWnd::CalcBorders(&m_rectFrameDragHorz, - WS_THICKFRAME, WS_EX_FORCESIZEBOX); -#else - CMiniFrameWnd::CalcBorders(&m_rectFrameDragHorz, WS_THICKFRAME); -#endif - m_rectFrameDragHorz.DeflateRect(2, 2); - m_rectFrameDragVert = m_rectFrameDragHorz; - - // adjust rectangles so that point is inside - AdjustRectangle(m_rectDragHorz, pt); - AdjustRectangle(m_rectDragVert, pt); - AdjustRectangle(m_rectFrameDragHorz, pt); - AdjustRectangle(m_rectFrameDragVert, pt); - - // initialize tracking state and enter tracking loop - m_dwOverDockStyle = CanDock(); - Move(pt); // call it here to handle special keys - Track(); -} -#endif //_SCB_MINIFRAME_CAPTION - -///////////////////////////////////////////////////////////////////////////// -// CSCBMiniDockFrameWnd - -IMPLEMENT_DYNCREATE(CSCBMiniDockFrameWnd, baseCSCBMiniDockFrameWnd); - -BEGIN_MESSAGE_MAP(CSCBMiniDockFrameWnd, baseCSCBMiniDockFrameWnd) - //{{AFX_MSG_MAP(CSCBMiniDockFrameWnd) - ON_WM_NCLBUTTONDOWN() - ON_WM_GETMINMAXINFO() - ON_WM_WINDOWPOSCHANGING() - ON_WM_SIZE() - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -BOOL CSCBMiniDockFrameWnd::Create(CWnd* pParent, DWORD dwBarStyle) -{ - // set m_bInRecalcLayout to avoid flashing during creation - // RecalcLayout will be called once something is docked - m_bInRecalcLayout = TRUE; - - DWORD dwStyle = WS_POPUP|WS_CAPTION|WS_SYSMENU|MFS_MOVEFRAME| - MFS_4THICKFRAME|MFS_SYNCACTIVE|MFS_BLOCKSYSMENU| - FWS_SNAPTOBARS; - - if (dwBarStyle & CBRS_SIZE_DYNAMIC) - dwStyle &= ~MFS_MOVEFRAME; - - DWORD dwExStyle = 0; -#ifdef _MAC - if (dwBarStyle & CBRS_SIZE_DYNAMIC) - dwExStyle |= WS_EX_FORCESIZEBOX; - else - dwStyle &= ~(MFS_MOVEFRAME|MFS_4THICKFRAME); -#endif - - if (!CMiniFrameWnd::CreateEx(dwExStyle, - NULL, &afxChNil, dwStyle, rectDefault, pParent)) - { - m_bInRecalcLayout = FALSE; - return FALSE; - } - dwStyle = dwBarStyle & (CBRS_ALIGN_LEFT|CBRS_ALIGN_RIGHT) ? - CBRS_ALIGN_LEFT : CBRS_ALIGN_TOP; - dwStyle |= dwBarStyle & CBRS_FLOAT_MULTI; - CMenu* pSysMenu = GetSystemMenu(FALSE); - //pSysMenu->DeleteMenu(SC_SIZE, MF_BYCOMMAND); - CString strHide; - if (strHide.LoadString(AFX_IDS_HIDE)) - { - pSysMenu->DeleteMenu(SC_CLOSE, MF_BYCOMMAND); - pSysMenu->AppendMenu(MF_STRING|MF_ENABLED, SC_CLOSE, strHide); - } - - // must initially create with parent frame as parent - if (!m_wndDockBar.Create(pParent, WS_CHILD | WS_VISIBLE | dwStyle, - AFX_IDW_DOCKBAR_FLOAT)) - { - m_bInRecalcLayout = FALSE; - return FALSE; - } - - // set parent to CMiniDockFrameWnd - m_wndDockBar.SetParent(this); - m_bInRecalcLayout = FALSE; - - return TRUE; -} - -void CSCBMiniDockFrameWnd::OnNcLButtonDown(UINT nHitTest, CPoint point) -{ - if (nHitTest == HTCAPTION || nHitTest == HTCLOSE) - { - baseCSCBMiniDockFrameWnd::OnNcLButtonDown(nHitTest, point); - return; - } - - if (GetSizingControlBar() != NULL) - CMiniFrameWnd::OnNcLButtonDown(nHitTest, point); - else - baseCSCBMiniDockFrameWnd::OnNcLButtonDown(nHitTest, point); -} - -CSizingControlBar* CSCBMiniDockFrameWnd::GetSizingControlBar() -{ - CWnd* pWnd = GetWindow(GW_CHILD); // get the dockbar - if (pWnd == NULL) - return NULL; - - pWnd = pWnd->GetWindow(GW_CHILD); // get the controlbar - if (pWnd == NULL) - return NULL; - - if (!pWnd->IsKindOf(RUNTIME_CLASS(CSizingControlBar))) - return NULL; - - return (CSizingControlBar*) pWnd; -} - -void CSCBMiniDockFrameWnd::OnSize(UINT nType, int cx, int cy) -{ - CSizingControlBar* pBar = GetSizingControlBar(); - if ((pBar != NULL) && (GetStyle() & MFS_4THICKFRAME) == 0 - && pBar->IsVisible()) - pBar->m_szFloat = CSize(cx + 4, cy + 4); - - baseCSCBMiniDockFrameWnd::OnSize(nType, cx, cy); -} - -void CSCBMiniDockFrameWnd::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI) -{ - baseCSCBMiniDockFrameWnd::OnGetMinMaxInfo(lpMMI); - - CSizingControlBar* pBar = GetSizingControlBar(); - if (pBar != NULL) - { - CRect r(CPoint(0, 0), pBar->m_szMinFloat - CSize(4, 4)); -#ifndef _SCB_MINIFRAME_CAPTION - CMiniFrameWnd::CalcBorders(&r, WS_THICKFRAME); -#else - CMiniFrameWnd::CalcBorders(&r, WS_THICKFRAME|WS_CAPTION); -#endif //_SCB_MINIFRAME_CAPTION - lpMMI->ptMinTrackSize.x = r.Width(); - lpMMI->ptMinTrackSize.y = r.Height(); - } -} - -void CSCBMiniDockFrameWnd::OnWindowPosChanging(WINDOWPOS FAR* lpwndpos) -{ - if ((GetStyle() & MFS_4THICKFRAME) != 0) - { - CSizingControlBar* pBar = GetSizingControlBar(); - if (pBar != NULL) - { - lpwndpos->flags |= SWP_NOSIZE; // don't size this time - // prevents flicker - pBar->m_pDockBar->ModifyStyle(0, WS_CLIPCHILDREN); - // enable diagonal resizing - ModifyStyle(MFS_4THICKFRAME, 0); -#ifndef _SCB_MINIFRAME_CAPTION - // remove caption - ModifyStyle(WS_SYSMENU|WS_CAPTION, 0); -#endif - DelayRecalcLayout(); - pBar->PostMessage(WM_NCPAINT); - } - } - - CMiniFrameWnd::OnWindowPosChanging(lpwndpos); -} - -#endif //_SCB_REPLACE_MINIFRAME diff --git a/SoundArranger/UI_DockingBar/sizecbar.h b/SoundArranger/UI_DockingBar/sizecbar.h deleted file mode 100644 index 0db72124..00000000 --- a/SoundArranger/UI_DockingBar/sizecbar.h +++ /dev/null @@ -1,239 +0,0 @@ -///////////////////////////////////////////////////////////////////////// -// -// CSizingControlBar Version 2.43 -// -// Created: Jan 24, 1998 Last Modified: August 03, 2000 -// -// See the official site at www.datamekanix.com for documentation and -// the latest news. -// -///////////////////////////////////////////////////////////////////////// -// Copyright (C) 1998-2000 by Cristi Posea. All rights reserved. -// -// This code is free for personal and commercial use, providing this -// notice remains intact in the source files and all eventual changes are -// clearly marked with comments. -// -// You must obtain the author's consent before you can include this code -// in a software library. -// -// No warrantee of any kind, express or implied, is included with this -// software; use at your own risk, responsibility for damages (if any) to -// anyone resulting from the use of this software rests entirely with the -// user. -// -// Send bug reports, bug fixes, enhancements, requests, flames, etc. to -// cristi@datamekanix.com or post them at the message board at the site. -///////////////////////////////////////////////////////////////////////// - -#if !defined(__SIZECBAR_H__) -#define __SIZECBAR_H__ - -#include // for CDockContext -#include // for CTypedPtrArray - -#if _MSC_VER >= 1000 -#pragma once -#endif // _MSC_VER >= 1000 - - -#if defined(_SCB_MINIFRAME_CAPTION) && !defined(_SCB_REPLACE_MINIFRAME) - #error "_SCB_MINIFRAME_CAPTION requires _SCB_REPLACE_MINIFRAME" -#endif - -///////////////////////////////////////////////////////////////////////// -// CSCBDockBar dummy class for access to protected members - -class CSCBDockBar : public CDockBar -{ - friend class CSizingControlBar; -}; - -///////////////////////////////////////////////////////////////////////// -// CSizingControlBar control bar styles - -#define SCBS_EDGELEFT 0x00000001 -#define SCBS_EDGERIGHT 0x00000002 -#define SCBS_EDGETOP 0x00000004 -#define SCBS_EDGEBOTTOM 0x00000008 -#define SCBS_EDGEALL 0x0000000F -#define SCBS_SHOWEDGES 0x00000010 -#define SCBS_SIZECHILD 0x00000020 - -///////////////////////////////////////////////////////////////////////// -// CSizingControlBar control bar - -#ifndef baseCSizingControlBar -#define baseCSizingControlBar CControlBar -#endif - -class CSizingControlBar; -typedef CTypedPtrArray CSCBArray; - -class CSizingControlBar : public baseCSizingControlBar -{ - DECLARE_DYNAMIC(CSizingControlBar); - -// Construction -public: - CSizingControlBar(); - - virtual BOOL Create(LPCTSTR lpszWindowName, CWnd* pParentWnd, - CSize sizeDefault, BOOL bHasGripper, - UINT nID, DWORD dwStyle = WS_CHILD | WS_VISIBLE | CBRS_TOP); - virtual BOOL Create(LPCTSTR lpszWindowName, CWnd* pParentWnd, - UINT nID, DWORD dwStyle = WS_CHILD | WS_VISIBLE | CBRS_TOP); - -// Attributes -public: - const BOOL IsFloating() const; - const BOOL IsHorzDocked() const; - const BOOL IsVertDocked() const; - const BOOL IsSideTracking() const; - const BOOL GetSCBStyle() const {return m_dwSCBStyle;} - -// Operations -public: -#if defined(_SCB_REPLACE_MINIFRAME) && !defined(_SCB_MINIFRAME_CAPTION) - void EnableDocking(DWORD dwDockStyle); -#endif - virtual void LoadState(LPCTSTR lpszProfileName); - virtual void SaveState(LPCTSTR lpszProfileName); - static void GlobalLoadState(CFrameWnd* pFrame, LPCTSTR lpszProfileName); - static void GlobalSaveState(CFrameWnd* pFrame, LPCTSTR lpszProfileName); - void SetSCBStyle(DWORD dwSCBStyle) - {m_dwSCBStyle = (dwSCBStyle & ~SCBS_EDGEALL);} - -// Overridables - virtual void OnUpdateCmdUI(CFrameWnd* pTarget, BOOL bDisableIfNoHndler); - -// Overrides -public: - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CSizingControlBar) - public: - virtual CSize CalcFixedLayout(BOOL bStretch, BOOL bHorz); - virtual CSize CalcDynamicLayout(int nLength, DWORD dwMode); - //}}AFX_VIRTUAL - -// Implementation -public: - virtual ~CSizingControlBar(); - -protected: - // implementation helpers - UINT GetEdgeHTCode(int nEdge); - BOOL GetEdgeRect(CRect rcWnd, UINT nHitTest, CRect& rcEdge); - virtual void StartTracking(UINT nHitTest, CPoint point); - virtual void StopTracking(); - virtual void OnTrackUpdateSize(CPoint& point); - virtual void OnTrackInvertTracker(); - virtual void NcPaintGripper(CDC* pDC, CRect rcClient); - virtual void NcCalcClient(LPRECT pRc, UINT nDockBarID); - - virtual void AlignControlBars(); - void GetRowInfo(int& nFirst, int& nLast, int& nThis); - void GetRowSizingBars(CSCBArray& arrSCBars); - void GetRowSizingBars(CSCBArray& arrSCBars, int& nThis); - BOOL NegotiateSpace(int nLengthTotal, BOOL bHorz); - -protected: - DWORD m_dwSCBStyle; - UINT m_htEdge; - - CSize m_szHorz; - CSize m_szVert; - CSize m_szFloat; - CSize m_szMinHorz; - CSize m_szMinVert; - CSize m_szMinFloat; - int m_nTrackPosMin; - int m_nTrackPosMax; - int m_nTrackPosOld; - int m_nTrackEdgeOfs; - BOOL m_bTracking; - BOOL m_bKeepSize; - BOOL m_bParentSizing; - BOOL m_bDragShowContent; - UINT m_nDockBarID; - int m_cxEdge; - -// Generated message map functions -protected: - //{{AFX_MSG(CSizingControlBar) - afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct); - afx_msg void OnNcPaint(); - afx_msg void OnNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp); - afx_msg LRESULT OnNcHitTest(CPoint point); - afx_msg void OnCaptureChanged(CWnd *pWnd); - afx_msg void OnSettingChange(UINT uFlags, LPCTSTR lpszSection); - afx_msg void OnLButtonUp(UINT nFlags, CPoint point); - afx_msg void OnMouseMove(UINT nFlags, CPoint point); - afx_msg void OnNcLButtonDown(UINT nHitTest, CPoint point); - afx_msg void OnLButtonDown(UINT nFlags, CPoint point); - afx_msg void OnLButtonDblClk(UINT nFlags, CPoint point); - afx_msg void OnRButtonDown(UINT nFlags, CPoint point); - afx_msg void OnWindowPosChanging(WINDOWPOS FAR* lpwndpos); - afx_msg void OnPaint(); - afx_msg void OnClose(); - afx_msg void OnSize(UINT nType, int cx, int cy); - //}}AFX_MSG - afx_msg LRESULT OnSetText(WPARAM wParam, LPARAM lParam); - - DECLARE_MESSAGE_MAP() - -#ifdef _SCB_REPLACE_MINIFRAME - friend class CSCBMiniDockFrameWnd; -#endif //_SCB_REPLACE_MINIFRAME -}; - -#ifdef _SCB_REPLACE_MINIFRAME -#ifndef _SCB_MINIFRAME_CAPTION -///////////////////////////////////////////////////////////////////////// -// CSCBDockContext dockcontext - -class CSCBDockContext : public CDockContext -{ -public: -// Construction - CSCBDockContext(CControlBar* pBar) : CDockContext(pBar) {} - -// Drag Operations - virtual void StartDrag(CPoint pt); -}; -#endif //_SCB_MINIFRAME_CAPTION - -///////////////////////////////////////////////////////////////////////// -// CSCBMiniDockFrameWnd miniframe - -#ifndef baseCSCBMiniDockFrameWnd -#define baseCSCBMiniDockFrameWnd CMiniDockFrameWnd -#endif - -class CSCBMiniDockFrameWnd : public baseCSCBMiniDockFrameWnd -{ - DECLARE_DYNCREATE(CSCBMiniDockFrameWnd) - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CSCBMiniDockFrameWnd) - public: - virtual BOOL Create(CWnd* pParent, DWORD dwBarStyle); - //}}AFX_VIRTUAL - -// Implementation -public: - CSizingControlBar* GetSizingControlBar(); - - //{{AFX_MSG(CSCBMiniDockFrameWnd) - afx_msg void OnNcLButtonDown(UINT nHitTest, CPoint point); - afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI); - afx_msg void OnWindowPosChanging(WINDOWPOS FAR* lpwndpos); - afx_msg void OnSize(UINT nType, int cx, int cy); - //}}AFX_MSG - DECLARE_MESSAGE_MAP() -}; -#endif //_SCB_REPLACE_MINIFRAME - -#endif // !defined(__SIZECBAR_H__) - diff --git a/SoundArranger/UI_ToolBar/TrueColorToolBar.cpp b/SoundArranger/UI_ToolBar/TrueColorToolBar.cpp deleted file mode 100644 index 826bdbe1..00000000 --- a/SoundArranger/UI_ToolBar/TrueColorToolBar.cpp +++ /dev/null @@ -1,141 +0,0 @@ -/***========================================================================= -==== ==== -==== D C U t i l i t y ==== -==== ==== -============================================================================= -==== ==== -==== File name : TrueColorToolBar.cpp ==== -==== Project name : Tester ==== -==== Project number : --- ==== -==== Creation date : 13/1/2003 ==== -==== Author(s) : Dany Cantin ==== -==== ==== -==== Copyright ?DCUtility 2003 ==== -==== ==== -============================================================================= -===========================================================================*/ - -#include "stdafx.h" -#include "TrueColorToolBar.h" - -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif - -///////////////////////////////////////////////////////////////////////////// -// CTrueColorToolBar - -CTrueColorToolBar::CTrueColorToolBar() -{ - m_bDropDown = FALSE; -} - -CTrueColorToolBar::~CTrueColorToolBar() -{ -} - - -BEGIN_MESSAGE_MAP(CTrueColorToolBar, CToolBar) - //{{AFX_MSG_MAP(CTrueColorToolBar) - ON_NOTIFY_REFLECT(TBN_DROPDOWN, OnToolbarDropDown) - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - -///////////////////////////////////////////////////////////////////////////// -// CTrueColorToolBar message handlers -BOOL CTrueColorToolBar::LoadTrueColorToolBar(int nBtnWidth, - UINT uToolBar, - UINT uToolBarHot, - UINT uToolBarDisabled) -{ - if (!SetTrueColorToolBar(TB_SETIMAGELIST, uToolBar, nBtnWidth)) - return FALSE; - - if (uToolBarHot) { - if (!SetTrueColorToolBar(TB_SETHOTIMAGELIST, uToolBarHot, nBtnWidth)) - return FALSE; - } - - if (uToolBarDisabled) { - if (!SetTrueColorToolBar(TB_SETDISABLEDIMAGELIST, uToolBarDisabled, nBtnWidth)) - return FALSE; - } - - return TRUE; -} - - -BOOL CTrueColorToolBar::SetTrueColorToolBar(UINT uToolBarType, - UINT uToolBar, - int nBtnWidth) -{ - CImageList cImageList; - CBitmap cBitmap; - BITMAP bmBitmap; - - if (!cBitmap.Attach(LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(uToolBar), - IMAGE_BITMAP, 0, 0, - LR_DEFAULTSIZE|LR_CREATEDIBSECTION)) || - !cBitmap.GetBitmap(&bmBitmap)) - return FALSE; - - CSize cSize(bmBitmap.bmWidth, bmBitmap.bmHeight); - int nNbBtn = cSize.cx/nBtnWidth; - RGBTRIPLE* rgb = (RGBTRIPLE*)(bmBitmap.bmBits); - COLORREF rgbMask = RGB(rgb[0].rgbtRed, rgb[0].rgbtGreen, rgb[0].rgbtBlue); - - if (!cImageList.Create(nBtnWidth, cSize.cy, ILC_COLOR24|ILC_MASK, nNbBtn, 0)) - return FALSE; - - if (cImageList.Add(&cBitmap, rgbMask) == -1) - return FALSE; - - SendMessage(uToolBarType, 0, (LPARAM)cImageList.m_hImageList); - cImageList.Detach(); - cBitmap.Detach(); - - return TRUE; -} - -void CTrueColorToolBar::AddDropDownButton(CWnd* pParent, UINT uButtonID, UINT uMenuID) -{ - if (!m_bDropDown) { - GetToolBarCtrl().SendMessage(TB_SETEXTENDEDSTYLE, 0, (LPARAM)TBSTYLE_EX_DRAWDDARROWS); - m_bDropDown = TRUE; - } - - SetButtonStyle(CommandToIndex(uButtonID), TBSTYLE_DROPDOWN); - - stDropDownInfo DropDownInfo; - DropDownInfo.pParent = pParent; - DropDownInfo.uButtonID = uButtonID; - DropDownInfo.uMenuID = uMenuID; - m_lstDropDownButton.Add(DropDownInfo); -} - -void CTrueColorToolBar::OnToolbarDropDown(NMHDR* pnmhdr, LRESULT *plr) -{ - NMTOOLBAR* pnmtb = (NMTOOLBAR*) pnmhdr; - - for (int i = 0; i < m_lstDropDownButton.GetSize(); i++) - { - stDropDownInfo DropDownInfo = m_lstDropDownButton.GetAt(i); - - if (DropDownInfo.uButtonID == UINT(pnmtb->iItem)) - { - CMenu menu; - menu.LoadMenu(DropDownInfo.uMenuID); - CMenu* pPopup = menu.GetSubMenu(0); - - CRect rc; - SendMessage(TB_GETRECT, (WPARAM)pnmtb->iItem, (LPARAM)&rc); - ClientToScreen(&rc); - - pPopup->TrackPopupMenu(TPM_LEFTALIGN|TPM_LEFTBUTTON|TPM_VERTICAL, - rc.left, rc.bottom, DropDownInfo.pParent, &rc); - break; - } - } -} \ No newline at end of file diff --git a/SoundArranger/UI_ToolBar/TrueColorToolBar.h b/SoundArranger/UI_ToolBar/TrueColorToolBar.h deleted file mode 100644 index 2233e940..00000000 --- a/SoundArranger/UI_ToolBar/TrueColorToolBar.h +++ /dev/null @@ -1,88 +0,0 @@ -/***========================================================================= -==== ==== -==== D C U t i l i t y ==== -==== ==== -============================================================================= -==== ==== -==== File name : TrueColorToolBar.h ==== -==== Project name : Tester ==== -==== Project number : --- ==== -==== Creation date : 13/1/2003 ==== -==== Author(s) : Dany Cantin ==== -==== ==== -==== Copyright ?DCUtility 2003 ==== -==== ==== -============================================================================= -===========================================================================*/ - - -#ifndef TRUECOLORTOOLBAR_H_ -#define TRUECOLORTOOLBAR_H_ - -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - - -#include - -///////////////////////////////////////////////////////////////////////////// -// CTrueColorToolBar - -class CTrueColorToolBar : public CToolBar -{ -// Construction -public: - CTrueColorToolBar(); - -// Attributes -private: - BOOL m_bDropDown; - - struct stDropDownInfo { - public: - UINT uButtonID; - UINT uMenuID; - CWnd* pParent; - }; - - CArray m_lstDropDownButton; - -// Operations -public: - BOOL LoadTrueColorToolBar(int nBtnWidth, - UINT uToolBar, - UINT uToolBarHot = 0, - UINT uToolBarDisabled = 0); - - void AddDropDownButton(CWnd* pParent, UINT uButtonID, UINT uMenuID); - -private: - BOOL SetTrueColorToolBar(UINT uToolBarType, - UINT uToolBar, - int nBtnWidth); - -// Overrides - // ClassWizard generated virtual function overrides - //{{AFX_VIRTUAL(CTrueColorToolBar) - //}}AFX_VIRTUAL - -// Implementation -public: - virtual ~CTrueColorToolBar(); - - // Generated message map functions -protected: - //{{AFX_MSG(CTrueColorToolBar) - afx_msg void OnToolbarDropDown(NMHDR* pnmhdr, LRESULT* plRes); - //}}AFX_MSG - - DECLARE_MESSAGE_MAP() -}; - -///////////////////////////////////////////////////////////////////////////// - -//{{AFX_INSERT_LOCATION}} -// Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // TRUECOLORTOOLBAR_H_ diff --git a/SoundArranger/Util.cpp b/SoundArranger/Util.cpp deleted file mode 100644 index 5d5dd371..00000000 --- a/SoundArranger/Util.cpp +++ /dev/null @@ -1,49 +0,0 @@ -#include "StdAfx.h" -#include "Util.h" - -void CreateHighColorImageList(int iBitmapID, CImageList * pImageList) -{ - CBitmap Bitmap; - - HINSTANCE hInstance = ::AfxFindResourceHandle(MAKEINTRESOURCE(iBitmapID), RT_BITMAP); - HANDLE hImage = ::LoadImage(hInstance, MAKEINTRESOURCE(iBitmapID), IMAGE_BITMAP, 0, 0, (LR_DEFAULTSIZE | LR_CREATEDIBSECTION)); - Bitmap.Attach(hImage); - - // Replace - BITMAP bmInfo; - const RGBTRIPLE kBackgroundColor = {192, 192, 192}; - - VERIFY(Bitmap.GetBitmap(&bmInfo)); - - const UINT numPixels (bmInfo.bmHeight * bmInfo.bmWidth); - DIBSECTION ds; - - VERIFY (Bitmap.GetObject (sizeof (DIBSECTION), &ds) == sizeof (DIBSECTION)); - - RGBTRIPLE * pixels = reinterpret_cast(ds.dsBm.bmBits); - VERIFY (pixels != NULL); - - const COLORREF buttonColor (::GetSysColor(COLOR_BTNFACE)); - const RGBTRIPLE userBackgroundColor = { GetBValue (buttonColor), GetGValue (buttonColor), GetRValue (buttonColor) }; - - for (UINT i = 0; i < numPixels; ++i) - { - if (pixels [i].rgbtBlue == kBackgroundColor.rgbtBlue && - pixels [i].rgbtGreen == kBackgroundColor.rgbtGreen && - pixels [i].rgbtRed == kBackgroundColor.rgbtRed) - { - pixels [i] = userBackgroundColor; - } - } - - // Create - pImageList->Create(16, 16, ILC_COLOR24, 5, 0); - pImageList->Add(&Bitmap, RGB(0, 0, 0)); -} - -void SetDialogFloatText(HWND hWnd, int iID, float fData) -{ - char szString[64 + 1]; - _snprintf(szString, 64, "%.3f", fData); - SetDlgItemText(hWnd, iID, szString); -} diff --git a/SoundArranger/Util.h b/SoundArranger/Util.h deleted file mode 100644 index 1da4a707..00000000 --- a/SoundArranger/Util.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -extern void CreateHighColorImageList(int iBitmapID, CImageList * pImageList); -extern void SetDialogFloatText(HWND hWnd, int iID, float fData); diff --git a/SoundArranger/arrow.cur b/SoundArranger/arrow.cur deleted file mode 100644 index fb8c00f7..00000000 Binary files a/SoundArranger/arrow.cur and /dev/null differ diff --git a/SoundArranger/res/ModeToolBar.bmp b/SoundArranger/res/ModeToolBar.bmp deleted file mode 100644 index 93d5aa15..00000000 Binary files a/SoundArranger/res/ModeToolBar.bmp and /dev/null differ diff --git a/SoundArranger/res/ModelTreeItem.bmp b/SoundArranger/res/ModelTreeItem.bmp deleted file mode 100644 index 27cbdb7e..00000000 Binary files a/SoundArranger/res/ModelTreeItem.bmp and /dev/null differ diff --git a/SoundArranger/res/New_Sound.cur b/SoundArranger/res/New_Sound.cur deleted file mode 100644 index 0ca9487f..00000000 Binary files a/SoundArranger/res/New_Sound.cur and /dev/null differ diff --git a/SoundArranger/res/PlayToolBar.bmp b/SoundArranger/res/PlayToolBar.bmp deleted file mode 100644 index d177b424..00000000 Binary files a/SoundArranger/res/PlayToolBar.bmp and /dev/null differ diff --git a/SoundArranger/res/SoundArranger.ico b/SoundArranger/res/SoundArranger.ico deleted file mode 100644 index 8a84ca3d..00000000 Binary files a/SoundArranger/res/SoundArranger.ico and /dev/null differ diff --git a/SoundArranger/res/SoundArranger.manifest b/SoundArranger/res/SoundArranger.manifest deleted file mode 100644 index 686bd197..00000000 --- a/SoundArranger/res/SoundArranger.manifest +++ /dev/null @@ -1,22 +0,0 @@ - - - -ì—¬ê¸°ì— ì‘ìš© 프로그램 ì„¤ëª…ì„ ì¶”ê°€í•©ë‹ˆë‹¤. - - - - - - diff --git a/SoundArranger/res/SoundArranger.rc2 b/SoundArranger/res/SoundArranger.rc2 deleted file mode 100644 index bde33681..00000000 --- a/SoundArranger/res/SoundArranger.rc2 +++ /dev/null @@ -1,13 +0,0 @@ -// -// SoundArranger.RC2 - resources Microsoft Visual C++ì—ì„œ ì§ì ‘ 편집하지 않는 리소스 -// - -#ifdef APSTUDIO_INVOKED -#error this file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// ì—¬ê¸°ì— ìˆ˜ë™ìœ¼ë¡œ 편집한 리소스를 추가합니다.... - -///////////////////////////////////////////////////////////////////////////// diff --git a/SoundArranger/res/SoundArrangerDoc.ico b/SoundArranger/res/SoundArrangerDoc.ico deleted file mode 100644 index 2a1f1ae6..00000000 Binary files a/SoundArranger/res/SoundArrangerDoc.ico and /dev/null differ diff --git a/SoundArranger/res/SoundTreeItem.bmp b/SoundArranger/res/SoundTreeItem.bmp deleted file mode 100644 index 3ce20e3c..00000000 Binary files a/SoundArranger/res/SoundTreeItem.bmp and /dev/null differ diff --git a/SoundArranger/res/Toolbar.bmp b/SoundArranger/res/Toolbar.bmp deleted file mode 100644 index bb55fc1a..00000000 Binary files a/SoundArranger/res/Toolbar.bmp and /dev/null differ diff --git a/SoundArranger/res/WindowToolBar.bmp b/SoundArranger/res/WindowToolBar.bmp deleted file mode 100644 index a56a41ef..00000000 Binary files a/SoundArranger/res/WindowToolBar.bmp and /dev/null differ diff --git a/SoundArranger/res/WindowToolBar_Small.bmp b/SoundArranger/res/WindowToolBar_Small.bmp deleted file mode 100644 index adddbdd5..00000000 Binary files a/SoundArranger/res/WindowToolBar_Small.bmp and /dev/null differ diff --git a/SoundArranger/res/addsound.cur b/SoundArranger/res/addsound.cur deleted file mode 100644 index c185bcc3..00000000 Binary files a/SoundArranger/res/addsound.cur and /dev/null differ diff --git a/SoundArranger/res/change_sound.cur b/SoundArranger/res/change_sound.cur deleted file mode 100644 index 789cc1a4..00000000 Binary files a/SoundArranger/res/change_sound.cur and /dev/null differ diff --git a/SoundArranger/res/toolbar1.bmp b/SoundArranger/res/toolbar1.bmp deleted file mode 100644 index 2c949947..00000000 Binary files a/SoundArranger/res/toolbar1.bmp and /dev/null differ diff --git a/SoundArranger/res/viewmode.cur b/SoundArranger/res/viewmode.cur deleted file mode 100644 index 039eed89..00000000 Binary files a/SoundArranger/res/viewmode.cur and /dev/null differ diff --git a/SoundArranger/resource.h b/SoundArranger/resource.h deleted file mode 100644 index 32c39d33..00000000 --- a/SoundArranger/resource.h +++ /dev/null @@ -1,106 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by SoundArranger.rc -// -#define IDR_MANIFEST 1 -#define IDD_ABOUTBOX 100 -#define IDP_OLE_INIT_FAILED 100 -#define IDR_MAINFRAME 128 -#define IDR_SoundArrangerTYPE 129 -#define IDD_NEW_SOUNDDATA 130 -#define ID_ANIMATION_LOAD 132 -#define ID_APP_NEW 160 -#define IDB_TOOLBAR_DISABLED 163 -#define IDB_TOOLBAR 164 -#define IDB_TOOLBAR_HOT 165 -#define IDR_TOOLBAR 166 -#define ID_Menu 168 -#define ID_APP_LOAD_CHARACTER 169 -#define IDD_MOTION_LIST 170 -#define ID_Menu171 171 -#define ID_APP_SAVE_SOUND_DATA 172 -#define ID_APP_LOAD_SOUND_DATA 173 -#define IDD_SOUND_DATA 175 -#define IDR_MENU1 176 -#define ID_GRAPH_SUB_MENU 177 -#define ID_WORK_LOOP 178 -#define ID_DELETE_SOUND_DATA 179 -#define IDD_EVENT_LIST 182 -#define IDD_EVENT_SOUND_EDITOR 183 -#define IDD_SOUND_DATA_PROPERTY 184 -#define IDD_PAGE_SOUND_LIST 185 -#define IDC_ADD_SOUND 186 -#define IDC_VIEWMOVE 188 -#define IDD_PAGE_MOTION_PROPERTY 189 -#define IDC_CHANGE_SOUND 189 -#define IDR_TOOLBAR_WINDOW 190 -#define IDB_TOOLBAR_WINDOW 194 -#define IDD_DIALOG_MOTION_VIEW_MODE 195 -#define IDR_TOOLBAR_MODE 198 -#define IDB_SOUND_TREE_ITEM 200 -#define IDB_MODEL_TREE_ITEM 201 -#define IDC_SOUNDDATA_NAME 1001 -#define IDC_SOUNDDATA_MAKE 1002 -#define IDC_CANCEL 1003 -#define IDC_SOUNDDATA_SEARCH_AS 1004 -#define IDC_MOTION_NAME 1008 -#define IDC_SOUND_DATA_TIME 1009 -#define IDC_ABSTRACT_LIST 1009 -#define IDC_SOUND_DATA_NAME 1010 -#define IDC_DIRECT_FILE 1010 -#define IDC_ABSTRACT_FILE 1011 -#define IDC_SOUND_DATA_PERCENTAGE 1011 -#define IDC_ABSTRACT_SUB_LIST 1012 -#define IDC_EVENT_SOUND_FILE_NAME 1015 -#define IDC_EVENT_SOUND_EDIT 1016 -#define IDC_EVENT_SAVE 1019 -#define IDC_EVENT_SOUND_COMBO 1020 -#define IDC_EVENT_SOUND_EDITOR_FILE_NAME 1021 -#define IDC_EVENT_SOUND_EDITOR_SEARCH_AS 1022 -#define IDC_EVENT_SOUND_SUB_COMBO 1022 -#define IDC_EVENT_SOUND_EDITOR_ACCEPT 1023 -#define IDC_EVENT_SOUND_EDITOR_CANCEL 1024 -#define IDC_SOUNDDATA_PERCENTAGE 1024 -#define IDD_SOUND_DATA_PROPERTY_LIST 1025 -#define IDD_SOUND_DATA_PROPERTY_FILE_NAME 1026 -#define IDD_SOUND_DATA_PROPERTY_PLAY 1028 -#define IDC_SOUND_LIST 1029 -#define IDC_SOUND_PLAY 1030 -#define IDC_MOTION_PROPERTY_DESCRIPTION 1031 -#define IDC_SOUND_REFRESH 1031 -#define IDC_MOTION_PROPERTY_MODEL_NAME 1032 -#define IDC_MOTION_PROPERTY_MOTION_NAME 1033 -#define IDC_BASIS_MOTION_LIST 1034 -#define IDC_MOTION_PROPERTY_MOTION_TIME 1034 -#define IDC_RESERVE_MOTION_LIST 1035 -#define IDC_MOTION_PROPERTY_SHAPE_LIST 1036 -#define ID_TOOLBAR_REVERSE 32784 -#define ID_TOOLBAR_PLAY 32785 -#define ID_TOOLBAR_STOP 32786 -#define ID_TOOLBAR_PAUSE 32787 -#define ID_TOOLBAR_PLAYLOOP 32792 -#define ID_EDIT_SOUND_DATA 32793 -#define ID_APP_SAVE_EVENT_SOUND_DATA 32795 -#define ID_KEYBOARD_PLAY 32796 -#define ID_APP_LOAD_MODEL 32797 -#define ID_CANCEL_SOUND 32798 -#define ID_VIEW_MODEL_LIST 32799 -#define ID_VIEW_MOTION_LIST 32800 -#define ID_VIEW_MOTION_PROPERTY 32801 -#define ID_VIEW_SOUND_LIST 32802 -#define ID_WORK_MODE_EDIT 32808 -#define ID_WORK_MODE_VIEW 32809 -#define ID_WORK_SCREEN_SHOT_CAPTURE 32812 -#define ID_WORK_RELOAD_ALL_RESOURCE 32813 -#define ID_CHAR_VISIBLE_TOGGLE 32814 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 202 -#define _APS_NEXT_COMMAND_VALUE 32815 -#define _APS_NEXT_CONTROL_VALUE 1037 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/SpeedTreeLib/SpeedTreeLib_VC71.vcproj b/SpeedTreeLib/SpeedTreeLib_VC71.vcproj deleted file mode 100644 index d3f8d627..00000000 --- a/SpeedTreeLib/SpeedTreeLib_VC71.vcproj +++ /dev/null @@ -1,251 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SpeedTreeLib/SpeedTreeLib_VC80.vcproj b/SpeedTreeLib/SpeedTreeLib_VC80.vcproj deleted file mode 100644 index cab0b641..00000000 --- a/SpeedTreeLib/SpeedTreeLib_VC80.vcproj +++ /dev/null @@ -1,1032 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SpeedTreeLib/SpeedTreeLib_VC90.vcproj b/SpeedTreeLib/SpeedTreeLib_VC90.vcproj deleted file mode 100644 index a08f0999..00000000 --- a/SpeedTreeLib/SpeedTreeLib_VC90.vcproj +++ /dev/null @@ -1,1037 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SphereLib/SphereLib_VC71.vcproj b/SphereLib/SphereLib_VC71.vcproj deleted file mode 100644 index 494e7b23..00000000 --- a/SphereLib/SphereLib_VC71.vcproj +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SphereLib/SphereLib_VC80.vcproj b/SphereLib/SphereLib_VC80.vcproj deleted file mode 100644 index 29724f78..00000000 --- a/SphereLib/SphereLib_VC80.vcproj +++ /dev/null @@ -1,799 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SphereLib/SphereLib_VC90.vcproj b/SphereLib/SphereLib_VC90.vcproj deleted file mode 100644 index 2041453d..00000000 --- a/SphereLib/SphereLib_VC90.vcproj +++ /dev/null @@ -1,810 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/UserInterface/UserInterface_VC71.vcproj b/UserInterface/UserInterface_VC71.vcproj deleted file mode 100644 index b14ccbce..00000000 --- a/UserInterface/UserInterface_VC71.vcproj +++ /dev/null @@ -1,1131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/UserInterface/UserInterface_VC90.vcproj b/UserInterface/UserInterface_VC90.vcproj deleted file mode 100644 index b041e8ca..00000000 --- a/UserInterface/UserInterface_VC90.vcproj +++ /dev/null @@ -1,1716 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CWebBrowser/CWebBrowser.c b/src/CWebBrowser/CWebBrowser.c similarity index 100% rename from CWebBrowser/CWebBrowser.c rename to src/CWebBrowser/CWebBrowser.c diff --git a/CWebBrowser/CWebBrowser.h b/src/CWebBrowser/CWebBrowser.h similarity index 100% rename from CWebBrowser/CWebBrowser.h rename to src/CWebBrowser/CWebBrowser.h diff --git a/CWebBrowser/CWebBrowser_VC90.vcxproj b/src/CWebBrowser/CWebBrowser.vcxproj similarity index 95% rename from CWebBrowser/CWebBrowser_VC90.vcxproj rename to src/CWebBrowser/CWebBrowser.vcxproj index f01c0f3a..71175b93 100644 --- a/CWebBrowser/CWebBrowser_VC90.vcxproj +++ b/src/CWebBrowser/CWebBrowser.vcxproj @@ -23,8 +23,7 @@ SAK SAK SAK - - + 10.0 @@ -35,9 +34,9 @@ StaticLibrary - v143 false MultiByte + v143 StaticLibrary @@ -65,25 +64,25 @@ <_ProjectFileVersion>17.0.32203.90 - .\Debug\ - .\Debug\ + $(SolutionDir)build\$(Configuration)\ - .\Release\ - .\Release\ + $(SolutionDir)build\$(Configuration)\ - .\Distribute\ - .\Distribute\ + $(SolutionDir)build\$(Configuration)\ true + $(Configuration) true + $(Configuration) true + $(Configuration) @@ -107,7 +106,6 @@ 0x0412 - .\Debug\CWebBrowser.lib true @@ -135,7 +133,6 @@ 0x0412 - .\Release\CWebBrowser.lib true @@ -163,7 +160,6 @@ 0x0412 - .\Distribute\CWebBrowser.lib true diff --git a/EffectLib/EffectData.cpp b/src/EffectLib/EffectData.cpp similarity index 100% rename from EffectLib/EffectData.cpp rename to src/EffectLib/EffectData.cpp diff --git a/EffectLib/EffectData.h b/src/EffectLib/EffectData.h similarity index 100% rename from EffectLib/EffectData.h rename to src/EffectLib/EffectData.h diff --git a/EffectLib/EffectElementBase.cpp b/src/EffectLib/EffectElementBase.cpp similarity index 100% rename from EffectLib/EffectElementBase.cpp rename to src/EffectLib/EffectElementBase.cpp diff --git a/EffectLib/EffectElementBase.h b/src/EffectLib/EffectElementBase.h similarity index 100% rename from EffectLib/EffectElementBase.h rename to src/EffectLib/EffectElementBase.h diff --git a/EffectLib/EffectElementBaseInstance.cpp b/src/EffectLib/EffectElementBaseInstance.cpp similarity index 100% rename from EffectLib/EffectElementBaseInstance.cpp rename to src/EffectLib/EffectElementBaseInstance.cpp diff --git a/EffectLib/EffectElementBaseInstance.h b/src/EffectLib/EffectElementBaseInstance.h similarity index 100% rename from EffectLib/EffectElementBaseInstance.h rename to src/EffectLib/EffectElementBaseInstance.h diff --git a/EffectLib/EffectInstance.cpp b/src/EffectLib/EffectInstance.cpp similarity index 100% rename from EffectLib/EffectInstance.cpp rename to src/EffectLib/EffectInstance.cpp diff --git a/EffectLib/EffectInstance.h b/src/EffectLib/EffectInstance.h similarity index 100% rename from EffectLib/EffectInstance.h rename to src/EffectLib/EffectInstance.h diff --git a/EffectLib/EffectLib_VC90.vcxproj b/src/EffectLib/EffectLib.vcxproj similarity index 98% rename from EffectLib/EffectLib_VC90.vcxproj rename to src/EffectLib/EffectLib.vcxproj index 6be6bc44..24a93e63 100644 --- a/EffectLib/EffectLib_VC90.vcxproj +++ b/src/EffectLib/EffectLib.vcxproj @@ -36,8 +36,7 @@ SAK SAK MFCProj - - + 10.0 @@ -60,9 +59,9 @@ StaticLibrary - v143 false MultiByte + v143 StaticLibrary @@ -108,37 +107,34 @@ <_ProjectFileVersion>17.0.32203.90 - .\VTune\ - .\VTune\ + $(SolutionDir)build\$(Configuration)\ - .\EffectLib___Win32_MfcDebug\ - .\EffectLib___Win32_MfcDebug\ + $(SolutionDir)build\$(Configuration)\ - .\Release\ - .\Release\ + $(SolutionDir)build\$(Configuration)\ - .\Debug\ - .\Debug\ + $(SolutionDir)build\$(Configuration)\ - .\Distribute\ - .\Distribute\ + $(SolutionDir)build\$(Configuration)\ - .\EffectLib___Win32_MfcRelease\ - .\EffectLib___Win32_MfcRelease\ + $(SolutionDir)build\$(Configuration)\ true + $(Configuration) true + $(Configuration) true + $(Configuration) @@ -229,7 +225,6 @@ 0x0412 - .\Release\EffectLib.lib true @@ -258,7 +253,6 @@ 0x0412 - .\Debug\EffectLib.lib true @@ -290,7 +284,6 @@ 0x0412 - .\Distribute\EffectLib.lib true diff --git a/EffectLib/EffectLib_VC90.vcxproj.filters b/src/EffectLib/EffectLib.vcxproj.filters similarity index 100% rename from EffectLib/EffectLib_VC90.vcxproj.filters rename to src/EffectLib/EffectLib.vcxproj.filters diff --git a/EffectLib/EffectManager.cpp b/src/EffectLib/EffectManager.cpp similarity index 100% rename from EffectLib/EffectManager.cpp rename to src/EffectLib/EffectManager.cpp diff --git a/EffectLib/EffectManager.h b/src/EffectLib/EffectManager.h similarity index 100% rename from EffectLib/EffectManager.h rename to src/EffectLib/EffectManager.h diff --git a/EffectLib/EffectMesh.cpp b/src/EffectLib/EffectMesh.cpp similarity index 100% rename from EffectLib/EffectMesh.cpp rename to src/EffectLib/EffectMesh.cpp diff --git a/EffectLib/EffectMesh.h b/src/EffectLib/EffectMesh.h similarity index 100% rename from EffectLib/EffectMesh.h rename to src/EffectLib/EffectMesh.h diff --git a/EffectLib/EffectMeshInstance.cpp b/src/EffectLib/EffectMeshInstance.cpp similarity index 100% rename from EffectLib/EffectMeshInstance.cpp rename to src/EffectLib/EffectMeshInstance.cpp diff --git a/EffectLib/EffectMeshInstance.h b/src/EffectLib/EffectMeshInstance.h similarity index 100% rename from EffectLib/EffectMeshInstance.h rename to src/EffectLib/EffectMeshInstance.h diff --git a/EffectLib/EffectUpdateDecorator.cpp b/src/EffectLib/EffectUpdateDecorator.cpp similarity index 100% rename from EffectLib/EffectUpdateDecorator.cpp rename to src/EffectLib/EffectUpdateDecorator.cpp diff --git a/EffectLib/EffectUpdateDecorator.h b/src/EffectLib/EffectUpdateDecorator.h similarity index 100% rename from EffectLib/EffectUpdateDecorator.h rename to src/EffectLib/EffectUpdateDecorator.h diff --git a/EffectLib/EmitterProperty.cpp b/src/EffectLib/EmitterProperty.cpp similarity index 100% rename from EffectLib/EmitterProperty.cpp rename to src/EffectLib/EmitterProperty.cpp diff --git a/EffectLib/EmitterProperty.h b/src/EffectLib/EmitterProperty.h similarity index 100% rename from EffectLib/EmitterProperty.h rename to src/EffectLib/EmitterProperty.h diff --git a/EffectLib/FrameController.cpp b/src/EffectLib/FrameController.cpp similarity index 100% rename from EffectLib/FrameController.cpp rename to src/EffectLib/FrameController.cpp diff --git a/EffectLib/FrameController.h b/src/EffectLib/FrameController.h similarity index 100% rename from EffectLib/FrameController.h rename to src/EffectLib/FrameController.h diff --git a/EffectLib/ParticleInstance.cpp b/src/EffectLib/ParticleInstance.cpp similarity index 100% rename from EffectLib/ParticleInstance.cpp rename to src/EffectLib/ParticleInstance.cpp diff --git a/EffectLib/ParticleInstance.h b/src/EffectLib/ParticleInstance.h similarity index 100% rename from EffectLib/ParticleInstance.h rename to src/EffectLib/ParticleInstance.h diff --git a/EffectLib/ParticleProperty.cpp b/src/EffectLib/ParticleProperty.cpp similarity index 100% rename from EffectLib/ParticleProperty.cpp rename to src/EffectLib/ParticleProperty.cpp diff --git a/EffectLib/ParticleProperty.h b/src/EffectLib/ParticleProperty.h similarity index 100% rename from EffectLib/ParticleProperty.h rename to src/EffectLib/ParticleProperty.h diff --git a/EffectLib/ParticleSystemData.cpp b/src/EffectLib/ParticleSystemData.cpp similarity index 100% rename from EffectLib/ParticleSystemData.cpp rename to src/EffectLib/ParticleSystemData.cpp diff --git a/EffectLib/ParticleSystemData.h b/src/EffectLib/ParticleSystemData.h similarity index 100% rename from EffectLib/ParticleSystemData.h rename to src/EffectLib/ParticleSystemData.h diff --git a/EffectLib/ParticleSystemInstance.cpp b/src/EffectLib/ParticleSystemInstance.cpp similarity index 100% rename from EffectLib/ParticleSystemInstance.cpp rename to src/EffectLib/ParticleSystemInstance.cpp diff --git a/EffectLib/ParticleSystemInstance.h b/src/EffectLib/ParticleSystemInstance.h similarity index 100% rename from EffectLib/ParticleSystemInstance.h rename to src/EffectLib/ParticleSystemInstance.h diff --git a/EffectLib/SimpleLightData.cpp b/src/EffectLib/SimpleLightData.cpp similarity index 100% rename from EffectLib/SimpleLightData.cpp rename to src/EffectLib/SimpleLightData.cpp diff --git a/EffectLib/SimpleLightData.h b/src/EffectLib/SimpleLightData.h similarity index 100% rename from EffectLib/SimpleLightData.h rename to src/EffectLib/SimpleLightData.h diff --git a/EffectLib/SimpleLightInstance.cpp b/src/EffectLib/SimpleLightInstance.cpp similarity index 100% rename from EffectLib/SimpleLightInstance.cpp rename to src/EffectLib/SimpleLightInstance.cpp diff --git a/EffectLib/SimpleLightInstance.h b/src/EffectLib/SimpleLightInstance.h similarity index 100% rename from EffectLib/SimpleLightInstance.h rename to src/EffectLib/SimpleLightInstance.h diff --git a/EffectLib/StdAfx.cpp b/src/EffectLib/StdAfx.cpp similarity index 100% rename from EffectLib/StdAfx.cpp rename to src/EffectLib/StdAfx.cpp diff --git a/EffectLib/StdAfx.h b/src/EffectLib/StdAfx.h similarity index 100% rename from EffectLib/StdAfx.h rename to src/EffectLib/StdAfx.h diff --git a/EffectLib/Type.cpp b/src/EffectLib/Type.cpp similarity index 100% rename from EffectLib/Type.cpp rename to src/EffectLib/Type.cpp diff --git a/EffectLib/Type.h b/src/EffectLib/Type.h similarity index 100% rename from EffectLib/Type.h rename to src/EffectLib/Type.h diff --git a/EterBase/CPostIt.cpp b/src/EterBase/CPostIt.cpp similarity index 100% rename from EterBase/CPostIt.cpp rename to src/EterBase/CPostIt.cpp diff --git a/EterBase/CPostIt.h b/src/EterBase/CPostIt.h similarity index 100% rename from EterBase/CPostIt.h rename to src/EterBase/CPostIt.h diff --git a/EterBase/CRC32.cpp b/src/EterBase/CRC32.cpp similarity index 100% rename from EterBase/CRC32.cpp rename to src/EterBase/CRC32.cpp diff --git a/EterBase/CRC32.h b/src/EterBase/CRC32.h similarity index 100% rename from EterBase/CRC32.h rename to src/EterBase/CRC32.h diff --git a/EterBase/Debug.cpp b/src/EterBase/Debug.cpp similarity index 100% rename from EterBase/Debug.cpp rename to src/EterBase/Debug.cpp diff --git a/EterBase/Debug.h b/src/EterBase/Debug.h similarity index 100% rename from EterBase/Debug.h rename to src/EterBase/Debug.h diff --git a/EterBase/eterBase_VC90.vcxproj b/src/EterBase/EterBase.vcxproj similarity index 95% rename from EterBase/eterBase_VC90.vcxproj rename to src/EterBase/EterBase.vcxproj index dae6533e..892048bd 100644 --- a/EterBase/eterBase_VC90.vcxproj +++ b/src/EterBase/EterBase.vcxproj @@ -28,16 +28,15 @@ 17.0 - eterBase + EterBase {678C47DC-B3EF-460E-A932-56F3208FC65E} - eterBase + EterBase SAK SAK SAK SAK MFCProj - - + 10.0 @@ -48,9 +47,9 @@ StaticLibrary - v143 false MultiByte + v143 StaticLibrary @@ -108,37 +107,34 @@ <_ProjectFileVersion>17.0.32203.90 - .\Debug\ - .\Debug\ + $(SolutionDir)build\$(Configuration)\ - .\Distribute\ - .\Distribute\ + $(SolutionDir)build\$(Configuration)\ - .\MfcRelease\ - .\MfcRelease\ + $(SolutionDir)build\$(Configuration)\ - .\MfcDebug\ - .\MfcDebug\ + $(SolutionDir)build\$(Configuration)\ - .\Release\ - .\Release\ + $(SolutionDir)build\$(Configuration)\ - .\VTune\ - .\VTune\ + $(SolutionDir)build\$(Configuration)\ true + $(Configuration) true + $(Configuration) true + $(Configuration) @@ -164,7 +160,6 @@ true - .\Debug\eterBase.lib ../../../extern/lib;%(AdditionalLibraryDirectories) true @@ -195,8 +190,7 @@ 0x0412 - .\Distribute\eterBase.lib - ../../extern/lib;%(AdditionalLibraryDirectories) + $(SolutionDir)Extern\lib;%(AdditionalLibraryDirectories) true @@ -282,7 +276,6 @@ 0x0412 - .\Release\eterBase.lib ../../extern/lib;%(AdditionalLibraryDirectories) true diff --git a/EterBase/eterBase_VC90.vcxproj.filters b/src/EterBase/EterBase.vcxproj.filters similarity index 100% rename from EterBase/eterBase_VC90.vcxproj.filters rename to src/EterBase/EterBase.vcxproj.filters diff --git a/EterBase/FileBase.cpp b/src/EterBase/FileBase.cpp similarity index 100% rename from EterBase/FileBase.cpp rename to src/EterBase/FileBase.cpp diff --git a/EterBase/FileBase.h b/src/EterBase/FileBase.h similarity index 100% rename from EterBase/FileBase.h rename to src/EterBase/FileBase.h diff --git a/EterBase/FileDir.cpp b/src/EterBase/FileDir.cpp similarity index 100% rename from EterBase/FileDir.cpp rename to src/EterBase/FileDir.cpp diff --git a/EterBase/FileDir.h b/src/EterBase/FileDir.h similarity index 100% rename from EterBase/FileDir.h rename to src/EterBase/FileDir.h diff --git a/EterBase/FileLoader.cpp b/src/EterBase/FileLoader.cpp similarity index 100% rename from EterBase/FileLoader.cpp rename to src/EterBase/FileLoader.cpp diff --git a/EterBase/FileLoader.h b/src/EterBase/FileLoader.h similarity index 100% rename from EterBase/FileLoader.h rename to src/EterBase/FileLoader.h diff --git a/EterBase/Filename.h b/src/EterBase/Filename.h similarity index 100% rename from EterBase/Filename.h rename to src/EterBase/Filename.h diff --git a/EterBase/MappedFile.cpp b/src/EterBase/MappedFile.cpp similarity index 100% rename from EterBase/MappedFile.cpp rename to src/EterBase/MappedFile.cpp diff --git a/EterBase/MappedFile.h b/src/EterBase/MappedFile.h similarity index 100% rename from EterBase/MappedFile.h rename to src/EterBase/MappedFile.h diff --git a/EterBase/Poly/Base.cpp b/src/EterBase/Poly/Base.cpp similarity index 100% rename from EterBase/Poly/Base.cpp rename to src/EterBase/Poly/Base.cpp diff --git a/EterBase/Poly/Base.h b/src/EterBase/Poly/Base.h similarity index 100% rename from EterBase/Poly/Base.h rename to src/EterBase/Poly/Base.h diff --git a/EterBase/Poly/Poly.cpp b/src/EterBase/Poly/Poly.cpp similarity index 100% rename from EterBase/Poly/Poly.cpp rename to src/EterBase/Poly/Poly.cpp diff --git a/EterBase/Poly/Poly.h b/src/EterBase/Poly/Poly.h similarity index 100% rename from EterBase/Poly/Poly.h rename to src/EterBase/Poly/Poly.h diff --git a/EterBase/Poly/SymTable.cpp b/src/EterBase/Poly/SymTable.cpp similarity index 100% rename from EterBase/Poly/SymTable.cpp rename to src/EterBase/Poly/SymTable.cpp diff --git a/EterBase/Poly/SymTable.h b/src/EterBase/Poly/SymTable.h similarity index 100% rename from EterBase/Poly/SymTable.h rename to src/EterBase/Poly/SymTable.h diff --git a/EterBase/Poly/Symbol.cpp b/src/EterBase/Poly/Symbol.cpp similarity index 100% rename from EterBase/Poly/Symbol.cpp rename to src/EterBase/Poly/Symbol.cpp diff --git a/EterBase/Poly/Symbol.h b/src/EterBase/Poly/Symbol.h similarity index 100% rename from EterBase/Poly/Symbol.h rename to src/EterBase/Poly/Symbol.h diff --git a/EterBase/Random.cpp b/src/EterBase/Random.cpp similarity index 100% rename from EterBase/Random.cpp rename to src/EterBase/Random.cpp diff --git a/EterBase/Random.h b/src/EterBase/Random.h similarity index 100% rename from EterBase/Random.h rename to src/EterBase/Random.h diff --git a/EterBase/ServiceDefs.h b/src/EterBase/ServiceDefs.h similarity index 100% rename from EterBase/ServiceDefs.h rename to src/EterBase/ServiceDefs.h diff --git a/EterBase/Singleton.h b/src/EterBase/Singleton.h similarity index 100% rename from EterBase/Singleton.h rename to src/EterBase/Singleton.h diff --git a/EterBase/StdAfx.cpp b/src/EterBase/StdAfx.cpp similarity index 100% rename from EterBase/StdAfx.cpp rename to src/EterBase/StdAfx.cpp diff --git a/EterBase/StdAfx.h b/src/EterBase/StdAfx.h similarity index 100% rename from EterBase/StdAfx.h rename to src/EterBase/StdAfx.h diff --git a/EterBase/Stl.cpp b/src/EterBase/Stl.cpp similarity index 100% rename from EterBase/Stl.cpp rename to src/EterBase/Stl.cpp diff --git a/EterBase/Stl.h b/src/EterBase/Stl.h similarity index 100% rename from EterBase/Stl.h rename to src/EterBase/Stl.h diff --git a/EterBase/TempFile.cpp b/src/EterBase/TempFile.cpp similarity index 100% rename from EterBase/TempFile.cpp rename to src/EterBase/TempFile.cpp diff --git a/EterBase/TempFile.h b/src/EterBase/TempFile.h similarity index 100% rename from EterBase/TempFile.h rename to src/EterBase/TempFile.h diff --git a/EterBase/Timer.cpp b/src/EterBase/Timer.cpp similarity index 100% rename from EterBase/Timer.cpp rename to src/EterBase/Timer.cpp diff --git a/EterBase/Timer.h b/src/EterBase/Timer.h similarity index 100% rename from EterBase/Timer.h rename to src/EterBase/Timer.h diff --git a/EterBase/Utils.cpp b/src/EterBase/Utils.cpp similarity index 100% rename from EterBase/Utils.cpp rename to src/EterBase/Utils.cpp diff --git a/EterBase/Utils.h b/src/EterBase/Utils.h similarity index 100% rename from EterBase/Utils.h rename to src/EterBase/Utils.h diff --git a/EterBase/error.cpp b/src/EterBase/error.cpp similarity index 100% rename from EterBase/error.cpp rename to src/EterBase/error.cpp diff --git a/EterBase/error.h b/src/EterBase/error.h similarity index 100% rename from EterBase/error.h rename to src/EterBase/error.h diff --git a/EterBase/lzo.cpp b/src/EterBase/lzo.cpp similarity index 100% rename from EterBase/lzo.cpp rename to src/EterBase/lzo.cpp diff --git a/EterBase/lzo.h b/src/EterBase/lzo.h similarity index 100% rename from EterBase/lzo.h rename to src/EterBase/lzo.h diff --git a/EterBase/tea.cpp b/src/EterBase/tea.cpp similarity index 100% rename from EterBase/tea.cpp rename to src/EterBase/tea.cpp diff --git a/EterBase/tea.h b/src/EterBase/tea.h similarity index 100% rename from EterBase/tea.h rename to src/EterBase/tea.h diff --git a/EterBase/vk.h b/src/EterBase/vk.h similarity index 100% rename from EterBase/vk.h rename to src/EterBase/vk.h diff --git a/EterGrnLib/eterGrnLib_VC90.vcxproj b/src/EterGrnLib/EterGrnLib.vcxproj similarity index 97% rename from EterGrnLib/eterGrnLib_VC90.vcxproj rename to src/EterGrnLib/EterGrnLib.vcxproj index 73449804..7a814f71 100644 --- a/EterGrnLib/eterGrnLib_VC90.vcxproj +++ b/src/EterGrnLib/EterGrnLib.vcxproj @@ -28,23 +28,22 @@ 17.0 - eterGrnLib + EterGrnLib {E1FF7630-628F-4AD0-BF66-F14D86A04035} - eterGrnLib + EterGrnLib SAK SAK SAK SAK MFCProj - - + 10.0 StaticLibrary - v143 false MultiByte + v143 StaticLibrary @@ -108,37 +107,34 @@ <_ProjectFileVersion>17.0.32203.90 - .\Debug\ - .\Debug\ + $(SolutionDir)build\$(Configuration)\ - .\Distribute\ - .\Distribute\ + $(SolutionDir)build\$(Configuration)\ - .\MfcRelease\ - .\MfcRelease\ + $(SolutionDir)build\$(Configuration)\ - .\VTune\ - .\VTune\ + $(SolutionDir)build\$(Configuration)\ - .\MfcDebug\ - .\MfcDebug\ + $(SolutionDir)build\$(Configuration)\ - .\Release\ - .\Release\ + $(SolutionDir)build\$(Configuration)\ true + $(Configuration) true + $(Configuration) true + $(Configuration) @@ -166,7 +162,6 @@ true - .\Debug\eterGrnLib.lib true @@ -196,7 +191,6 @@ 0x0412 - .\Distribute\eterGrnLib.lib true @@ -316,7 +310,6 @@ 0x0412 - .\Release\eterGrnLib.lib true diff --git a/EterGrnLib/eterGrnLib_VC90.vcxproj.filters b/src/EterGrnLib/EterGrnLib.vcxproj.filters similarity index 100% rename from EterGrnLib/eterGrnLib_VC90.vcxproj.filters rename to src/EterGrnLib/EterGrnLib.vcxproj.filters diff --git a/EterGrnLib/LODController.cpp b/src/EterGrnLib/LODController.cpp similarity index 100% rename from EterGrnLib/LODController.cpp rename to src/EterGrnLib/LODController.cpp diff --git a/EterGrnLib/LODController.h b/src/EterGrnLib/LODController.h similarity index 100% rename from EterGrnLib/LODController.h rename to src/EterGrnLib/LODController.h diff --git a/EterGrnLib/Material.cpp b/src/EterGrnLib/Material.cpp similarity index 100% rename from EterGrnLib/Material.cpp rename to src/EterGrnLib/Material.cpp diff --git a/EterGrnLib/Material.h b/src/EterGrnLib/Material.h similarity index 100% rename from EterGrnLib/Material.h rename to src/EterGrnLib/Material.h diff --git a/EterGrnLib/Mesh.cpp b/src/EterGrnLib/Mesh.cpp similarity index 100% rename from EterGrnLib/Mesh.cpp rename to src/EterGrnLib/Mesh.cpp diff --git a/EterGrnLib/Mesh.h b/src/EterGrnLib/Mesh.h similarity index 100% rename from EterGrnLib/Mesh.h rename to src/EterGrnLib/Mesh.h diff --git a/EterGrnLib/Model.cpp b/src/EterGrnLib/Model.cpp similarity index 100% rename from EterGrnLib/Model.cpp rename to src/EterGrnLib/Model.cpp diff --git a/EterGrnLib/Model.h b/src/EterGrnLib/Model.h similarity index 100% rename from EterGrnLib/Model.h rename to src/EterGrnLib/Model.h diff --git a/EterGrnLib/ModelInstance.cpp b/src/EterGrnLib/ModelInstance.cpp similarity index 100% rename from EterGrnLib/ModelInstance.cpp rename to src/EterGrnLib/ModelInstance.cpp diff --git a/EterGrnLib/ModelInstance.h b/src/EterGrnLib/ModelInstance.h similarity index 100% rename from EterGrnLib/ModelInstance.h rename to src/EterGrnLib/ModelInstance.h diff --git a/EterGrnLib/ModelInstanceCollisionDetection.cpp b/src/EterGrnLib/ModelInstanceCollisionDetection.cpp similarity index 100% rename from EterGrnLib/ModelInstanceCollisionDetection.cpp rename to src/EterGrnLib/ModelInstanceCollisionDetection.cpp diff --git a/EterGrnLib/ModelInstanceModel.cpp b/src/EterGrnLib/ModelInstanceModel.cpp similarity index 100% rename from EterGrnLib/ModelInstanceModel.cpp rename to src/EterGrnLib/ModelInstanceModel.cpp diff --git a/EterGrnLib/ModelInstanceMotion.cpp b/src/EterGrnLib/ModelInstanceMotion.cpp similarity index 100% rename from EterGrnLib/ModelInstanceMotion.cpp rename to src/EterGrnLib/ModelInstanceMotion.cpp diff --git a/EterGrnLib/ModelInstanceRender.cpp b/src/EterGrnLib/ModelInstanceRender.cpp similarity index 100% rename from EterGrnLib/ModelInstanceRender.cpp rename to src/EterGrnLib/ModelInstanceRender.cpp diff --git a/EterGrnLib/ModelInstanceUpdate.cpp b/src/EterGrnLib/ModelInstanceUpdate.cpp similarity index 100% rename from EterGrnLib/ModelInstanceUpdate.cpp rename to src/EterGrnLib/ModelInstanceUpdate.cpp diff --git a/EterGrnLib/Motion.cpp b/src/EterGrnLib/Motion.cpp similarity index 100% rename from EterGrnLib/Motion.cpp rename to src/EterGrnLib/Motion.cpp diff --git a/EterGrnLib/Motion.h b/src/EterGrnLib/Motion.h similarity index 100% rename from EterGrnLib/Motion.h rename to src/EterGrnLib/Motion.h diff --git a/EterGrnLib/StdAfx.cpp b/src/EterGrnLib/StdAfx.cpp similarity index 100% rename from EterGrnLib/StdAfx.cpp rename to src/EterGrnLib/StdAfx.cpp diff --git a/EterGrnLib/StdAfx.h b/src/EterGrnLib/StdAfx.h similarity index 100% rename from EterGrnLib/StdAfx.h rename to src/EterGrnLib/StdAfx.h diff --git a/EterGrnLib/Thing.cpp b/src/EterGrnLib/Thing.cpp similarity index 100% rename from EterGrnLib/Thing.cpp rename to src/EterGrnLib/Thing.cpp diff --git a/EterGrnLib/Thing.h b/src/EterGrnLib/Thing.h similarity index 100% rename from EterGrnLib/Thing.h rename to src/EterGrnLib/Thing.h diff --git a/EterGrnLib/ThingInstance.cpp b/src/EterGrnLib/ThingInstance.cpp similarity index 100% rename from EterGrnLib/ThingInstance.cpp rename to src/EterGrnLib/ThingInstance.cpp diff --git a/EterGrnLib/ThingInstance.h b/src/EterGrnLib/ThingInstance.h similarity index 100% rename from EterGrnLib/ThingInstance.h rename to src/EterGrnLib/ThingInstance.h diff --git a/EterGrnLib/Util.cpp b/src/EterGrnLib/Util.cpp similarity index 100% rename from EterGrnLib/Util.cpp rename to src/EterGrnLib/Util.cpp diff --git a/EterGrnLib/Util.h b/src/EterGrnLib/Util.h similarity index 100% rename from EterGrnLib/Util.h rename to src/EterGrnLib/Util.h diff --git a/EterImageLib/DXTCImage.cpp b/src/EterImageLib/DXTCImage.cpp similarity index 100% rename from EterImageLib/DXTCImage.cpp rename to src/EterImageLib/DXTCImage.cpp diff --git a/EterImageLib/DXTCImage.h b/src/EterImageLib/DXTCImage.h similarity index 100% rename from EterImageLib/DXTCImage.h rename to src/EterImageLib/DXTCImage.h diff --git a/EterImageLib/eterImageLib_VC90.vcxproj b/src/EterImageLib/EterImageLib.vcxproj similarity index 96% rename from EterImageLib/eterImageLib_VC90.vcxproj rename to src/EterImageLib/EterImageLib.vcxproj index 835357d4..11a6c230 100644 --- a/EterImageLib/eterImageLib_VC90.vcxproj +++ b/src/EterImageLib/EterImageLib.vcxproj @@ -28,16 +28,15 @@ 17.0 - eterImageLib + EterImageLib {FE95382C-8E3E-40AC-8060-634D1A0D4CF5} - eterImageLib + EterImageLib SAK SAK SAK SAK MFCProj - - + 10.0 @@ -48,9 +47,9 @@ StaticLibrary - v143 false MultiByte + v143 StaticLibrary @@ -108,37 +107,34 @@ <_ProjectFileVersion>17.0.32203.90 - .\Distribute\ - .\Distribute\ + $(SolutionDir)build\$(Configuration)\ - .\MfcRelease\ - .\MfcRelease\ + $(SolutionDir)build\$(Configuration)\ - .\MfcDebug\ - .\MfcDebug\ + $(SolutionDir)build\$(Configuration)\ - .\Debug\ - .\Debug\ + $(SolutionDir)build\$(Configuration)\ - .\Release\ - .\Release\ + $(SolutionDir)build\$(Configuration)\ - .\VTune\ - .\VTune\ + $(SolutionDir)build\$(Configuration)\ true + $(Configuration) true + $(Configuration) true + $(Configuration) @@ -166,7 +162,6 @@ 0x0412 - .\Distribute\eterImageLib.lib true @@ -249,7 +244,6 @@ true - .\Debug\eterImageLib.lib true @@ -278,7 +272,6 @@ 0x0412 - .\Release\eterImageLib.lib true diff --git a/EterImageLib/eterImageLib_VC90.vcxproj.filters b/src/EterImageLib/EterImageLib.vcxproj.filters similarity index 100% rename from EterImageLib/eterImageLib_VC90.vcxproj.filters rename to src/EterImageLib/EterImageLib.vcxproj.filters diff --git a/EterImageLib/Image.cpp b/src/EterImageLib/Image.cpp similarity index 100% rename from EterImageLib/Image.cpp rename to src/EterImageLib/Image.cpp diff --git a/EterImageLib/Image.h b/src/EterImageLib/Image.h similarity index 100% rename from EterImageLib/Image.h rename to src/EterImageLib/Image.h diff --git a/EterImageLib/StdAfx.cpp b/src/EterImageLib/StdAfx.cpp similarity index 100% rename from EterImageLib/StdAfx.cpp rename to src/EterImageLib/StdAfx.cpp diff --git a/EterImageLib/StdAfx.h b/src/EterImageLib/StdAfx.h similarity index 100% rename from EterImageLib/StdAfx.h rename to src/EterImageLib/StdAfx.h diff --git a/EterImageLib/TGAImage.cpp b/src/EterImageLib/TGAImage.cpp similarity index 100% rename from EterImageLib/TGAImage.cpp rename to src/EterImageLib/TGAImage.cpp diff --git a/EterImageLib/TGAImage.h b/src/EterImageLib/TGAImage.h similarity index 100% rename from EterImageLib/TGAImage.h rename to src/EterImageLib/TGAImage.h diff --git a/EterLib/AttributeData.cpp b/src/EterLib/AttributeData.cpp similarity index 100% rename from EterLib/AttributeData.cpp rename to src/EterLib/AttributeData.cpp diff --git a/EterLib/AttributeData.h b/src/EterLib/AttributeData.h similarity index 100% rename from EterLib/AttributeData.h rename to src/EterLib/AttributeData.h diff --git a/EterLib/AttributeInstance.cpp b/src/EterLib/AttributeInstance.cpp similarity index 100% rename from EterLib/AttributeInstance.cpp rename to src/EterLib/AttributeInstance.cpp diff --git a/EterLib/AttributeInstance.h b/src/EterLib/AttributeInstance.h similarity index 100% rename from EterLib/AttributeInstance.h rename to src/EterLib/AttributeInstance.h diff --git a/EterLib/BlockTexture.cpp b/src/EterLib/BlockTexture.cpp similarity index 100% rename from EterLib/BlockTexture.cpp rename to src/EterLib/BlockTexture.cpp diff --git a/EterLib/BlockTexture.h b/src/EterLib/BlockTexture.h similarity index 100% rename from EterLib/BlockTexture.h rename to src/EterLib/BlockTexture.h diff --git a/EterLib/Camera.cpp b/src/EterLib/Camera.cpp similarity index 100% rename from EterLib/Camera.cpp rename to src/EterLib/Camera.cpp diff --git a/EterLib/Camera.h b/src/EterLib/Camera.h similarity index 100% rename from EterLib/Camera.h rename to src/EterLib/Camera.h diff --git a/EterLib/CollisionData.cpp b/src/EterLib/CollisionData.cpp similarity index 100% rename from EterLib/CollisionData.cpp rename to src/EterLib/CollisionData.cpp diff --git a/EterLib/CollisionData.h b/src/EterLib/CollisionData.h similarity index 100% rename from EterLib/CollisionData.h rename to src/EterLib/CollisionData.h diff --git a/EterLib/ColorTransitionHelper.cpp b/src/EterLib/ColorTransitionHelper.cpp similarity index 100% rename from EterLib/ColorTransitionHelper.cpp rename to src/EterLib/ColorTransitionHelper.cpp diff --git a/EterLib/ColorTransitionHelper.h b/src/EterLib/ColorTransitionHelper.h similarity index 100% rename from EterLib/ColorTransitionHelper.h rename to src/EterLib/ColorTransitionHelper.h diff --git a/EterLib/CullingManager.cpp b/src/EterLib/CullingManager.cpp similarity index 100% rename from EterLib/CullingManager.cpp rename to src/EterLib/CullingManager.cpp diff --git a/EterLib/CullingManager.h b/src/EterLib/CullingManager.h similarity index 100% rename from EterLib/CullingManager.h rename to src/EterLib/CullingManager.h diff --git a/EterLib/Decal.cpp b/src/EterLib/Decal.cpp similarity index 100% rename from EterLib/Decal.cpp rename to src/EterLib/Decal.cpp diff --git a/EterLib/Decal.h b/src/EterLib/Decal.h similarity index 100% rename from EterLib/Decal.h rename to src/EterLib/Decal.h diff --git a/EterLib/DibBar.cpp b/src/EterLib/DibBar.cpp similarity index 100% rename from EterLib/DibBar.cpp rename to src/EterLib/DibBar.cpp diff --git a/EterLib/DibBar.h b/src/EterLib/DibBar.h similarity index 100% rename from EterLib/DibBar.h rename to src/EterLib/DibBar.h diff --git a/EterLib/Dimm.h b/src/EterLib/Dimm.h similarity index 100% rename from EterLib/Dimm.h rename to src/EterLib/Dimm.h diff --git a/EterLib/Dynamic.h b/src/EterLib/Dynamic.h similarity index 100% rename from EterLib/Dynamic.h rename to src/EterLib/Dynamic.h diff --git a/EterLib/EnvironmentMap.cpp b/src/EterLib/EnvironmentMap.cpp similarity index 100% rename from EterLib/EnvironmentMap.cpp rename to src/EterLib/EnvironmentMap.cpp diff --git a/EterLib/EnvironmentMap.h b/src/EterLib/EnvironmentMap.h similarity index 100% rename from EterLib/EnvironmentMap.h rename to src/EterLib/EnvironmentMap.h diff --git a/EterLib/eterlib_VC90.vcxproj b/src/EterLib/EterLib.vcxproj similarity index 96% rename from EterLib/eterlib_VC90.vcxproj rename to src/EterLib/EterLib.vcxproj index d4174168..ef6f699c 100644 --- a/EterLib/eterlib_VC90.vcxproj +++ b/src/EterLib/EterLib.vcxproj @@ -28,16 +28,15 @@ 17.0 - eterlib + EterLib {887F89DF-A1A2-47DF-A869-F3FC84704E3E} - eterlib + EterLib SAK SAK SAK SAK MFCProj - - + 10.0 @@ -48,9 +47,9 @@ StaticLibrary - v143 false MultiByte + v143 StaticLibrary @@ -108,37 +107,34 @@ <_ProjectFileVersion>17.0.32203.90 - .\MfcRelease\ - .\MfcRelease\ + $(SolutionDir)build\$(Configuration)\ - .\Debug\ - .\Debug\ + $(SolutionDir)build\$(Configuration)\ - .\VTune\ - .\VTune\ + $(SolutionDir)build\$(Configuration)\ - .\MfcDebug\ - .\MfcDebug\ + $(SolutionDir)build\$(Configuration)\ - .\Release\ - .\Release\ + $(SolutionDir)build\$(Configuration)\ - .\Distribute\ - .\Distribute\ + $(SolutionDir)build\$(Configuration)\ true + $(Configuration) true + $(Configuration) true + $(Configuration) @@ -198,7 +194,6 @@ true - .\Debug\eterlib.lib true @@ -293,7 +288,6 @@ c:/eterlib/bin/;%(AdditionalIncludeDirectories) - .\Release\eterlib.lib true @@ -326,7 +320,6 @@ c:/eterlib/bin/;%(AdditionalIncludeDirectories) - .\Distribute\eterlib.lib true @@ -493,7 +486,7 @@ - + {05207e97-c83a-49c6-8e08-403679963a7b} false diff --git a/EterLib/eterlib_VC90.vcxproj.filters b/src/EterLib/EterLib.vcxproj.filters similarity index 100% rename from EterLib/eterlib_VC90.vcxproj.filters rename to src/EterLib/EterLib.vcxproj.filters diff --git a/EterLib/Event.h b/src/EterLib/Event.h similarity index 100% rename from EterLib/Event.h rename to src/EterLib/Event.h diff --git a/EterLib/FileLoaderThread.cpp b/src/EterLib/FileLoaderThread.cpp similarity index 100% rename from EterLib/FileLoaderThread.cpp rename to src/EterLib/FileLoaderThread.cpp diff --git a/EterLib/FileLoaderThread.h b/src/EterLib/FileLoaderThread.h similarity index 100% rename from EterLib/FileLoaderThread.h rename to src/EterLib/FileLoaderThread.h diff --git a/EterLib/FuncObject.h b/src/EterLib/FuncObject.h similarity index 100% rename from EterLib/FuncObject.h rename to src/EterLib/FuncObject.h diff --git a/EterLib/GrpBase.cpp b/src/EterLib/GrpBase.cpp similarity index 100% rename from EterLib/GrpBase.cpp rename to src/EterLib/GrpBase.cpp diff --git a/EterLib/GrpBase.h b/src/EterLib/GrpBase.h similarity index 100% rename from EterLib/GrpBase.h rename to src/EterLib/GrpBase.h diff --git a/EterLib/GrpCollisionObject.cpp b/src/EterLib/GrpCollisionObject.cpp similarity index 100% rename from EterLib/GrpCollisionObject.cpp rename to src/EterLib/GrpCollisionObject.cpp diff --git a/EterLib/GrpCollisionObject.h b/src/EterLib/GrpCollisionObject.h similarity index 100% rename from EterLib/GrpCollisionObject.h rename to src/EterLib/GrpCollisionObject.h diff --git a/EterLib/GrpColor.cpp b/src/EterLib/GrpColor.cpp similarity index 100% rename from EterLib/GrpColor.cpp rename to src/EterLib/GrpColor.cpp diff --git a/EterLib/GrpColor.h b/src/EterLib/GrpColor.h similarity index 100% rename from EterLib/GrpColor.h rename to src/EterLib/GrpColor.h diff --git a/EterLib/GrpColorInstance.cpp b/src/EterLib/GrpColorInstance.cpp similarity index 100% rename from EterLib/GrpColorInstance.cpp rename to src/EterLib/GrpColorInstance.cpp diff --git a/EterLib/GrpColorInstance.h b/src/EterLib/GrpColorInstance.h similarity index 100% rename from EterLib/GrpColorInstance.h rename to src/EterLib/GrpColorInstance.h diff --git a/EterLib/GrpD3DXBuffer.cpp b/src/EterLib/GrpD3DXBuffer.cpp similarity index 100% rename from EterLib/GrpD3DXBuffer.cpp rename to src/EterLib/GrpD3DXBuffer.cpp diff --git a/EterLib/GrpD3DXBuffer.h b/src/EterLib/GrpD3DXBuffer.h similarity index 100% rename from EterLib/GrpD3DXBuffer.h rename to src/EterLib/GrpD3DXBuffer.h diff --git a/EterLib/GrpDIB.cpp b/src/EterLib/GrpDIB.cpp similarity index 100% rename from EterLib/GrpDIB.cpp rename to src/EterLib/GrpDIB.cpp diff --git a/EterLib/GrpDIB.h b/src/EterLib/GrpDIB.h similarity index 100% rename from EterLib/GrpDIB.h rename to src/EterLib/GrpDIB.h diff --git a/EterLib/GrpDetector.cpp b/src/EterLib/GrpDetector.cpp similarity index 100% rename from EterLib/GrpDetector.cpp rename to src/EterLib/GrpDetector.cpp diff --git a/EterLib/GrpDetector.h b/src/EterLib/GrpDetector.h similarity index 100% rename from EterLib/GrpDetector.h rename to src/EterLib/GrpDetector.h diff --git a/EterLib/GrpDevice.cpp b/src/EterLib/GrpDevice.cpp similarity index 100% rename from EterLib/GrpDevice.cpp rename to src/EterLib/GrpDevice.cpp diff --git a/EterLib/GrpDevice.h b/src/EterLib/GrpDevice.h similarity index 100% rename from EterLib/GrpDevice.h rename to src/EterLib/GrpDevice.h diff --git a/EterLib/GrpExpandedImageInstance.cpp b/src/EterLib/GrpExpandedImageInstance.cpp similarity index 100% rename from EterLib/GrpExpandedImageInstance.cpp rename to src/EterLib/GrpExpandedImageInstance.cpp diff --git a/EterLib/GrpExpandedImageInstance.h b/src/EterLib/GrpExpandedImageInstance.h similarity index 100% rename from EterLib/GrpExpandedImageInstance.h rename to src/EterLib/GrpExpandedImageInstance.h diff --git a/EterLib/GrpFontTexture.cpp b/src/EterLib/GrpFontTexture.cpp similarity index 100% rename from EterLib/GrpFontTexture.cpp rename to src/EterLib/GrpFontTexture.cpp diff --git a/EterLib/GrpFontTexture.h b/src/EterLib/GrpFontTexture.h similarity index 100% rename from EterLib/GrpFontTexture.h rename to src/EterLib/GrpFontTexture.h diff --git a/EterLib/GrpImage.cpp b/src/EterLib/GrpImage.cpp similarity index 100% rename from EterLib/GrpImage.cpp rename to src/EterLib/GrpImage.cpp diff --git a/EterLib/GrpImage.h b/src/EterLib/GrpImage.h similarity index 100% rename from EterLib/GrpImage.h rename to src/EterLib/GrpImage.h diff --git a/EterLib/GrpImageInstance.cpp b/src/EterLib/GrpImageInstance.cpp similarity index 100% rename from EterLib/GrpImageInstance.cpp rename to src/EterLib/GrpImageInstance.cpp diff --git a/EterLib/GrpImageInstance.h b/src/EterLib/GrpImageInstance.h similarity index 100% rename from EterLib/GrpImageInstance.h rename to src/EterLib/GrpImageInstance.h diff --git a/EterLib/GrpImageTexture.cpp b/src/EterLib/GrpImageTexture.cpp similarity index 100% rename from EterLib/GrpImageTexture.cpp rename to src/EterLib/GrpImageTexture.cpp diff --git a/EterLib/GrpImageTexture.h b/src/EterLib/GrpImageTexture.h similarity index 100% rename from EterLib/GrpImageTexture.h rename to src/EterLib/GrpImageTexture.h diff --git a/EterLib/GrpIndexBuffer.cpp b/src/EterLib/GrpIndexBuffer.cpp similarity index 100% rename from EterLib/GrpIndexBuffer.cpp rename to src/EterLib/GrpIndexBuffer.cpp diff --git a/EterLib/GrpIndexBuffer.h b/src/EterLib/GrpIndexBuffer.h similarity index 100% rename from EterLib/GrpIndexBuffer.h rename to src/EterLib/GrpIndexBuffer.h diff --git a/EterLib/GrpLightManager.cpp b/src/EterLib/GrpLightManager.cpp similarity index 100% rename from EterLib/GrpLightManager.cpp rename to src/EterLib/GrpLightManager.cpp diff --git a/EterLib/GrpLightManager.h b/src/EterLib/GrpLightManager.h similarity index 100% rename from EterLib/GrpLightManager.h rename to src/EterLib/GrpLightManager.h diff --git a/EterLib/GrpMarkInstance.cpp b/src/EterLib/GrpMarkInstance.cpp similarity index 100% rename from EterLib/GrpMarkInstance.cpp rename to src/EterLib/GrpMarkInstance.cpp diff --git a/EterLib/GrpMarkInstance.h b/src/EterLib/GrpMarkInstance.h similarity index 100% rename from EterLib/GrpMarkInstance.h rename to src/EterLib/GrpMarkInstance.h diff --git a/EterLib/GrpMath.cpp b/src/EterLib/GrpMath.cpp similarity index 100% rename from EterLib/GrpMath.cpp rename to src/EterLib/GrpMath.cpp diff --git a/EterLib/GrpMath.h b/src/EterLib/GrpMath.h similarity index 100% rename from EterLib/GrpMath.h rename to src/EterLib/GrpMath.h diff --git a/EterLib/GrpObjectInstance.cpp b/src/EterLib/GrpObjectInstance.cpp similarity index 100% rename from EterLib/GrpObjectInstance.cpp rename to src/EterLib/GrpObjectInstance.cpp diff --git a/EterLib/GrpObjectInstance.h b/src/EterLib/GrpObjectInstance.h similarity index 100% rename from EterLib/GrpObjectInstance.h rename to src/EterLib/GrpObjectInstance.h diff --git a/EterLib/GrpPixelShader.cpp b/src/EterLib/GrpPixelShader.cpp similarity index 100% rename from EterLib/GrpPixelShader.cpp rename to src/EterLib/GrpPixelShader.cpp diff --git a/EterLib/GrpPixelShader.h b/src/EterLib/GrpPixelShader.h similarity index 100% rename from EterLib/GrpPixelShader.h rename to src/EterLib/GrpPixelShader.h diff --git a/EterLib/GrpRatioInstance.cpp b/src/EterLib/GrpRatioInstance.cpp similarity index 100% rename from EterLib/GrpRatioInstance.cpp rename to src/EterLib/GrpRatioInstance.cpp diff --git a/EterLib/GrpRatioInstance.h b/src/EterLib/GrpRatioInstance.h similarity index 100% rename from EterLib/GrpRatioInstance.h rename to src/EterLib/GrpRatioInstance.h diff --git a/EterLib/GrpScreen.cpp b/src/EterLib/GrpScreen.cpp similarity index 100% rename from EterLib/GrpScreen.cpp rename to src/EterLib/GrpScreen.cpp diff --git a/EterLib/GrpScreen.h b/src/EterLib/GrpScreen.h similarity index 100% rename from EterLib/GrpScreen.h rename to src/EterLib/GrpScreen.h diff --git a/EterLib/GrpShadowTexture.cpp b/src/EterLib/GrpShadowTexture.cpp similarity index 100% rename from EterLib/GrpShadowTexture.cpp rename to src/EterLib/GrpShadowTexture.cpp diff --git a/EterLib/GrpShadowTexture.h b/src/EterLib/GrpShadowTexture.h similarity index 100% rename from EterLib/GrpShadowTexture.h rename to src/EterLib/GrpShadowTexture.h diff --git a/EterLib/GrpSubImage.cpp b/src/EterLib/GrpSubImage.cpp similarity index 100% rename from EterLib/GrpSubImage.cpp rename to src/EterLib/GrpSubImage.cpp diff --git a/EterLib/GrpSubImage.h b/src/EterLib/GrpSubImage.h similarity index 100% rename from EterLib/GrpSubImage.h rename to src/EterLib/GrpSubImage.h diff --git a/EterLib/GrpText.cpp b/src/EterLib/GrpText.cpp similarity index 100% rename from EterLib/GrpText.cpp rename to src/EterLib/GrpText.cpp diff --git a/EterLib/GrpText.h b/src/EterLib/GrpText.h similarity index 100% rename from EterLib/GrpText.h rename to src/EterLib/GrpText.h diff --git a/EterLib/GrpTextInstance.cpp b/src/EterLib/GrpTextInstance.cpp similarity index 100% rename from EterLib/GrpTextInstance.cpp rename to src/EterLib/GrpTextInstance.cpp diff --git a/EterLib/GrpTextInstance.h b/src/EterLib/GrpTextInstance.h similarity index 100% rename from EterLib/GrpTextInstance.h rename to src/EterLib/GrpTextInstance.h diff --git a/EterLib/GrpTexture.cpp b/src/EterLib/GrpTexture.cpp similarity index 100% rename from EterLib/GrpTexture.cpp rename to src/EterLib/GrpTexture.cpp diff --git a/EterLib/GrpTexture.h b/src/EterLib/GrpTexture.h similarity index 100% rename from EterLib/GrpTexture.h rename to src/EterLib/GrpTexture.h diff --git a/EterLib/GrpVertexBuffer.cpp b/src/EterLib/GrpVertexBuffer.cpp similarity index 100% rename from EterLib/GrpVertexBuffer.cpp rename to src/EterLib/GrpVertexBuffer.cpp diff --git a/EterLib/GrpVertexBuffer.h b/src/EterLib/GrpVertexBuffer.h similarity index 100% rename from EterLib/GrpVertexBuffer.h rename to src/EterLib/GrpVertexBuffer.h diff --git a/EterLib/GrpVertexBufferDynamic.cpp b/src/EterLib/GrpVertexBufferDynamic.cpp similarity index 100% rename from EterLib/GrpVertexBufferDynamic.cpp rename to src/EterLib/GrpVertexBufferDynamic.cpp diff --git a/EterLib/GrpVertexBufferDynamic.h b/src/EterLib/GrpVertexBufferDynamic.h similarity index 100% rename from EterLib/GrpVertexBufferDynamic.h rename to src/EterLib/GrpVertexBufferDynamic.h diff --git a/EterLib/GrpVertexBufferStatic.cpp b/src/EterLib/GrpVertexBufferStatic.cpp similarity index 100% rename from EterLib/GrpVertexBufferStatic.cpp rename to src/EterLib/GrpVertexBufferStatic.cpp diff --git a/EterLib/GrpVertexBufferStatic.h b/src/EterLib/GrpVertexBufferStatic.h similarity index 100% rename from EterLib/GrpVertexBufferStatic.h rename to src/EterLib/GrpVertexBufferStatic.h diff --git a/EterLib/GrpVertexShader.cpp b/src/EterLib/GrpVertexShader.cpp similarity index 100% rename from EterLib/GrpVertexShader.cpp rename to src/EterLib/GrpVertexShader.cpp diff --git a/EterLib/GrpVertexShader.h b/src/EterLib/GrpVertexShader.h similarity index 100% rename from EterLib/GrpVertexShader.h rename to src/EterLib/GrpVertexShader.h diff --git a/EterLib/IME.cpp b/src/EterLib/IME.cpp similarity index 100% rename from EterLib/IME.cpp rename to src/EterLib/IME.cpp diff --git a/EterLib/IME.h b/src/EterLib/IME.h similarity index 100% rename from EterLib/IME.h rename to src/EterLib/IME.h diff --git a/EterLib/Input.cpp b/src/EterLib/Input.cpp similarity index 100% rename from EterLib/Input.cpp rename to src/EterLib/Input.cpp diff --git a/EterLib/Input.h b/src/EterLib/Input.h similarity index 100% rename from EterLib/Input.h rename to src/EterLib/Input.h diff --git a/EterLib/JpegFile.cpp b/src/EterLib/JpegFile.cpp similarity index 100% rename from EterLib/JpegFile.cpp rename to src/EterLib/JpegFile.cpp diff --git a/EterLib/JpegFile.h b/src/EterLib/JpegFile.h similarity index 100% rename from EterLib/JpegFile.h rename to src/EterLib/JpegFile.h diff --git a/EterLib/LensFlare.cpp b/src/EterLib/LensFlare.cpp similarity index 100% rename from EterLib/LensFlare.cpp rename to src/EterLib/LensFlare.cpp diff --git a/EterLib/LensFlare.h b/src/EterLib/LensFlare.h similarity index 100% rename from EterLib/LensFlare.h rename to src/EterLib/LensFlare.h diff --git a/EterLib/MSApplication.cpp b/src/EterLib/MSApplication.cpp similarity index 100% rename from EterLib/MSApplication.cpp rename to src/EterLib/MSApplication.cpp diff --git a/EterLib/MSApplication.h b/src/EterLib/MSApplication.h similarity index 100% rename from EterLib/MSApplication.h rename to src/EterLib/MSApplication.h diff --git a/EterLib/MSWindow.cpp b/src/EterLib/MSWindow.cpp similarity index 100% rename from EterLib/MSWindow.cpp rename to src/EterLib/MSWindow.cpp diff --git a/EterLib/MSWindow.h b/src/EterLib/MSWindow.h similarity index 100% rename from EterLib/MSWindow.h rename to src/EterLib/MSWindow.h diff --git a/EterLib/Mutex.cpp b/src/EterLib/Mutex.cpp similarity index 100% rename from EterLib/Mutex.cpp rename to src/EterLib/Mutex.cpp diff --git a/EterLib/Mutex.h b/src/EterLib/Mutex.h similarity index 100% rename from EterLib/Mutex.h rename to src/EterLib/Mutex.h diff --git a/EterLib/NetAddress.cpp b/src/EterLib/NetAddress.cpp similarity index 100% rename from EterLib/NetAddress.cpp rename to src/EterLib/NetAddress.cpp diff --git a/EterLib/NetAddress.h b/src/EterLib/NetAddress.h similarity index 100% rename from EterLib/NetAddress.h rename to src/EterLib/NetAddress.h diff --git a/EterLib/NetDatagram.cpp b/src/EterLib/NetDatagram.cpp similarity index 100% rename from EterLib/NetDatagram.cpp rename to src/EterLib/NetDatagram.cpp diff --git a/EterLib/NetDatagram.h b/src/EterLib/NetDatagram.h similarity index 100% rename from EterLib/NetDatagram.h rename to src/EterLib/NetDatagram.h diff --git a/EterLib/NetDatagramReceiver.cpp b/src/EterLib/NetDatagramReceiver.cpp similarity index 100% rename from EterLib/NetDatagramReceiver.cpp rename to src/EterLib/NetDatagramReceiver.cpp diff --git a/EterLib/NetDatagramReceiver.h b/src/EterLib/NetDatagramReceiver.h similarity index 100% rename from EterLib/NetDatagramReceiver.h rename to src/EterLib/NetDatagramReceiver.h diff --git a/EterLib/NetDatagramSender.cpp b/src/EterLib/NetDatagramSender.cpp similarity index 100% rename from EterLib/NetDatagramSender.cpp rename to src/EterLib/NetDatagramSender.cpp diff --git a/EterLib/NetDatagramSender.h b/src/EterLib/NetDatagramSender.h similarity index 100% rename from EterLib/NetDatagramSender.h rename to src/EterLib/NetDatagramSender.h diff --git a/EterLib/NetDevice.cpp b/src/EterLib/NetDevice.cpp similarity index 100% rename from EterLib/NetDevice.cpp rename to src/EterLib/NetDevice.cpp diff --git a/EterLib/NetDevice.h b/src/EterLib/NetDevice.h similarity index 100% rename from EterLib/NetDevice.h rename to src/EterLib/NetDevice.h diff --git a/EterLib/NetPacketHeaderMap.cpp b/src/EterLib/NetPacketHeaderMap.cpp similarity index 100% rename from EterLib/NetPacketHeaderMap.cpp rename to src/EterLib/NetPacketHeaderMap.cpp diff --git a/EterLib/NetPacketHeaderMap.h b/src/EterLib/NetPacketHeaderMap.h similarity index 100% rename from EterLib/NetPacketHeaderMap.h rename to src/EterLib/NetPacketHeaderMap.h diff --git a/EterLib/NetStream.cpp b/src/EterLib/NetStream.cpp similarity index 100% rename from EterLib/NetStream.cpp rename to src/EterLib/NetStream.cpp diff --git a/EterLib/NetStream.h b/src/EterLib/NetStream.h similarity index 100% rename from EterLib/NetStream.h rename to src/EterLib/NetStream.h diff --git a/EterLib/PathStack.cpp b/src/EterLib/PathStack.cpp similarity index 100% rename from EterLib/PathStack.cpp rename to src/EterLib/PathStack.cpp diff --git a/EterLib/PathStack.h b/src/EterLib/PathStack.h similarity index 100% rename from EterLib/PathStack.h rename to src/EterLib/PathStack.h diff --git a/EterLib/Pool.h b/src/EterLib/Pool.h similarity index 100% rename from EterLib/Pool.h rename to src/EterLib/Pool.h diff --git a/EterLib/Profiler.h b/src/EterLib/Profiler.h similarity index 100% rename from EterLib/Profiler.h rename to src/EterLib/Profiler.h diff --git a/EterLib/Ray.h b/src/EterLib/Ray.h similarity index 100% rename from EterLib/Ray.h rename to src/EterLib/Ray.h diff --git a/EterLib/Ref.h b/src/EterLib/Ref.h similarity index 100% rename from EterLib/Ref.h rename to src/EterLib/Ref.h diff --git a/EterLib/ReferenceObject.cpp b/src/EterLib/ReferenceObject.cpp similarity index 100% rename from EterLib/ReferenceObject.cpp rename to src/EterLib/ReferenceObject.cpp diff --git a/EterLib/ReferenceObject.h b/src/EterLib/ReferenceObject.h similarity index 100% rename from EterLib/ReferenceObject.h rename to src/EterLib/ReferenceObject.h diff --git a/EterLib/Resource.cpp b/src/EterLib/Resource.cpp similarity index 100% rename from EterLib/Resource.cpp rename to src/EterLib/Resource.cpp diff --git a/EterLib/Resource.h b/src/EterLib/Resource.h similarity index 100% rename from EterLib/Resource.h rename to src/EterLib/Resource.h diff --git a/EterLib/ResourceManager.cpp b/src/EterLib/ResourceManager.cpp similarity index 100% rename from EterLib/ResourceManager.cpp rename to src/EterLib/ResourceManager.cpp diff --git a/EterLib/ResourceManager.h b/src/EterLib/ResourceManager.h similarity index 100% rename from EterLib/ResourceManager.h rename to src/EterLib/ResourceManager.h diff --git a/EterLib/ScreenFilter.cpp b/src/EterLib/ScreenFilter.cpp similarity index 100% rename from EterLib/ScreenFilter.cpp rename to src/EterLib/ScreenFilter.cpp diff --git a/EterLib/ScreenFilter.h b/src/EterLib/ScreenFilter.h similarity index 100% rename from EterLib/ScreenFilter.h rename to src/EterLib/ScreenFilter.h diff --git a/EterLib/SkyBox.cpp b/src/EterLib/SkyBox.cpp similarity index 100% rename from EterLib/SkyBox.cpp rename to src/EterLib/SkyBox.cpp diff --git a/EterLib/SkyBox.h b/src/EterLib/SkyBox.h similarity index 100% rename from EterLib/SkyBox.h rename to src/EterLib/SkyBox.h diff --git a/EterLib/StateManager.cpp b/src/EterLib/StateManager.cpp similarity index 100% rename from EterLib/StateManager.cpp rename to src/EterLib/StateManager.cpp diff --git a/EterLib/StateManager.h b/src/EterLib/StateManager.h similarity index 100% rename from EterLib/StateManager.h rename to src/EterLib/StateManager.h diff --git a/EterLib/StdAfx.cpp b/src/EterLib/StdAfx.cpp similarity index 100% rename from EterLib/StdAfx.cpp rename to src/EterLib/StdAfx.cpp diff --git a/EterLib/StdAfx.h b/src/EterLib/StdAfx.h similarity index 100% rename from EterLib/StdAfx.h rename to src/EterLib/StdAfx.h diff --git a/EterLib/TargaResource.cpp b/src/EterLib/TargaResource.cpp similarity index 100% rename from EterLib/TargaResource.cpp rename to src/EterLib/TargaResource.cpp diff --git a/EterLib/TargaResource.h b/src/EterLib/TargaResource.h similarity index 100% rename from EterLib/TargaResource.h rename to src/EterLib/TargaResource.h diff --git a/EterLib/TextBar.cpp b/src/EterLib/TextBar.cpp similarity index 100% rename from EterLib/TextBar.cpp rename to src/EterLib/TextBar.cpp diff --git a/EterLib/TextBar.h b/src/EterLib/TextBar.h similarity index 100% rename from EterLib/TextBar.h rename to src/EterLib/TextBar.h diff --git a/EterLib/TextFileLoader.cpp b/src/EterLib/TextFileLoader.cpp similarity index 100% rename from EterLib/TextFileLoader.cpp rename to src/EterLib/TextFileLoader.cpp diff --git a/EterLib/TextFileLoader.h b/src/EterLib/TextFileLoader.h similarity index 100% rename from EterLib/TextFileLoader.h rename to src/EterLib/TextFileLoader.h diff --git a/EterLib/TextTag.cpp b/src/EterLib/TextTag.cpp similarity index 100% rename from EterLib/TextTag.cpp rename to src/EterLib/TextTag.cpp diff --git a/EterLib/TextTag.h b/src/EterLib/TextTag.h similarity index 100% rename from EterLib/TextTag.h rename to src/EterLib/TextTag.h diff --git a/EterLib/Thread.cpp b/src/EterLib/Thread.cpp similarity index 100% rename from EterLib/Thread.cpp rename to src/EterLib/Thread.cpp diff --git a/EterLib/Thread.h b/src/EterLib/Thread.h similarity index 100% rename from EterLib/Thread.h rename to src/EterLib/Thread.h diff --git a/EterLib/Util.cpp b/src/EterLib/Util.cpp similarity index 100% rename from EterLib/Util.cpp rename to src/EterLib/Util.cpp diff --git a/EterLib/Util.h b/src/EterLib/Util.h similarity index 100% rename from EterLib/Util.h rename to src/EterLib/Util.h diff --git a/EterLib/lineintersect_utils.cpp b/src/EterLib/lineintersect_utils.cpp similarity index 100% rename from EterLib/lineintersect_utils.cpp rename to src/EterLib/lineintersect_utils.cpp diff --git a/EterLib/lineintersect_utils.h b/src/EterLib/lineintersect_utils.h similarity index 100% rename from EterLib/lineintersect_utils.h rename to src/EterLib/lineintersect_utils.h diff --git a/EterLib/msctf.h b/src/EterLib/msctf.h similarity index 100% rename from EterLib/msctf.h rename to src/EterLib/msctf.h diff --git a/EterLib/parser.cpp b/src/EterLib/parser.cpp similarity index 100% rename from EterLib/parser.cpp rename to src/EterLib/parser.cpp diff --git a/EterLib/parser.h b/src/EterLib/parser.h similarity index 100% rename from EterLib/parser.h rename to src/EterLib/parser.h diff --git a/EterLocale/Arabic.cpp b/src/EterLocale/Arabic.cpp similarity index 100% rename from EterLocale/Arabic.cpp rename to src/EterLocale/Arabic.cpp diff --git a/EterLocale/Arabic.h b/src/EterLocale/Arabic.h similarity index 100% rename from EterLocale/Arabic.h rename to src/EterLocale/Arabic.h diff --git a/EterLocale/CodePageId.h b/src/EterLocale/CodePageId.h similarity index 100% rename from EterLocale/CodePageId.h rename to src/EterLocale/CodePageId.h diff --git a/EterLocale/EterLocale_VC90.vcxproj b/src/EterLocale/EterLocale.vcxproj similarity index 96% rename from EterLocale/EterLocale_VC90.vcxproj rename to src/EterLocale/EterLocale.vcxproj index ebbf1a4d..2a1e5bda 100644 --- a/EterLocale/EterLocale_VC90.vcxproj +++ b/src/EterLocale/EterLocale.vcxproj @@ -36,8 +36,7 @@ SAK SAK MFCProj - - + 10.0 @@ -48,9 +47,9 @@ StaticLibrary - v143 false MultiByte + v143 StaticLibrary @@ -108,37 +107,34 @@ <_ProjectFileVersion>17.0.32203.90 - .\Distribute\ - .\Distribute\ + $(SolutionDir)build\$(Configuration)\ - .\MfcRelease\ - .\MfcRelease\ + $(SolutionDir)build\$(Configuration)\ - .\VTune\ - .\VTune\ + $(SolutionDir)build\$(Configuration)\ - .\MfcDebug\ - .\MfcDebug\ + $(SolutionDir)build\$(Configuration)\ - .\Release\ - .\Release\ + $(SolutionDir)build\$(Configuration)\ - .\Debug\ - .\Debug\ + $(SolutionDir)build\$(Configuration)\ true + $(Configuration) true + $(Configuration) true + $(Configuration) @@ -166,7 +162,6 @@ 0x0412 - .\Distribute\EterLocale.lib true @@ -284,7 +279,6 @@ 0x0412 - .\Release\EterLocale.lib true @@ -314,7 +308,6 @@ true - .\Debug\EterLocale.lib true diff --git a/EterLocale/EterLocale_VC90.vcxproj.filters b/src/EterLocale/EterLocale.vcxproj.filters similarity index 100% rename from EterLocale/EterLocale_VC90.vcxproj.filters rename to src/EterLocale/EterLocale.vcxproj.filters diff --git a/EterLocale/Japanese.cpp b/src/EterLocale/Japanese.cpp similarity index 100% rename from EterLocale/Japanese.cpp rename to src/EterLocale/Japanese.cpp diff --git a/EterLocale/Japanese.h b/src/EterLocale/Japanese.h similarity index 100% rename from EterLocale/Japanese.h rename to src/EterLocale/Japanese.h diff --git a/EterLocale/StdAfx.cpp b/src/EterLocale/StdAfx.cpp similarity index 100% rename from EterLocale/StdAfx.cpp rename to src/EterLocale/StdAfx.cpp diff --git a/EterLocale/StdAfx.h b/src/EterLocale/StdAfx.h similarity index 100% rename from EterLocale/StdAfx.h rename to src/EterLocale/StdAfx.h diff --git a/EterLocale/StringCodec.cpp b/src/EterLocale/StringCodec.cpp similarity index 100% rename from EterLocale/StringCodec.cpp rename to src/EterLocale/StringCodec.cpp diff --git a/EterLocale/StringCodec.h b/src/EterLocale/StringCodec.h similarity index 100% rename from EterLocale/StringCodec.h rename to src/EterLocale/StringCodec.h diff --git a/EterLocale/StringCodec_Vietnamese.cpp b/src/EterLocale/StringCodec_Vietnamese.cpp similarity index 100% rename from EterLocale/StringCodec_Vietnamese.cpp rename to src/EterLocale/StringCodec_Vietnamese.cpp diff --git a/EterLocale/StringCodec_Vietnamese.h b/src/EterLocale/StringCodec_Vietnamese.h similarity index 100% rename from EterLocale/StringCodec_Vietnamese.h rename to src/EterLocale/StringCodec_Vietnamese.h diff --git a/EterPack/EterPack.cpp b/src/EterPack/EterPack.cpp similarity index 100% rename from EterPack/EterPack.cpp rename to src/EterPack/EterPack.cpp diff --git a/EterPack/EterPack.h b/src/EterPack/EterPack.h similarity index 96% rename from EterPack/EterPack.h rename to src/EterPack/EterPack.h index 75ed2b7f..6664f035 100644 --- a/EterPack/EterPack.h +++ b/src/EterPack/EterPack.h @@ -2,8 +2,7 @@ #define __INC_ETERPACKLIB_ETERPACK_H__ #include -#include -#include +#include #include "../EterBase/MappedFile.h" @@ -62,7 +61,7 @@ typedef struct SEterPackIndex } TEterPackIndex; #pragma pack(pop) -typedef boost::unordered_map TDataPositionMap; +typedef std::unordered_map TDataPositionMap; typedef std::list TFreeIndexList; @@ -84,7 +83,7 @@ public: BUCKET_SIZE = 16, }; - typedef boost::unordered_multimap TDict; + typedef std::unordered_multimap TDict; public: void InsertItem(CEterPack* pkPack, TEterPackIndex* pkInfo); @@ -181,7 +180,7 @@ class CEterPack bool m_bReadOnly; bool m_bDecrypedIV; - boost::unordered_map m_map_indexRefCount; + std::unordered_map m_map_indexRefCount; TDataPositionMap m_DataPositionMap; TFreeIndexList m_FreeIndexList[FREE_INDEX_MAX_SIZE + 1]; // MAX µµ ¾ï¼¼½º ÇϹǷΠ+ 1 Å©±â¸¸Å­ ¸¸µç´Ù. diff --git a/EterPack/EterPack_VC90.vcxproj b/src/EterPack/EterPack.vcxproj similarity index 96% rename from EterPack/EterPack_VC90.vcxproj rename to src/EterPack/EterPack.vcxproj index 9fd04956..2b3d7894 100644 --- a/EterPack/EterPack_VC90.vcxproj +++ b/src/EterPack/EterPack.vcxproj @@ -35,8 +35,7 @@ . MSSCCI:Perforce SCM MFCProj - - + 10.0 @@ -47,9 +46,9 @@ StaticLibrary - v143 false MultiByte + v143 StaticLibrary @@ -107,37 +106,34 @@ <_ProjectFileVersion>17.0.32203.90 - .\Distribute\ - .\Distribute\ + $(SolutionDir)build\$(Configuration)\ - .\MfcRelease\ - .\MfcRelease\ + $(SolutionDir)build\$(Configuration)\ - .\VTune\ - .\VTune\ + $(SolutionDir)build\$(Configuration)\ - .\MfcDebug\ - .\MfcDebug\ + $(SolutionDir)build\$(Configuration)\ - .\Release\ - .\Release\ + $(SolutionDir)build\$(Configuration)\ - .\Debug\ - .\Debug\ + $(SolutionDir)build\$(Configuration)\ true + $(Configuration) true + $(Configuration) true + $(Configuration) @@ -165,8 +161,7 @@ 0x0412 - .\Distribute\EterPack.lib - ../../extern/lib;%(AdditionalLibraryDirectories) + $(SolutionDir)Extern\lib;%(AdditionalLibraryDirectories) true @@ -287,7 +282,6 @@ 0x0412 - .\Release\EterPack.lib ../../extern/lib;%(AdditionalLibraryDirectories) true @@ -318,7 +312,6 @@ true - .\Debug\EterPack.lib ../../extern/lib;%(AdditionalLibraryDirectories) true diff --git a/EterPack/EterPack_VC90.vcxproj.filters b/src/EterPack/EterPack.vcxproj.filters similarity index 100% rename from EterPack/EterPack_VC90.vcxproj.filters rename to src/EterPack/EterPack.vcxproj.filters diff --git a/EterPack/EterPackCursor.cpp b/src/EterPack/EterPackCursor.cpp similarity index 100% rename from EterPack/EterPackCursor.cpp rename to src/EterPack/EterPackCursor.cpp diff --git a/EterPack/EterPackCursor.h b/src/EterPack/EterPackCursor.h similarity index 100% rename from EterPack/EterPackCursor.h rename to src/EterPack/EterPackCursor.h diff --git a/EterPack/EterPackManager.cpp b/src/EterPack/EterPackManager.cpp similarity index 97% rename from EterPack/EterPackManager.cpp rename to src/EterPack/EterPackManager.cpp index 1ede3dde..11edc321 100644 --- a/EterPack/EterPackManager.cpp +++ b/src/EterPack/EterPackManager.cpp @@ -105,7 +105,7 @@ void CEterPackManager::LoadStaticCache(const char* c_szFileName) DWORD dwFileNameHash = GetCRC32(strFileName.c_str(), strFileName.length()); - boost::unordered_map::iterator f = m_kMap_dwNameKey_kCache.find(dwFileNameHash); + std::unordered_map::iterator f = m_kMap_dwNameKey_kCache.find(dwFileNameHash); if (m_kMap_dwNameKey_kCache.end() != f) return; @@ -118,12 +118,12 @@ void CEterPackManager::LoadStaticCache(const char* c_szFileName) kNewCache.m_dwBufSize = kMapFile.Size(); kNewCache.m_abBufData = new BYTE[kNewCache.m_dwBufSize]; memcpy(kNewCache.m_abBufData, c_pvData, kNewCache.m_dwBufSize); - m_kMap_dwNameKey_kCache.insert(boost::unordered_map::value_type(dwFileNameHash, kNewCache)); + m_kMap_dwNameKey_kCache.insert(std::unordered_map::value_type(dwFileNameHash, kNewCache)); } CEterPackManager::SCache* CEterPackManager::__FindCache(DWORD dwFileNameHash) { - boost::unordered_map::iterator f=m_kMap_dwNameKey_kCache.find(dwFileNameHash); + std::unordered_map::iterator f=m_kMap_dwNameKey_kCache.find(dwFileNameHash); if (m_kMap_dwNameKey_kCache.end()==f) return NULL; @@ -132,7 +132,7 @@ CEterPackManager::SCache* CEterPackManager::__FindCache(DWORD dwFileNameHash) void CEterPackManager::__ClearCacheMap() { - boost::unordered_map::iterator i; + std::unordered_map::iterator i; for (i = m_kMap_dwNameKey_kCache.begin(); i != m_kMap_dwNameKey_kCache.end(); ++i) delete [] i->second.m_abBufData; diff --git a/EterPack/EterPackManager.h b/src/EterPack/EterPackManager.h similarity index 92% rename from EterPack/EterPackManager.h rename to src/EterPack/EterPackManager.h index 15f257ed..dbc813a9 100644 --- a/EterPack/EterPackManager.h +++ b/src/EterPack/EterPackManager.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include "../eterBase/Singleton.h" #include "../eterBase/Stl.h" @@ -23,7 +23,7 @@ class CEterPackManager : public CSingleton }; typedef std::list TEterPackList; - typedef boost::unordered_map TEterPackMap; + typedef std::unordered_map TEterPackMap; public: CEterPackManager(); @@ -90,7 +90,7 @@ class CEterPackManager : public CSingleton TEterPackMap m_PackMap; TEterPackMap m_DirPackMap; - boost::unordered_map m_kMap_dwNameKey_kCache; + std::unordered_map m_kMap_dwNameKey_kCache; CRITICAL_SECTION m_csFinder; }; diff --git a/EterPack/EterPackPolicy_CSHybridCrypt.cpp b/src/EterPack/EterPackPolicy_CSHybridCrypt.cpp similarity index 100% rename from EterPack/EterPackPolicy_CSHybridCrypt.cpp rename to src/EterPack/EterPackPolicy_CSHybridCrypt.cpp diff --git a/EterPack/EterPackPolicy_CSHybridCrypt.h b/src/EterPack/EterPackPolicy_CSHybridCrypt.h similarity index 91% rename from EterPack/EterPackPolicy_CSHybridCrypt.h rename to src/EterPack/EterPackPolicy_CSHybridCrypt.h index 21e7c091..63f76ab2 100644 --- a/EterPack/EterPackPolicy_CSHybridCrypt.h +++ b/src/EterPack/EterPackPolicy_CSHybridCrypt.h @@ -1,7 +1,7 @@ #ifndef __INC_ETERPACKLIB_ETERPACKPOLICY_CSHYBRIDCRYPT_H__ #define __INC_ETERPACKLIB_ETERPACKPOLICY_CSHYBRIDCRYPT_H__ -#include +#include #include #include #include @@ -70,7 +70,7 @@ protected: } TCSHybridCryptKey; - typedef boost::unordered_map TCSHybridCryptKeyMap; + typedef std::unordered_map TCSHybridCryptKeyMap; TCSHybridCryptKeyMap m_mapHybridCryptKey; typedef struct SSupplementaryDataBlockInfo @@ -80,7 +80,7 @@ protected: } TSupplementaryDataBlockInfo; - typedef boost::unordered_map TSupplementaryDataBlockMap; //key filename hash + typedef std::unordered_map TSupplementaryDataBlockMap; //key filename hash TSupplementaryDataBlockMap m_mapSDBMap; private: diff --git a/EterPack/Inline.h b/src/EterPack/Inline.h similarity index 100% rename from EterPack/Inline.h rename to src/EterPack/Inline.h diff --git a/EterPack/StdAfx.cpp b/src/EterPack/StdAfx.cpp similarity index 100% rename from EterPack/StdAfx.cpp rename to src/EterPack/StdAfx.cpp diff --git a/EterPack/StdAfx.h b/src/EterPack/StdAfx.h similarity index 100% rename from EterPack/StdAfx.h rename to src/EterPack/StdAfx.h diff --git a/EterPack/md5.c b/src/EterPack/md5.c similarity index 100% rename from EterPack/md5.c rename to src/EterPack/md5.c diff --git a/EterPack/md5.h b/src/EterPack/md5.h similarity index 100% rename from EterPack/md5.h rename to src/EterPack/md5.h diff --git a/EterPythonLib/eterPythonLib_VC90.vcxproj b/src/EterPythonLib/EterPythonLib.vcxproj similarity index 97% rename from EterPythonLib/eterPythonLib_VC90.vcxproj rename to src/EterPythonLib/EterPythonLib.vcxproj index 58ca11ad..f2d5220c 100644 --- a/EterPythonLib/eterPythonLib_VC90.vcxproj +++ b/src/EterPythonLib/EterPythonLib.vcxproj @@ -28,16 +28,15 @@ 17.0 - eterPythonLib + EterPythonLib {24516A87-8544-46A9-A0C8-0A01269642D9} - eterPythonLib + EterPythonLib SAK SAK SAK SAK MFCProj - - + 10.0 @@ -60,9 +59,9 @@ StaticLibrary - v143 false MultiByte + v143 StaticLibrary @@ -108,37 +107,34 @@ <_ProjectFileVersion>17.0.32203.90 - .\Distribute\ - .\Distribute\ + $(SolutionDir)build\$(Configuration)\ - .\eterPythonLib___Win32_MfcRelease\ - .\eterPythonLib___Win32_MfcRelease\ + $(SolutionDir)build\$(Configuration)\ - .\Release\ - .\Release\ + $(SolutionDir)build\$(Configuration)\ - .\VTune\ - .\VTune\ + $(SolutionDir)build\$(Configuration)\ - .\eterPythonLib___Win32_MfcDebug\ - .\eterPythonLib___Win32_MfcDebug\ + $(SolutionDir)build\$(Configuration)\ - .\Debug\ - .\Debug\ + $(SolutionDir)build\$(Configuration)\ true + $(Configuration) true + $(Configuration) true + $(Configuration) @@ -168,7 +164,6 @@ 0x0412 - .\Distribute\eterPythonLib.lib true @@ -230,7 +225,6 @@ 0x0412 - .\Release\eterPythonLib.lib true @@ -322,7 +316,6 @@ 0x0412 - .\Debug\eterPythonLib.lib true diff --git a/EterPythonLib/eterPythonLib_VC90.vcxproj.filters b/src/EterPythonLib/EterPythonLib.vcxproj.filters similarity index 100% rename from EterPythonLib/eterPythonLib_VC90.vcxproj.filters rename to src/EterPythonLib/EterPythonLib.vcxproj.filters diff --git a/EterPythonLib/PythonGraphic.cpp b/src/EterPythonLib/PythonGraphic.cpp similarity index 100% rename from EterPythonLib/PythonGraphic.cpp rename to src/EterPythonLib/PythonGraphic.cpp diff --git a/EterPythonLib/PythonGraphic.h b/src/EterPythonLib/PythonGraphic.h similarity index 100% rename from EterPythonLib/PythonGraphic.h rename to src/EterPythonLib/PythonGraphic.h diff --git a/EterPythonLib/PythonGraphicImageModule.cpp b/src/EterPythonLib/PythonGraphicImageModule.cpp similarity index 100% rename from EterPythonLib/PythonGraphicImageModule.cpp rename to src/EterPythonLib/PythonGraphicImageModule.cpp diff --git a/EterPythonLib/PythonGraphicModule.cpp b/src/EterPythonLib/PythonGraphicModule.cpp similarity index 100% rename from EterPythonLib/PythonGraphicModule.cpp rename to src/EterPythonLib/PythonGraphicModule.cpp diff --git a/EterPythonLib/PythonGraphicTextModule.cpp b/src/EterPythonLib/PythonGraphicTextModule.cpp similarity index 100% rename from EterPythonLib/PythonGraphicTextModule.cpp rename to src/EterPythonLib/PythonGraphicTextModule.cpp diff --git a/EterPythonLib/PythonGraphicThingModule.cpp b/src/EterPythonLib/PythonGraphicThingModule.cpp similarity index 100% rename from EterPythonLib/PythonGraphicThingModule.cpp rename to src/EterPythonLib/PythonGraphicThingModule.cpp diff --git a/EterPythonLib/PythonGridSlotWindow.cpp b/src/EterPythonLib/PythonGridSlotWindow.cpp similarity index 100% rename from EterPythonLib/PythonGridSlotWindow.cpp rename to src/EterPythonLib/PythonGridSlotWindow.cpp diff --git a/EterPythonLib/PythonGridSlotWindow.h b/src/EterPythonLib/PythonGridSlotWindow.h similarity index 100% rename from EterPythonLib/PythonGridSlotWindow.h rename to src/EterPythonLib/PythonGridSlotWindow.h diff --git a/EterPythonLib/PythonSlotWindow.cpp b/src/EterPythonLib/PythonSlotWindow.cpp similarity index 100% rename from EterPythonLib/PythonSlotWindow.cpp rename to src/EterPythonLib/PythonSlotWindow.cpp diff --git a/EterPythonLib/PythonSlotWindow.h b/src/EterPythonLib/PythonSlotWindow.h similarity index 100% rename from EterPythonLib/PythonSlotWindow.h rename to src/EterPythonLib/PythonSlotWindow.h diff --git a/EterPythonLib/PythonWindow.cpp b/src/EterPythonLib/PythonWindow.cpp similarity index 100% rename from EterPythonLib/PythonWindow.cpp rename to src/EterPythonLib/PythonWindow.cpp diff --git a/EterPythonLib/PythonWindow.h b/src/EterPythonLib/PythonWindow.h similarity index 100% rename from EterPythonLib/PythonWindow.h rename to src/EterPythonLib/PythonWindow.h diff --git a/EterPythonLib/PythonWindowManager.cpp b/src/EterPythonLib/PythonWindowManager.cpp similarity index 100% rename from EterPythonLib/PythonWindowManager.cpp rename to src/EterPythonLib/PythonWindowManager.cpp diff --git a/EterPythonLib/PythonWindowManager.h b/src/EterPythonLib/PythonWindowManager.h similarity index 100% rename from EterPythonLib/PythonWindowManager.h rename to src/EterPythonLib/PythonWindowManager.h diff --git a/EterPythonLib/PythonWindowManagerModule.cpp b/src/EterPythonLib/PythonWindowManagerModule.cpp similarity index 100% rename from EterPythonLib/PythonWindowManagerModule.cpp rename to src/EterPythonLib/PythonWindowManagerModule.cpp diff --git a/EterPythonLib/StdAfx.cpp b/src/EterPythonLib/StdAfx.cpp similarity index 100% rename from EterPythonLib/StdAfx.cpp rename to src/EterPythonLib/StdAfx.cpp diff --git a/EterPythonLib/StdAfx.h b/src/EterPythonLib/StdAfx.h similarity index 100% rename from EterPythonLib/StdAfx.h rename to src/EterPythonLib/StdAfx.h diff --git a/GameLib/ActorInstance.cpp b/src/GameLib/ActorInstance.cpp similarity index 100% rename from GameLib/ActorInstance.cpp rename to src/GameLib/ActorInstance.cpp diff --git a/GameLib/ActorInstance.h b/src/GameLib/ActorInstance.h similarity index 100% rename from GameLib/ActorInstance.h rename to src/GameLib/ActorInstance.h diff --git a/GameLib/ActorInstanceAttach.cpp b/src/GameLib/ActorInstanceAttach.cpp similarity index 100% rename from GameLib/ActorInstanceAttach.cpp rename to src/GameLib/ActorInstanceAttach.cpp diff --git a/GameLib/ActorInstanceBattle.cpp b/src/GameLib/ActorInstanceBattle.cpp similarity index 100% rename from GameLib/ActorInstanceBattle.cpp rename to src/GameLib/ActorInstanceBattle.cpp diff --git a/GameLib/ActorInstanceBlend.cpp b/src/GameLib/ActorInstanceBlend.cpp similarity index 100% rename from GameLib/ActorInstanceBlend.cpp rename to src/GameLib/ActorInstanceBlend.cpp diff --git a/GameLib/ActorInstanceCollisionDetection.cpp b/src/GameLib/ActorInstanceCollisionDetection.cpp similarity index 100% rename from GameLib/ActorInstanceCollisionDetection.cpp rename to src/GameLib/ActorInstanceCollisionDetection.cpp diff --git a/GameLib/ActorInstanceData.cpp b/src/GameLib/ActorInstanceData.cpp similarity index 100% rename from GameLib/ActorInstanceData.cpp rename to src/GameLib/ActorInstanceData.cpp diff --git a/GameLib/ActorInstanceEvent.cpp b/src/GameLib/ActorInstanceEvent.cpp similarity index 100% rename from GameLib/ActorInstanceEvent.cpp rename to src/GameLib/ActorInstanceEvent.cpp diff --git a/GameLib/ActorInstanceFly.cpp b/src/GameLib/ActorInstanceFly.cpp similarity index 100% rename from GameLib/ActorInstanceFly.cpp rename to src/GameLib/ActorInstanceFly.cpp diff --git a/GameLib/ActorInstanceInterface.h b/src/GameLib/ActorInstanceInterface.h similarity index 100% rename from GameLib/ActorInstanceInterface.h rename to src/GameLib/ActorInstanceInterface.h diff --git a/GameLib/ActorInstanceMotion.cpp b/src/GameLib/ActorInstanceMotion.cpp similarity index 100% rename from GameLib/ActorInstanceMotion.cpp rename to src/GameLib/ActorInstanceMotion.cpp diff --git a/GameLib/ActorInstanceMotionEvent.cpp b/src/GameLib/ActorInstanceMotionEvent.cpp similarity index 100% rename from GameLib/ActorInstanceMotionEvent.cpp rename to src/GameLib/ActorInstanceMotionEvent.cpp diff --git a/GameLib/ActorInstancePosition.cpp b/src/GameLib/ActorInstancePosition.cpp similarity index 100% rename from GameLib/ActorInstancePosition.cpp rename to src/GameLib/ActorInstancePosition.cpp diff --git a/GameLib/ActorInstanceRender.cpp b/src/GameLib/ActorInstanceRender.cpp similarity index 100% rename from GameLib/ActorInstanceRender.cpp rename to src/GameLib/ActorInstanceRender.cpp diff --git a/GameLib/ActorInstanceRotation.cpp b/src/GameLib/ActorInstanceRotation.cpp similarity index 100% rename from GameLib/ActorInstanceRotation.cpp rename to src/GameLib/ActorInstanceRotation.cpp diff --git a/GameLib/ActorInstanceSync.cpp b/src/GameLib/ActorInstanceSync.cpp similarity index 100% rename from GameLib/ActorInstanceSync.cpp rename to src/GameLib/ActorInstanceSync.cpp diff --git a/GameLib/ActorInstanceWeaponTrace.cpp b/src/GameLib/ActorInstanceWeaponTrace.cpp similarity index 100% rename from GameLib/ActorInstanceWeaponTrace.cpp rename to src/GameLib/ActorInstanceWeaponTrace.cpp diff --git a/GameLib/Area.cpp b/src/GameLib/Area.cpp similarity index 99% rename from GameLib/Area.cpp rename to src/GameLib/Area.cpp index 80f48403..1b54d283 100644 --- a/GameLib/Area.cpp +++ b/src/GameLib/Area.cpp @@ -10,8 +10,6 @@ #include "PropertyManager.h" #include "Property.h" -#include - CDynamicPool CArea::ms_ObjectInstancePool; CDynamicPool CArea::ms_AttributeInstancePool; CDynamicPool CArea::ms_AmbienceInstancePool; @@ -732,7 +730,10 @@ void CArea::__LoadAttribute(TObjectInstance * pObjectInstance, const char * c_sz if (false == bFileExist) { std::string attrFileName(c_szAttributeFileName); - boost::algorithm::to_lower(attrFileName); + + // TODO: Not UTF-8 safe string tolower() + std::transform(attrFileName.begin(), attrFileName.end(), attrFileName.begin(), [](unsigned char c) { return std::tolower(c); }); + const bool bIsDungeonObject = (std::string::npos != attrFileName.find("/dungeon/")) || (std::string::npos != attrFileName.find("\\dungeon\\")); // NOTE: dungeon ¿ÀºêÁ§Æ®´Â Dummy CollisionÀ» ÀÚµ¿À¸·Î »ý¼ºÇÏÁö ¾Êµµ·Ï ÇÔ (´øÀüÀÇ °æ¿ì ´õ¹Ì Äø®Àü¶§¹®¿¡ ¹®Á¦°¡ µÈ °æ¿ì°¡ ¼öÂ÷·Ê ÀÖ¾úÀ½. ÀÌ·¸°Ô Çϱâ·Î ±×·¡ÇÈ ÆÀ°ú ÇùÀÇ ¿Ï·á) diff --git a/GameLib/Area.h b/src/GameLib/Area.h similarity index 100% rename from GameLib/Area.h rename to src/GameLib/Area.h diff --git a/GameLib/AreaLoaderThread.cpp b/src/GameLib/AreaLoaderThread.cpp similarity index 100% rename from GameLib/AreaLoaderThread.cpp rename to src/GameLib/AreaLoaderThread.cpp diff --git a/GameLib/AreaLoaderThread.h b/src/GameLib/AreaLoaderThread.h similarity index 100% rename from GameLib/AreaLoaderThread.h rename to src/GameLib/AreaLoaderThread.h diff --git a/GameLib/AreaTerrain.cpp b/src/GameLib/AreaTerrain.cpp similarity index 100% rename from GameLib/AreaTerrain.cpp rename to src/GameLib/AreaTerrain.cpp diff --git a/GameLib/AreaTerrain.h b/src/GameLib/AreaTerrain.h similarity index 100% rename from GameLib/AreaTerrain.h rename to src/GameLib/AreaTerrain.h diff --git a/GameLib/DungeonBlock.cpp b/src/GameLib/DungeonBlock.cpp similarity index 100% rename from GameLib/DungeonBlock.cpp rename to src/GameLib/DungeonBlock.cpp diff --git a/GameLib/DungeonBlock.h b/src/GameLib/DungeonBlock.h similarity index 100% rename from GameLib/DungeonBlock.h rename to src/GameLib/DungeonBlock.h diff --git a/GameLib/FlyHandler.h b/src/GameLib/FlyHandler.h similarity index 100% rename from GameLib/FlyHandler.h rename to src/GameLib/FlyHandler.h diff --git a/GameLib/FlyTarget.cpp b/src/GameLib/FlyTarget.cpp similarity index 100% rename from GameLib/FlyTarget.cpp rename to src/GameLib/FlyTarget.cpp diff --git a/GameLib/FlyTarget.h b/src/GameLib/FlyTarget.h similarity index 100% rename from GameLib/FlyTarget.h rename to src/GameLib/FlyTarget.h diff --git a/GameLib/FlyTrace.cpp b/src/GameLib/FlyTrace.cpp similarity index 100% rename from GameLib/FlyTrace.cpp rename to src/GameLib/FlyTrace.cpp diff --git a/GameLib/FlyTrace.h b/src/GameLib/FlyTrace.h similarity index 100% rename from GameLib/FlyTrace.h rename to src/GameLib/FlyTrace.h diff --git a/GameLib/FlyingData.cpp b/src/GameLib/FlyingData.cpp similarity index 100% rename from GameLib/FlyingData.cpp rename to src/GameLib/FlyingData.cpp diff --git a/GameLib/FlyingData.h b/src/GameLib/FlyingData.h similarity index 100% rename from GameLib/FlyingData.h rename to src/GameLib/FlyingData.h diff --git a/GameLib/FlyingInstance.cpp b/src/GameLib/FlyingInstance.cpp similarity index 100% rename from GameLib/FlyingInstance.cpp rename to src/GameLib/FlyingInstance.cpp diff --git a/GameLib/FlyingInstance.h b/src/GameLib/FlyingInstance.h similarity index 100% rename from GameLib/FlyingInstance.h rename to src/GameLib/FlyingInstance.h diff --git a/GameLib/FlyingObjectManager.cpp b/src/GameLib/FlyingObjectManager.cpp similarity index 100% rename from GameLib/FlyingObjectManager.cpp rename to src/GameLib/FlyingObjectManager.cpp diff --git a/GameLib/FlyingObjectManager.h b/src/GameLib/FlyingObjectManager.h similarity index 100% rename from GameLib/FlyingObjectManager.h rename to src/GameLib/FlyingObjectManager.h diff --git a/GameLib/GameEventManager.cpp b/src/GameLib/GameEventManager.cpp similarity index 100% rename from GameLib/GameEventManager.cpp rename to src/GameLib/GameEventManager.cpp diff --git a/GameLib/GameEventManager.h b/src/GameLib/GameEventManager.h similarity index 100% rename from GameLib/GameEventManager.h rename to src/GameLib/GameEventManager.h diff --git a/GameLib/gamelib_VC90.vcxproj b/src/GameLib/GameLib.vcxproj similarity index 99% rename from GameLib/gamelib_VC90.vcxproj rename to src/GameLib/GameLib.vcxproj index 202da710..a032cf45 100644 --- a/GameLib/gamelib_VC90.vcxproj +++ b/src/GameLib/GameLib.vcxproj @@ -28,16 +28,15 @@ 17.0 - gamelib + GameLib {1801F0ED-7DE6-4175-BF25-6FA98AAA350B} - gamelib + GameLib SAK SAK SAK SAK MFCProj - - + 10.0 @@ -60,9 +59,9 @@ StaticLibrary - v143 false MultiByte + v143 StaticLibrary @@ -108,37 +107,34 @@ <_ProjectFileVersion>17.0.32203.90 - .\VTune\ - .\VTune\ + $(SolutionDir)build\$(Configuration)\ - .\Debug\ - .\Debug\ + $(SolutionDir)build\$(Configuration)\ - .\Release\ - .\Release\ + $(SolutionDir)build\$(Configuration)\ - .\Distribute\ - .\Distribute\ + $(SolutionDir)build\$(Configuration)\ - .\MfcRelease\ - .\MfcRelease\ + $(SolutionDir)build\$(Configuration)\ - .\MfcDebug\ - .\MfcDebug\ + $(SolutionDir)build\$(Configuration)\ true + $(Configuration) true + $(Configuration) true + $(Configuration) @@ -201,7 +197,6 @@ true - .\Debug\gamelib.lib true @@ -233,7 +228,6 @@ c:/eterlib/bin/;%(AdditionalIncludeDirectories) - .\Release\gamelib.lib true @@ -266,7 +260,6 @@ c:/eterlib/bin/;%(AdditionalIncludeDirectories) - .\Distribute\gamelib.lib true diff --git a/GameLib/gamelib_VC90.vcxproj.filters b/src/GameLib/GameLib.vcxproj.filters similarity index 100% rename from GameLib/gamelib_VC90.vcxproj.filters rename to src/GameLib/GameLib.vcxproj.filters diff --git a/GameLib/GameType.cpp b/src/GameLib/GameType.cpp similarity index 100% rename from GameLib/GameType.cpp rename to src/GameLib/GameType.cpp diff --git a/GameLib/GameType.h b/src/GameLib/GameType.h similarity index 100% rename from GameLib/GameType.h rename to src/GameLib/GameType.h diff --git a/GameLib/GameUtil.cpp b/src/GameLib/GameUtil.cpp similarity index 100% rename from GameLib/GameUtil.cpp rename to src/GameLib/GameUtil.cpp diff --git a/GameLib/GameUtil.h b/src/GameLib/GameUtil.h similarity index 100% rename from GameLib/GameUtil.h rename to src/GameLib/GameUtil.h diff --git a/GameLib/Interface.h b/src/GameLib/Interface.h similarity index 100% rename from GameLib/Interface.h rename to src/GameLib/Interface.h diff --git a/GameLib/ItemData.cpp b/src/GameLib/ItemData.cpp similarity index 100% rename from GameLib/ItemData.cpp rename to src/GameLib/ItemData.cpp diff --git a/GameLib/ItemData.h b/src/GameLib/ItemData.h similarity index 100% rename from GameLib/ItemData.h rename to src/GameLib/ItemData.h diff --git a/GameLib/ItemManager.cpp b/src/GameLib/ItemManager.cpp similarity index 100% rename from GameLib/ItemManager.cpp rename to src/GameLib/ItemManager.cpp diff --git a/GameLib/ItemManager.h b/src/GameLib/ItemManager.h similarity index 100% rename from GameLib/ItemManager.h rename to src/GameLib/ItemManager.h diff --git a/GameLib/MapBase.cpp b/src/GameLib/MapBase.cpp similarity index 100% rename from GameLib/MapBase.cpp rename to src/GameLib/MapBase.cpp diff --git a/GameLib/MapBase.h b/src/GameLib/MapBase.h similarity index 100% rename from GameLib/MapBase.h rename to src/GameLib/MapBase.h diff --git a/GameLib/MapManager.cpp b/src/GameLib/MapManager.cpp similarity index 100% rename from GameLib/MapManager.cpp rename to src/GameLib/MapManager.cpp diff --git a/GameLib/MapManager.h b/src/GameLib/MapManager.h similarity index 100% rename from GameLib/MapManager.h rename to src/GameLib/MapManager.h diff --git a/GameLib/MapOutdoor.cpp b/src/GameLib/MapOutdoor.cpp similarity index 100% rename from GameLib/MapOutdoor.cpp rename to src/GameLib/MapOutdoor.cpp diff --git a/GameLib/MapOutdoor.h b/src/GameLib/MapOutdoor.h similarity index 100% rename from GameLib/MapOutdoor.h rename to src/GameLib/MapOutdoor.h diff --git a/GameLib/MapOutdoorCharacterShadow.cpp b/src/GameLib/MapOutdoorCharacterShadow.cpp similarity index 100% rename from GameLib/MapOutdoorCharacterShadow.cpp rename to src/GameLib/MapOutdoorCharacterShadow.cpp diff --git a/GameLib/MapOutdoorIndexBuffer.cpp b/src/GameLib/MapOutdoorIndexBuffer.cpp similarity index 100% rename from GameLib/MapOutdoorIndexBuffer.cpp rename to src/GameLib/MapOutdoorIndexBuffer.cpp diff --git a/GameLib/MapOutdoorLoad.cpp b/src/GameLib/MapOutdoorLoad.cpp similarity index 100% rename from GameLib/MapOutdoorLoad.cpp rename to src/GameLib/MapOutdoorLoad.cpp diff --git a/GameLib/MapOutdoorQuadtree.cpp b/src/GameLib/MapOutdoorQuadtree.cpp similarity index 100% rename from GameLib/MapOutdoorQuadtree.cpp rename to src/GameLib/MapOutdoorQuadtree.cpp diff --git a/GameLib/MapOutdoorRender.cpp b/src/GameLib/MapOutdoorRender.cpp similarity index 100% rename from GameLib/MapOutdoorRender.cpp rename to src/GameLib/MapOutdoorRender.cpp diff --git a/GameLib/MapOutdoorRenderHTP.cpp b/src/GameLib/MapOutdoorRenderHTP.cpp similarity index 100% rename from GameLib/MapOutdoorRenderHTP.cpp rename to src/GameLib/MapOutdoorRenderHTP.cpp diff --git a/GameLib/MapOutdoorRenderSTP.cpp b/src/GameLib/MapOutdoorRenderSTP.cpp similarity index 100% rename from GameLib/MapOutdoorRenderSTP.cpp rename to src/GameLib/MapOutdoorRenderSTP.cpp diff --git a/GameLib/MapOutdoorUpdate.cpp b/src/GameLib/MapOutdoorUpdate.cpp similarity index 100% rename from GameLib/MapOutdoorUpdate.cpp rename to src/GameLib/MapOutdoorUpdate.cpp diff --git a/GameLib/MapOutdoorWater.cpp b/src/GameLib/MapOutdoorWater.cpp similarity index 100% rename from GameLib/MapOutdoorWater.cpp rename to src/GameLib/MapOutdoorWater.cpp diff --git a/GameLib/MapType.cpp b/src/GameLib/MapType.cpp similarity index 100% rename from GameLib/MapType.cpp rename to src/GameLib/MapType.cpp diff --git a/GameLib/MapType.h b/src/GameLib/MapType.h similarity index 100% rename from GameLib/MapType.h rename to src/GameLib/MapType.h diff --git a/GameLib/MapUtil.cpp b/src/GameLib/MapUtil.cpp similarity index 100% rename from GameLib/MapUtil.cpp rename to src/GameLib/MapUtil.cpp diff --git a/GameLib/MapUtil.h b/src/GameLib/MapUtil.h similarity index 100% rename from GameLib/MapUtil.h rename to src/GameLib/MapUtil.h diff --git a/GameLib/MonsterAreaInfo.cpp b/src/GameLib/MonsterAreaInfo.cpp similarity index 100% rename from GameLib/MonsterAreaInfo.cpp rename to src/GameLib/MonsterAreaInfo.cpp diff --git a/GameLib/MonsterAreaInfo.h b/src/GameLib/MonsterAreaInfo.h similarity index 100% rename from GameLib/MonsterAreaInfo.h rename to src/GameLib/MonsterAreaInfo.h diff --git a/GameLib/PhysicsObject.cpp b/src/GameLib/PhysicsObject.cpp similarity index 100% rename from GameLib/PhysicsObject.cpp rename to src/GameLib/PhysicsObject.cpp diff --git a/GameLib/PhysicsObject.h b/src/GameLib/PhysicsObject.h similarity index 100% rename from GameLib/PhysicsObject.h rename to src/GameLib/PhysicsObject.h diff --git a/GameLib/Property.cpp b/src/GameLib/Property.cpp similarity index 100% rename from GameLib/Property.cpp rename to src/GameLib/Property.cpp diff --git a/GameLib/Property.h b/src/GameLib/Property.h similarity index 100% rename from GameLib/Property.h rename to src/GameLib/Property.h diff --git a/GameLib/PropertyLoader.cpp b/src/GameLib/PropertyLoader.cpp similarity index 100% rename from GameLib/PropertyLoader.cpp rename to src/GameLib/PropertyLoader.cpp diff --git a/GameLib/PropertyLoader.h b/src/GameLib/PropertyLoader.h similarity index 100% rename from GameLib/PropertyLoader.h rename to src/GameLib/PropertyLoader.h diff --git a/GameLib/PropertyManager.cpp b/src/GameLib/PropertyManager.cpp similarity index 100% rename from GameLib/PropertyManager.cpp rename to src/GameLib/PropertyManager.cpp diff --git a/GameLib/PropertyManager.h b/src/GameLib/PropertyManager.h similarity index 100% rename from GameLib/PropertyManager.h rename to src/GameLib/PropertyManager.h diff --git a/GameLib/RaceData.cpp b/src/GameLib/RaceData.cpp similarity index 100% rename from GameLib/RaceData.cpp rename to src/GameLib/RaceData.cpp diff --git a/GameLib/RaceData.h b/src/GameLib/RaceData.h similarity index 100% rename from GameLib/RaceData.h rename to src/GameLib/RaceData.h diff --git a/GameLib/RaceDataFile.cpp b/src/GameLib/RaceDataFile.cpp similarity index 100% rename from GameLib/RaceDataFile.cpp rename to src/GameLib/RaceDataFile.cpp diff --git a/GameLib/RaceManager.cpp b/src/GameLib/RaceManager.cpp similarity index 100% rename from GameLib/RaceManager.cpp rename to src/GameLib/RaceManager.cpp diff --git a/GameLib/RaceManager.h b/src/GameLib/RaceManager.h similarity index 100% rename from GameLib/RaceManager.h rename to src/GameLib/RaceManager.h diff --git a/GameLib/RaceMotionData.cpp b/src/GameLib/RaceMotionData.cpp similarity index 100% rename from GameLib/RaceMotionData.cpp rename to src/GameLib/RaceMotionData.cpp diff --git a/GameLib/RaceMotionData.h b/src/GameLib/RaceMotionData.h similarity index 100% rename from GameLib/RaceMotionData.h rename to src/GameLib/RaceMotionData.h diff --git a/GameLib/RaceMotionDataEvent.h b/src/GameLib/RaceMotionDataEvent.h similarity index 100% rename from GameLib/RaceMotionDataEvent.h rename to src/GameLib/RaceMotionDataEvent.h diff --git a/GameLib/SnowEnvironment.cpp b/src/GameLib/SnowEnvironment.cpp similarity index 100% rename from GameLib/SnowEnvironment.cpp rename to src/GameLib/SnowEnvironment.cpp diff --git a/GameLib/SnowEnvironment.h b/src/GameLib/SnowEnvironment.h similarity index 100% rename from GameLib/SnowEnvironment.h rename to src/GameLib/SnowEnvironment.h diff --git a/GameLib/SnowParticle.cpp b/src/GameLib/SnowParticle.cpp similarity index 100% rename from GameLib/SnowParticle.cpp rename to src/GameLib/SnowParticle.cpp diff --git a/GameLib/SnowParticle.h b/src/GameLib/SnowParticle.h similarity index 100% rename from GameLib/SnowParticle.h rename to src/GameLib/SnowParticle.h diff --git a/GameLib/StdAfx.cpp b/src/GameLib/StdAfx.cpp similarity index 100% rename from GameLib/StdAfx.cpp rename to src/GameLib/StdAfx.cpp diff --git a/GameLib/StdAfx.h b/src/GameLib/StdAfx.h similarity index 100% rename from GameLib/StdAfx.h rename to src/GameLib/StdAfx.h diff --git a/GameLib/TerrainDecal.cpp b/src/GameLib/TerrainDecal.cpp similarity index 100% rename from GameLib/TerrainDecal.cpp rename to src/GameLib/TerrainDecal.cpp diff --git a/GameLib/TerrainDecal.h b/src/GameLib/TerrainDecal.h similarity index 100% rename from GameLib/TerrainDecal.h rename to src/GameLib/TerrainDecal.h diff --git a/GameLib/TerrainPatch.cpp b/src/GameLib/TerrainPatch.cpp similarity index 100% rename from GameLib/TerrainPatch.cpp rename to src/GameLib/TerrainPatch.cpp diff --git a/GameLib/TerrainPatch.h b/src/GameLib/TerrainPatch.h similarity index 100% rename from GameLib/TerrainPatch.h rename to src/GameLib/TerrainPatch.h diff --git a/GameLib/TerrainQuadtree.cpp b/src/GameLib/TerrainQuadtree.cpp similarity index 100% rename from GameLib/TerrainQuadtree.cpp rename to src/GameLib/TerrainQuadtree.cpp diff --git a/GameLib/TerrainQuadtree.h b/src/GameLib/TerrainQuadtree.h similarity index 100% rename from GameLib/TerrainQuadtree.h rename to src/GameLib/TerrainQuadtree.h diff --git a/GameLib/WeaponTrace.cpp b/src/GameLib/WeaponTrace.cpp similarity index 100% rename from GameLib/WeaponTrace.cpp rename to src/GameLib/WeaponTrace.cpp diff --git a/GameLib/WeaponTrace.h b/src/GameLib/WeaponTrace.h similarity index 100% rename from GameLib/WeaponTrace.h rename to src/GameLib/WeaponTrace.h diff --git a/MilesLib/mileslib_VC90.vcxproj b/src/MilesLib/MilesLib.vcxproj similarity index 97% rename from MilesLib/mileslib_VC90.vcxproj rename to src/MilesLib/MilesLib.vcxproj index 0503d29e..792af507 100644 --- a/MilesLib/mileslib_VC90.vcxproj +++ b/src/MilesLib/MilesLib.vcxproj @@ -28,16 +28,15 @@ 17.0 - mileslib + MilesLib {9189BA90-1997-4B47-A673-A54C7DF4A4F7} - mileslib + MilesLib SAK SAK SAK SAK MFCProj - - + 10.0 @@ -60,9 +59,9 @@ StaticLibrary - v143 false MultiByte + v143 StaticLibrary @@ -108,37 +107,34 @@ <_ProjectFileVersion>17.0.32203.90 - .\Distribute\ - .\Distribute\ + $(SolutionDir)build\$(Configuration)\ - .\VTune\ - .\VTune\ + $(SolutionDir)build\$(Configuration)\ - .\Release\ - .\Release\ + $(SolutionDir)build\$(Configuration)\ - .\MfcRelease\ - .\MfcRelease\ + $(SolutionDir)build\$(Configuration)\ - .\mileslib___Win32_MfcDebug\ - .\mileslib___Win32_MfcDebug\ + $(SolutionDir)build\$(Configuration)\ - .\Debug\ - .\Debug\ + $(SolutionDir)build\$(Configuration)\ true + $(Configuration) true + $(Configuration) true + $(Configuration) @@ -167,7 +163,6 @@ 0x0412 - .\Distribute\mileslib.lib true @@ -230,7 +225,6 @@ 0x0412 - .\Release\mileslib.lib true @@ -319,7 +313,6 @@ true - .\Debug\mileslib.lib true diff --git a/MilesLib/mileslib_VC90.vcxproj.filters b/src/MilesLib/MilesLib.vcxproj.filters similarity index 100% rename from MilesLib/mileslib_VC90.vcxproj.filters rename to src/MilesLib/MilesLib.vcxproj.filters diff --git a/MilesLib/SoundBase.cpp b/src/MilesLib/SoundBase.cpp similarity index 100% rename from MilesLib/SoundBase.cpp rename to src/MilesLib/SoundBase.cpp diff --git a/MilesLib/SoundBase.h b/src/MilesLib/SoundBase.h similarity index 100% rename from MilesLib/SoundBase.h rename to src/MilesLib/SoundBase.h diff --git a/MilesLib/SoundData.cpp b/src/MilesLib/SoundData.cpp similarity index 100% rename from MilesLib/SoundData.cpp rename to src/MilesLib/SoundData.cpp diff --git a/MilesLib/SoundData.h b/src/MilesLib/SoundData.h similarity index 100% rename from MilesLib/SoundData.h rename to src/MilesLib/SoundData.h diff --git a/MilesLib/SoundInstance.h b/src/MilesLib/SoundInstance.h similarity index 100% rename from MilesLib/SoundInstance.h rename to src/MilesLib/SoundInstance.h diff --git a/MilesLib/SoundInstance2D.cpp b/src/MilesLib/SoundInstance2D.cpp similarity index 100% rename from MilesLib/SoundInstance2D.cpp rename to src/MilesLib/SoundInstance2D.cpp diff --git a/MilesLib/SoundInstance3D.cpp b/src/MilesLib/SoundInstance3D.cpp similarity index 100% rename from MilesLib/SoundInstance3D.cpp rename to src/MilesLib/SoundInstance3D.cpp diff --git a/MilesLib/SoundInstanceStream.cpp b/src/MilesLib/SoundInstanceStream.cpp similarity index 100% rename from MilesLib/SoundInstanceStream.cpp rename to src/MilesLib/SoundInstanceStream.cpp diff --git a/MilesLib/SoundManager.cpp b/src/MilesLib/SoundManager.cpp similarity index 100% rename from MilesLib/SoundManager.cpp rename to src/MilesLib/SoundManager.cpp diff --git a/MilesLib/SoundManager.h b/src/MilesLib/SoundManager.h similarity index 100% rename from MilesLib/SoundManager.h rename to src/MilesLib/SoundManager.h diff --git a/MilesLib/SoundManager2D.cpp b/src/MilesLib/SoundManager2D.cpp similarity index 100% rename from MilesLib/SoundManager2D.cpp rename to src/MilesLib/SoundManager2D.cpp diff --git a/MilesLib/SoundManager2D.h b/src/MilesLib/SoundManager2D.h similarity index 100% rename from MilesLib/SoundManager2D.h rename to src/MilesLib/SoundManager2D.h diff --git a/MilesLib/SoundManager3D.cpp b/src/MilesLib/SoundManager3D.cpp similarity index 100% rename from MilesLib/SoundManager3D.cpp rename to src/MilesLib/SoundManager3D.cpp diff --git a/MilesLib/SoundManager3D.h b/src/MilesLib/SoundManager3D.h similarity index 100% rename from MilesLib/SoundManager3D.h rename to src/MilesLib/SoundManager3D.h diff --git a/MilesLib/SoundManagerStream.cpp b/src/MilesLib/SoundManagerStream.cpp similarity index 100% rename from MilesLib/SoundManagerStream.cpp rename to src/MilesLib/SoundManagerStream.cpp diff --git a/MilesLib/SoundManagerStream.h b/src/MilesLib/SoundManagerStream.h similarity index 100% rename from MilesLib/SoundManagerStream.h rename to src/MilesLib/SoundManagerStream.h diff --git a/MilesLib/Stdafx.cpp b/src/MilesLib/Stdafx.cpp similarity index 100% rename from MilesLib/Stdafx.cpp rename to src/MilesLib/Stdafx.cpp diff --git a/MilesLib/Stdafx.h b/src/MilesLib/Stdafx.h similarity index 100% rename from MilesLib/Stdafx.h rename to src/MilesLib/Stdafx.h diff --git a/MilesLib/Type.cpp b/src/MilesLib/Type.cpp similarity index 100% rename from MilesLib/Type.cpp rename to src/MilesLib/Type.cpp diff --git a/MilesLib/Type.h b/src/MilesLib/Type.h similarity index 100% rename from MilesLib/Type.h rename to src/MilesLib/Type.h diff --git a/PRTerrainLib/PRTerrainLib_VC90.vcxproj b/src/PRTerrainLib/PRTerrainLib.vcxproj similarity index 96% rename from PRTerrainLib/PRTerrainLib_VC90.vcxproj rename to src/PRTerrainLib/PRTerrainLib.vcxproj index f76eac8e..5ce6cd54 100644 --- a/PRTerrainLib/PRTerrainLib_VC90.vcxproj +++ b/src/PRTerrainLib/PRTerrainLib.vcxproj @@ -36,8 +36,7 @@ SAK SAK MFCProj - - + 10.0 @@ -48,9 +47,9 @@ StaticLibrary - v143 false MultiByte + v143 StaticLibrary @@ -108,37 +107,34 @@ <_ProjectFileVersion>17.0.32203.90 - .\PRTerrainLib___Win32_MfcDebug\ - .\PRTerrainLib___Win32_MfcDebug\ + $(SolutionDir)build\$(Configuration)\ - .\Distribute\ - .\Distribute\ + $(SolutionDir)build\$(Configuration)\ - .\PRTerrainLib___Win32_MfcRelease\ - .\PRTerrainLib___Win32_MfcRelease\ + $(SolutionDir)build\$(Configuration)\ - .\VTune\ - .\VTune\ + $(SolutionDir)build\$(Configuration)\ - .\Release\ - .\Release\ + $(SolutionDir)build\$(Configuration)\ - .\Debug\ - .\Debug\ + $(SolutionDir)build\$(Configuration)\ true + $(Configuration) true + $(Configuration) true + $(Configuration) @@ -196,7 +192,6 @@ 0x0412 - .\Distribute\PRTerrainLib.lib true @@ -292,7 +287,6 @@ 0x0412 - .\Release\PRTerrainLib.lib true @@ -321,7 +315,6 @@ 0x0412 - .\Debug\PRTerrainLib.lib true diff --git a/PRTerrainLib/PRTerrainLib_VC90.vcxproj.filters b/src/PRTerrainLib/PRTerrainLib.vcxproj.filters similarity index 100% rename from PRTerrainLib/PRTerrainLib_VC90.vcxproj.filters rename to src/PRTerrainLib/PRTerrainLib.vcxproj.filters diff --git a/PRTerrainLib/StdAfx.cpp b/src/PRTerrainLib/StdAfx.cpp similarity index 100% rename from PRTerrainLib/StdAfx.cpp rename to src/PRTerrainLib/StdAfx.cpp diff --git a/PRTerrainLib/StdAfx.h b/src/PRTerrainLib/StdAfx.h similarity index 100% rename from PRTerrainLib/StdAfx.h rename to src/PRTerrainLib/StdAfx.h diff --git a/PRTerrainLib/Terrain.cpp b/src/PRTerrainLib/Terrain.cpp similarity index 100% rename from PRTerrainLib/Terrain.cpp rename to src/PRTerrainLib/Terrain.cpp diff --git a/PRTerrainLib/Terrain.h b/src/PRTerrainLib/Terrain.h similarity index 100% rename from PRTerrainLib/Terrain.h rename to src/PRTerrainLib/Terrain.h diff --git a/PRTerrainLib/TerrainType.h b/src/PRTerrainLib/TerrainType.h similarity index 100% rename from PRTerrainLib/TerrainType.h rename to src/PRTerrainLib/TerrainType.h diff --git a/PRTerrainLib/TextureSet.cpp b/src/PRTerrainLib/TextureSet.cpp similarity index 100% rename from PRTerrainLib/TextureSet.cpp rename to src/PRTerrainLib/TextureSet.cpp diff --git a/PRTerrainLib/TextureSet.h b/src/PRTerrainLib/TextureSet.h similarity index 100% rename from PRTerrainLib/TextureSet.h rename to src/PRTerrainLib/TextureSet.h diff --git a/ScriptLib/PythonDebugModule.cpp b/src/ScriptLib/PythonDebugModule.cpp similarity index 100% rename from ScriptLib/PythonDebugModule.cpp rename to src/ScriptLib/PythonDebugModule.cpp diff --git a/ScriptLib/PythonDebugModule.h b/src/ScriptLib/PythonDebugModule.h similarity index 100% rename from ScriptLib/PythonDebugModule.h rename to src/ScriptLib/PythonDebugModule.h diff --git a/ScriptLib/PythonLauncher.cpp b/src/ScriptLib/PythonLauncher.cpp similarity index 100% rename from ScriptLib/PythonLauncher.cpp rename to src/ScriptLib/PythonLauncher.cpp diff --git a/ScriptLib/PythonLauncher.h b/src/ScriptLib/PythonLauncher.h similarity index 100% rename from ScriptLib/PythonLauncher.h rename to src/ScriptLib/PythonLauncher.h diff --git a/ScriptLib/PythonMarshal.cpp b/src/ScriptLib/PythonMarshal.cpp similarity index 100% rename from ScriptLib/PythonMarshal.cpp rename to src/ScriptLib/PythonMarshal.cpp diff --git a/ScriptLib/PythonMarshal.h b/src/ScriptLib/PythonMarshal.h similarity index 100% rename from ScriptLib/PythonMarshal.h rename to src/ScriptLib/PythonMarshal.h diff --git a/ScriptLib/PythonUtils.cpp b/src/ScriptLib/PythonUtils.cpp similarity index 100% rename from ScriptLib/PythonUtils.cpp rename to src/ScriptLib/PythonUtils.cpp diff --git a/ScriptLib/PythonUtils.h b/src/ScriptLib/PythonUtils.h similarity index 100% rename from ScriptLib/PythonUtils.h rename to src/ScriptLib/PythonUtils.h diff --git a/ScriptLib/Resource.cpp b/src/ScriptLib/Resource.cpp similarity index 100% rename from ScriptLib/Resource.cpp rename to src/ScriptLib/Resource.cpp diff --git a/ScriptLib/Resource.h b/src/ScriptLib/Resource.h similarity index 100% rename from ScriptLib/Resource.h rename to src/ScriptLib/Resource.h diff --git a/ScriptLib/scriptLib_VC90.vcxproj b/src/ScriptLib/ScriptLib.vcxproj similarity index 96% rename from ScriptLib/scriptLib_VC90.vcxproj rename to src/ScriptLib/ScriptLib.vcxproj index 217e5178..093f516c 100644 --- a/ScriptLib/scriptLib_VC90.vcxproj +++ b/src/ScriptLib/ScriptLib.vcxproj @@ -28,23 +28,22 @@ 17.0 - scriptLib + ScriptLib {E682CEA2-1D79-4DE9-A2CE-6AED27E4170E} - scriptLib + ScriptLib SAK SAK SAK SAK MFCProj - - + 10.0 StaticLibrary - v143 false MultiByte + v143 StaticLibrary @@ -108,37 +107,34 @@ <_ProjectFileVersion>17.0.32203.90 - .\VTune\ - .\VTune\ + $(SolutionDir)build\$(Configuration)\ - .\Distribute\ - .\Distribute\ + $(SolutionDir)build\$(Configuration)\ - .\Debug\ - .\Debug\ + $(SolutionDir)build\$(Configuration)\ - .\MfcRelease\ - .\MfcRelease\ + $(SolutionDir)build\$(Configuration)\ - .\MfcDebug\ - .\MfcDebug\ + $(SolutionDir)build\$(Configuration)\ - .\Release\ - .\Release\ + $(SolutionDir)build\$(Configuration)\ true + $(Configuration) true + $(Configuration) true + $(Configuration) @@ -202,7 +198,6 @@ 0x0412 - .\Distribute\scriptLib.lib true @@ -232,7 +227,6 @@ true - .\Debug\scriptLib.lib true @@ -322,7 +316,6 @@ 0x0412 - .\Release\scriptLib.lib true diff --git a/ScriptLib/scriptLib_VC90.vcxproj.filters b/src/ScriptLib/ScriptLib.vcxproj.filters similarity index 100% rename from ScriptLib/scriptLib_VC90.vcxproj.filters rename to src/ScriptLib/ScriptLib.vcxproj.filters diff --git a/ScriptLib/StdAfx.cpp b/src/ScriptLib/StdAfx.cpp similarity index 100% rename from ScriptLib/StdAfx.cpp rename to src/ScriptLib/StdAfx.cpp diff --git a/ScriptLib/StdAfx.h b/src/ScriptLib/StdAfx.h similarity index 100% rename from ScriptLib/StdAfx.h rename to src/ScriptLib/StdAfx.h diff --git a/SpeedTreeLib/BoundaryShapeManager.cpp b/src/SpeedTreeLib/BoundaryShapeManager.cpp similarity index 100% rename from SpeedTreeLib/BoundaryShapeManager.cpp rename to src/SpeedTreeLib/BoundaryShapeManager.cpp diff --git a/SpeedTreeLib/BoundaryShapeManager.h b/src/SpeedTreeLib/BoundaryShapeManager.h similarity index 100% rename from SpeedTreeLib/BoundaryShapeManager.h rename to src/SpeedTreeLib/BoundaryShapeManager.h diff --git a/SpeedTreeLib/Constants.h b/src/SpeedTreeLib/Constants.h similarity index 100% rename from SpeedTreeLib/Constants.h rename to src/SpeedTreeLib/Constants.h diff --git a/SpeedTreeLib/SpeedGrassRT.cpp b/src/SpeedTreeLib/SpeedGrassRT.cpp similarity index 100% rename from SpeedTreeLib/SpeedGrassRT.cpp rename to src/SpeedTreeLib/SpeedGrassRT.cpp diff --git a/SpeedTreeLib/SpeedGrassRT.h b/src/SpeedTreeLib/SpeedGrassRT.h similarity index 100% rename from SpeedTreeLib/SpeedGrassRT.h rename to src/SpeedTreeLib/SpeedGrassRT.h diff --git a/SpeedTreeLib/SpeedGrassWrapper.cpp b/src/SpeedTreeLib/SpeedGrassWrapper.cpp similarity index 100% rename from SpeedTreeLib/SpeedGrassWrapper.cpp rename to src/SpeedTreeLib/SpeedGrassWrapper.cpp diff --git a/SpeedTreeLib/SpeedGrassWrapper.h b/src/SpeedTreeLib/SpeedGrassWrapper.h similarity index 100% rename from SpeedTreeLib/SpeedGrassWrapper.h rename to src/SpeedTreeLib/SpeedGrassWrapper.h diff --git a/SpeedTreeLib/SpeedTreeConfig.h b/src/SpeedTreeLib/SpeedTreeConfig.h similarity index 100% rename from SpeedTreeLib/SpeedTreeConfig.h rename to src/SpeedTreeLib/SpeedTreeConfig.h diff --git a/SpeedTreeLib/SpeedTreeForest.cpp b/src/SpeedTreeLib/SpeedTreeForest.cpp similarity index 100% rename from SpeedTreeLib/SpeedTreeForest.cpp rename to src/SpeedTreeLib/SpeedTreeForest.cpp diff --git a/SpeedTreeLib/SpeedTreeForest.h b/src/SpeedTreeLib/SpeedTreeForest.h similarity index 100% rename from SpeedTreeLib/SpeedTreeForest.h rename to src/SpeedTreeLib/SpeedTreeForest.h diff --git a/SpeedTreeLib/SpeedTreeForestDirectX8.cpp b/src/SpeedTreeLib/SpeedTreeForestDirectX8.cpp similarity index 100% rename from SpeedTreeLib/SpeedTreeForestDirectX8.cpp rename to src/SpeedTreeLib/SpeedTreeForestDirectX8.cpp diff --git a/SpeedTreeLib/SpeedTreeForestDirectX8.h b/src/SpeedTreeLib/SpeedTreeForestDirectX8.h similarity index 100% rename from SpeedTreeLib/SpeedTreeForestDirectX8.h rename to src/SpeedTreeLib/SpeedTreeForestDirectX8.h diff --git a/SpeedTreeLib/SpeedTreeLib_VC90.vcxproj b/src/SpeedTreeLib/SpeedTreeLib.vcxproj similarity index 97% rename from SpeedTreeLib/SpeedTreeLib_VC90.vcxproj rename to src/SpeedTreeLib/SpeedTreeLib.vcxproj index c39627ad..9693cf95 100644 --- a/SpeedTreeLib/SpeedTreeLib_VC90.vcxproj +++ b/src/SpeedTreeLib/SpeedTreeLib.vcxproj @@ -36,8 +36,7 @@ SAK SAK MFCProj - - + 10.0 @@ -72,9 +71,9 @@ StaticLibrary - v143 false MultiByte + v143 @@ -108,37 +107,34 @@ <_ProjectFileVersion>17.0.32203.90 - .\Release\ - .\Release\ + $(SolutionDir)build\$(Configuration)\ - .\Distribute\ - .\Distribute\ + $(SolutionDir)build\$(Configuration)\ - .\VTune\ - .\VTune\ + $(SolutionDir)build\$(Configuration)\ - .\SpeedTreeLib___Win32_MfcRelease\ - .\SpeedTreeLib___Win32_MfcRelease\ + $(SolutionDir)build\$(Configuration)\ - .\SpeedTreeLib___Win32_MfcDebug\ - .\SpeedTreeLib___Win32_MfcDebug\ + $(SolutionDir)build\$(Configuration)\ - .\Debug\ - .\Debug\ + $(SolutionDir)build\$(Configuration)\ true + $(Configuration) true + $(Configuration) true + $(Configuration) @@ -167,7 +163,6 @@ 0x0412 - .\Release\SpeedTreeLib.lib true @@ -199,7 +194,6 @@ 0x0412 - .\Distribute\SpeedTreeLib.lib true @@ -316,7 +310,6 @@ 0x0412 - .\Debug\SpeedTreeLib.lib true diff --git a/SpeedTreeLib/SpeedTreeLib_VC90.vcxproj.filters b/src/SpeedTreeLib/SpeedTreeLib.vcxproj.filters similarity index 100% rename from SpeedTreeLib/SpeedTreeLib_VC90.vcxproj.filters rename to src/SpeedTreeLib/SpeedTreeLib.vcxproj.filters diff --git a/SpeedTreeLib/SpeedTreeMaterial.h b/src/SpeedTreeLib/SpeedTreeMaterial.h similarity index 100% rename from SpeedTreeLib/SpeedTreeMaterial.h rename to src/SpeedTreeLib/SpeedTreeMaterial.h diff --git a/SpeedTreeLib/SpeedTreeWrapper.cpp b/src/SpeedTreeLib/SpeedTreeWrapper.cpp similarity index 100% rename from SpeedTreeLib/SpeedTreeWrapper.cpp rename to src/SpeedTreeLib/SpeedTreeWrapper.cpp diff --git a/SpeedTreeLib/SpeedTreeWrapper.h b/src/SpeedTreeLib/SpeedTreeWrapper.h similarity index 100% rename from SpeedTreeLib/SpeedTreeWrapper.h rename to src/SpeedTreeLib/SpeedTreeWrapper.h diff --git a/SpeedTreeLib/StdAfx.cpp b/src/SpeedTreeLib/StdAfx.cpp similarity index 100% rename from SpeedTreeLib/StdAfx.cpp rename to src/SpeedTreeLib/StdAfx.cpp diff --git a/SpeedTreeLib/StdAfx.h b/src/SpeedTreeLib/StdAfx.h similarity index 100% rename from SpeedTreeLib/StdAfx.h rename to src/SpeedTreeLib/StdAfx.h diff --git a/SpeedTreeLib/VertexShaders.h b/src/SpeedTreeLib/VertexShaders.h similarity index 100% rename from SpeedTreeLib/VertexShaders.h rename to src/SpeedTreeLib/VertexShaders.h diff --git a/SphereLib/SphereLib_VC90.vcxproj b/src/SphereLib/SphereLib.vcxproj similarity index 96% rename from SphereLib/SphereLib_VC90.vcxproj rename to src/SphereLib/SphereLib.vcxproj index 3e48e967..47323401 100644 --- a/SphereLib/SphereLib_VC90.vcxproj +++ b/src/SphereLib/SphereLib.vcxproj @@ -36,8 +36,7 @@ SAK SAK MFCProj - - + 10.0 @@ -66,9 +65,9 @@ StaticLibrary - v143 false MultiByte + v143 StaticLibrary @@ -108,37 +107,34 @@ <_ProjectFileVersion>17.0.32203.90 - .\VTune\ - .\VTune\ + $(SolutionDir)build\$(Configuration)\ - .\Release\ - .\Release\ + $(SolutionDir)build\$(Configuration)\ - .\Distribute\ - .\Distribute\ + $(SolutionDir)build\$(Configuration)\ - .\SphereLib___Win32_MfcRelease\ - .\SphereLib___Win32_MfcRelease\ + $(SolutionDir)build\$(Configuration)\ - .\Debug\ - .\Debug\ + $(SolutionDir)build\$(Configuration)\ - .\SphereLib___Win32_MfcDebug\ - .\SphereLib___Win32_MfcDebug\ + $(SolutionDir)build\$(Configuration)\ true + $(Configuration) true + $(Configuration) true + $(Configuration) @@ -203,7 +199,6 @@ 0x0412 - .\Release\SphereLib.lib true @@ -236,7 +231,6 @@ 0x0412 - .\Distribute\SphereLib.lib true @@ -298,7 +292,6 @@ 0x0412 - .\Debug\SphereLib.lib true diff --git a/SphereLib/SphereLib_VC90.vcxproj.filters b/src/SphereLib/SphereLib.vcxproj.filters similarity index 100% rename from SphereLib/SphereLib_VC90.vcxproj.filters rename to src/SphereLib/SphereLib.vcxproj.filters diff --git a/SphereLib/StdAfx.cpp b/src/SphereLib/StdAfx.cpp similarity index 100% rename from SphereLib/StdAfx.cpp rename to src/SphereLib/StdAfx.cpp diff --git a/SphereLib/StdAfx.h b/src/SphereLib/StdAfx.h similarity index 100% rename from SphereLib/StdAfx.h rename to src/SphereLib/StdAfx.h diff --git a/SphereLib/frustum.cpp b/src/SphereLib/frustum.cpp similarity index 100% rename from SphereLib/frustum.cpp rename to src/SphereLib/frustum.cpp diff --git a/SphereLib/frustum.h b/src/SphereLib/frustum.h similarity index 100% rename from SphereLib/frustum.h rename to src/SphereLib/frustum.h diff --git a/SphereLib/pool.h b/src/SphereLib/pool.h similarity index 100% rename from SphereLib/pool.h rename to src/SphereLib/pool.h diff --git a/SphereLib/sphere.cpp b/src/SphereLib/sphere.cpp similarity index 100% rename from SphereLib/sphere.cpp rename to src/SphereLib/sphere.cpp diff --git a/SphereLib/sphere.h b/src/SphereLib/sphere.h similarity index 100% rename from SphereLib/sphere.h rename to src/SphereLib/sphere.h diff --git a/SphereLib/spherepack.cpp b/src/SphereLib/spherepack.cpp similarity index 100% rename from SphereLib/spherepack.cpp rename to src/SphereLib/spherepack.cpp diff --git a/SphereLib/spherepack.h b/src/SphereLib/spherepack.h similarity index 100% rename from SphereLib/spherepack.h rename to src/SphereLib/spherepack.h diff --git a/SphereLib/vector.h b/src/SphereLib/vector.h similarity index 100% rename from SphereLib/vector.h rename to src/SphereLib/vector.h diff --git a/UserInterface/AbstractApplication.h b/src/UserInterface/AbstractApplication.h similarity index 100% rename from UserInterface/AbstractApplication.h rename to src/UserInterface/AbstractApplication.h diff --git a/UserInterface/AbstractCharacterManager.h b/src/UserInterface/AbstractCharacterManager.h similarity index 100% rename from UserInterface/AbstractCharacterManager.h rename to src/UserInterface/AbstractCharacterManager.h diff --git a/UserInterface/AbstractChat.h b/src/UserInterface/AbstractChat.h similarity index 100% rename from UserInterface/AbstractChat.h rename to src/UserInterface/AbstractChat.h diff --git a/UserInterface/AbstractPlayer.h b/src/UserInterface/AbstractPlayer.h similarity index 100% rename from UserInterface/AbstractPlayer.h rename to src/UserInterface/AbstractPlayer.h diff --git a/UserInterface/AbstractSingleton.h b/src/UserInterface/AbstractSingleton.h similarity index 100% rename from UserInterface/AbstractSingleton.h rename to src/UserInterface/AbstractSingleton.h diff --git a/UserInterface/AccountConnector.cpp b/src/UserInterface/AccountConnector.cpp similarity index 100% rename from UserInterface/AccountConnector.cpp rename to src/UserInterface/AccountConnector.cpp diff --git a/UserInterface/AccountConnector.h b/src/UserInterface/AccountConnector.h similarity index 100% rename from UserInterface/AccountConnector.h rename to src/UserInterface/AccountConnector.h diff --git a/UserInterface/AffectFlagContainer.cpp b/src/UserInterface/AffectFlagContainer.cpp similarity index 100% rename from UserInterface/AffectFlagContainer.cpp rename to src/UserInterface/AffectFlagContainer.cpp diff --git a/UserInterface/AffectFlagContainer.h b/src/UserInterface/AffectFlagContainer.h similarity index 100% rename from UserInterface/AffectFlagContainer.h rename to src/UserInterface/AffectFlagContainer.h diff --git a/UserInterface/CameraProcedure.cpp b/src/UserInterface/CameraProcedure.cpp similarity index 100% rename from UserInterface/CameraProcedure.cpp rename to src/UserInterface/CameraProcedure.cpp diff --git a/UserInterface/CheckLatestFiles.cpp b/src/UserInterface/CheckLatestFiles.cpp similarity index 100% rename from UserInterface/CheckLatestFiles.cpp rename to src/UserInterface/CheckLatestFiles.cpp diff --git a/UserInterface/CheckLatestFiles.h b/src/UserInterface/CheckLatestFiles.h similarity index 100% rename from UserInterface/CheckLatestFiles.h rename to src/UserInterface/CheckLatestFiles.h diff --git a/UserInterface/Cursors/cursor.cur b/src/UserInterface/Cursors/cursor.cur similarity index 100% rename from UserInterface/Cursors/cursor.cur rename to src/UserInterface/Cursors/cursor.cur diff --git a/UserInterface/Cursors/cursor_attack.cur b/src/UserInterface/Cursors/cursor_attack.cur similarity index 100% rename from UserInterface/Cursors/cursor_attack.cur rename to src/UserInterface/Cursors/cursor_attack.cur diff --git a/UserInterface/Cursors/cursor_buy.cur b/src/UserInterface/Cursors/cursor_buy.cur similarity index 100% rename from UserInterface/Cursors/cursor_buy.cur rename to src/UserInterface/Cursors/cursor_buy.cur diff --git a/UserInterface/Cursors/cursor_camera_rotate.cur b/src/UserInterface/Cursors/cursor_camera_rotate.cur similarity index 100% rename from UserInterface/Cursors/cursor_camera_rotate.cur rename to src/UserInterface/Cursors/cursor_camera_rotate.cur diff --git a/UserInterface/Cursors/cursor_chair.cur b/src/UserInterface/Cursors/cursor_chair.cur similarity index 100% rename from UserInterface/Cursors/cursor_chair.cur rename to src/UserInterface/Cursors/cursor_chair.cur diff --git a/UserInterface/Cursors/cursor_door.cur b/src/UserInterface/Cursors/cursor_door.cur similarity index 100% rename from UserInterface/Cursors/cursor_door.cur rename to src/UserInterface/Cursors/cursor_door.cur diff --git a/UserInterface/Cursors/cursor_hsize.cur b/src/UserInterface/Cursors/cursor_hsize.cur similarity index 100% rename from UserInterface/Cursors/cursor_hsize.cur rename to src/UserInterface/Cursors/cursor_hsize.cur diff --git a/UserInterface/Cursors/cursor_hvsize.cur b/src/UserInterface/Cursors/cursor_hvsize.cur similarity index 100% rename from UserInterface/Cursors/cursor_hvsize.cur rename to src/UserInterface/Cursors/cursor_hvsize.cur diff --git a/UserInterface/Cursors/cursor_no.cur b/src/UserInterface/Cursors/cursor_no.cur similarity index 100% rename from UserInterface/Cursors/cursor_no.cur rename to src/UserInterface/Cursors/cursor_no.cur diff --git a/UserInterface/Cursors/cursor_pick.cur b/src/UserInterface/Cursors/cursor_pick.cur similarity index 100% rename from UserInterface/Cursors/cursor_pick.cur rename to src/UserInterface/Cursors/cursor_pick.cur diff --git a/UserInterface/Cursors/cursor_sell.cur b/src/UserInterface/Cursors/cursor_sell.cur similarity index 100% rename from UserInterface/Cursors/cursor_sell.cur rename to src/UserInterface/Cursors/cursor_sell.cur diff --git a/UserInterface/Cursors/cursor_talk.cur b/src/UserInterface/Cursors/cursor_talk.cur similarity index 100% rename from UserInterface/Cursors/cursor_talk.cur rename to src/UserInterface/Cursors/cursor_talk.cur diff --git a/UserInterface/Cursors/cursor_vsize.cur b/src/UserInterface/Cursors/cursor_vsize.cur similarity index 100% rename from UserInterface/Cursors/cursor_vsize.cur rename to src/UserInterface/Cursors/cursor_vsize.cur diff --git a/UserInterface/GameType.cpp b/src/UserInterface/GameType.cpp similarity index 100% rename from UserInterface/GameType.cpp rename to src/UserInterface/GameType.cpp diff --git a/UserInterface/GameType.h b/src/UserInterface/GameType.h similarity index 100% rename from UserInterface/GameType.h rename to src/UserInterface/GameType.h diff --git a/UserInterface/GuildMarkDownloader.cpp b/src/UserInterface/GuildMarkDownloader.cpp similarity index 100% rename from UserInterface/GuildMarkDownloader.cpp rename to src/UserInterface/GuildMarkDownloader.cpp diff --git a/UserInterface/GuildMarkDownloader.h b/src/UserInterface/GuildMarkDownloader.h similarity index 100% rename from UserInterface/GuildMarkDownloader.h rename to src/UserInterface/GuildMarkDownloader.h diff --git a/UserInterface/GuildMarkUploader.cpp b/src/UserInterface/GuildMarkUploader.cpp similarity index 100% rename from UserInterface/GuildMarkUploader.cpp rename to src/UserInterface/GuildMarkUploader.cpp diff --git a/UserInterface/GuildMarkUploader.h b/src/UserInterface/GuildMarkUploader.h similarity index 100% rename from UserInterface/GuildMarkUploader.h rename to src/UserInterface/GuildMarkUploader.h diff --git a/UserInterface/HackShield.cpp b/src/UserInterface/HackShield.cpp similarity index 100% rename from UserInterface/HackShield.cpp rename to src/UserInterface/HackShield.cpp diff --git a/UserInterface/Hackshield.h b/src/UserInterface/Hackshield.h similarity index 100% rename from UserInterface/Hackshield.h rename to src/UserInterface/Hackshield.h diff --git a/UserInterface/HackshieldLicense.h b/src/UserInterface/HackshieldLicense.h similarity index 100% rename from UserInterface/HackshieldLicense.h rename to src/UserInterface/HackshieldLicense.h diff --git a/UserInterface/HackshieldLicense_metin2.h b/src/UserInterface/HackshieldLicense_metin2.h similarity index 100% rename from UserInterface/HackshieldLicense_metin2.h rename to src/UserInterface/HackshieldLicense_metin2.h diff --git a/UserInterface/HackshieldLicense_metin2client.h b/src/UserInterface/HackshieldLicense_metin2client.h similarity index 100% rename from UserInterface/HackshieldLicense_metin2client.h rename to src/UserInterface/HackshieldLicense_metin2client.h diff --git a/UserInterface/InstanceBase.cpp b/src/UserInterface/InstanceBase.cpp similarity index 100% rename from UserInterface/InstanceBase.cpp rename to src/UserInterface/InstanceBase.cpp diff --git a/UserInterface/InstanceBase.h b/src/UserInterface/InstanceBase.h similarity index 100% rename from UserInterface/InstanceBase.h rename to src/UserInterface/InstanceBase.h diff --git a/UserInterface/InstanceBaseBattle.cpp b/src/UserInterface/InstanceBaseBattle.cpp similarity index 100% rename from UserInterface/InstanceBaseBattle.cpp rename to src/UserInterface/InstanceBaseBattle.cpp diff --git a/UserInterface/InstanceBaseEffect.cpp b/src/UserInterface/InstanceBaseEffect.cpp similarity index 100% rename from UserInterface/InstanceBaseEffect.cpp rename to src/UserInterface/InstanceBaseEffect.cpp diff --git a/UserInterface/InstanceBaseEvent.cpp b/src/UserInterface/InstanceBaseEvent.cpp similarity index 100% rename from UserInterface/InstanceBaseEvent.cpp rename to src/UserInterface/InstanceBaseEvent.cpp diff --git a/UserInterface/InstanceBaseMotion.cpp b/src/UserInterface/InstanceBaseMotion.cpp similarity index 100% rename from UserInterface/InstanceBaseMotion.cpp rename to src/UserInterface/InstanceBaseMotion.cpp diff --git a/UserInterface/InstanceBaseMovement.cpp b/src/UserInterface/InstanceBaseMovement.cpp similarity index 100% rename from UserInterface/InstanceBaseMovement.cpp rename to src/UserInterface/InstanceBaseMovement.cpp diff --git a/UserInterface/InstanceBaseTransform.cpp b/src/UserInterface/InstanceBaseTransform.cpp similarity index 100% rename from UserInterface/InstanceBaseTransform.cpp rename to src/UserInterface/InstanceBaseTransform.cpp diff --git a/UserInterface/InsultChecker.cpp b/src/UserInterface/InsultChecker.cpp similarity index 100% rename from UserInterface/InsultChecker.cpp rename to src/UserInterface/InsultChecker.cpp diff --git a/UserInterface/InsultChecker.h b/src/UserInterface/InsultChecker.h similarity index 100% rename from UserInterface/InsultChecker.h rename to src/UserInterface/InsultChecker.h diff --git a/UserInterface/Locale.cpp b/src/UserInterface/Locale.cpp similarity index 100% rename from UserInterface/Locale.cpp rename to src/UserInterface/Locale.cpp diff --git a/UserInterface/Locale.h b/src/UserInterface/Locale.h similarity index 100% rename from UserInterface/Locale.h rename to src/UserInterface/Locale.h diff --git a/UserInterface/Locale_inc.h b/src/UserInterface/Locale_inc.h similarity index 100% rename from UserInterface/Locale_inc.h rename to src/UserInterface/Locale_inc.h diff --git a/UserInterface/Locale_inc_BR.h b/src/UserInterface/Locale_inc_BR.h similarity index 100% rename from UserInterface/Locale_inc_BR.h rename to src/UserInterface/Locale_inc_BR.h diff --git a/UserInterface/Locale_inc_CA.h b/src/UserInterface/Locale_inc_CA.h similarity index 100% rename from UserInterface/Locale_inc_CA.h rename to src/UserInterface/Locale_inc_CA.h diff --git a/UserInterface/Locale_inc_EU.h b/src/UserInterface/Locale_inc_EU.h similarity index 100% rename from UserInterface/Locale_inc_EU.h rename to src/UserInterface/Locale_inc_EU.h diff --git a/UserInterface/Locale_inc_EU2.h b/src/UserInterface/Locale_inc_EU2.h similarity index 100% rename from UserInterface/Locale_inc_EU2.h rename to src/UserInterface/Locale_inc_EU2.h diff --git a/UserInterface/Locale_inc_GB.h b/src/UserInterface/Locale_inc_GB.h similarity index 100% rename from UserInterface/Locale_inc_GB.h rename to src/UserInterface/Locale_inc_GB.h diff --git a/UserInterface/Locale_inc_HK.h b/src/UserInterface/Locale_inc_HK.h similarity index 100% rename from UserInterface/Locale_inc_HK.h rename to src/UserInterface/Locale_inc_HK.h diff --git a/UserInterface/Locale_inc_JP.h b/src/UserInterface/Locale_inc_JP.h similarity index 100% rename from UserInterface/Locale_inc_JP.h rename to src/UserInterface/Locale_inc_JP.h diff --git a/UserInterface/Locale_inc_KO.h b/src/UserInterface/Locale_inc_KO.h similarity index 100% rename from UserInterface/Locale_inc_KO.h rename to src/UserInterface/Locale_inc_KO.h diff --git a/UserInterface/Locale_inc_KO_DEV.h b/src/UserInterface/Locale_inc_KO_DEV.h similarity index 100% rename from UserInterface/Locale_inc_KO_DEV.h rename to src/UserInterface/Locale_inc_KO_DEV.h diff --git a/UserInterface/Locale_inc_NEWCIBN.h b/src/UserInterface/Locale_inc_NEWCIBN.h similarity index 100% rename from UserInterface/Locale_inc_NEWCIBN.h rename to src/UserInterface/Locale_inc_NEWCIBN.h diff --git a/UserInterface/Locale_inc_SG.h b/src/UserInterface/Locale_inc_SG.h similarity index 100% rename from UserInterface/Locale_inc_SG.h rename to src/UserInterface/Locale_inc_SG.h diff --git a/UserInterface/Locale_inc_TW.h b/src/UserInterface/Locale_inc_TW.h similarity index 100% rename from UserInterface/Locale_inc_TW.h rename to src/UserInterface/Locale_inc_TW.h diff --git a/UserInterface/Locale_inc_VI.h b/src/UserInterface/Locale_inc_VI.h similarity index 100% rename from UserInterface/Locale_inc_VI.h rename to src/UserInterface/Locale_inc_VI.h diff --git a/UserInterface/Locale_inc_VI2.h b/src/UserInterface/Locale_inc_VI2.h similarity index 100% rename from UserInterface/Locale_inc_VI2.h rename to src/UserInterface/Locale_inc_VI2.h diff --git a/UserInterface/Locale_inc_dev.h b/src/UserInterface/Locale_inc_dev.h similarity index 100% rename from UserInterface/Locale_inc_dev.h rename to src/UserInterface/Locale_inc_dev.h diff --git a/UserInterface/MarkImage.cpp b/src/UserInterface/MarkImage.cpp similarity index 100% rename from UserInterface/MarkImage.cpp rename to src/UserInterface/MarkImage.cpp diff --git a/UserInterface/MarkImage.h b/src/UserInterface/MarkImage.h similarity index 100% rename from UserInterface/MarkImage.h rename to src/UserInterface/MarkImage.h diff --git a/UserInterface/MarkManager.cpp b/src/UserInterface/MarkManager.cpp similarity index 100% rename from UserInterface/MarkManager.cpp rename to src/UserInterface/MarkManager.cpp diff --git a/UserInterface/MarkManager.h b/src/UserInterface/MarkManager.h similarity index 100% rename from UserInterface/MarkManager.h rename to src/UserInterface/MarkManager.h diff --git a/UserInterface/MovieMan.cpp b/src/UserInterface/MovieMan.cpp similarity index 100% rename from UserInterface/MovieMan.cpp rename to src/UserInterface/MovieMan.cpp diff --git a/UserInterface/MovieMan.h b/src/UserInterface/MovieMan.h similarity index 100% rename from UserInterface/MovieMan.h rename to src/UserInterface/MovieMan.h diff --git a/UserInterface/NProtectGameGuard.cpp b/src/UserInterface/NProtectGameGuard.cpp similarity index 100% rename from UserInterface/NProtectGameGuard.cpp rename to src/UserInterface/NProtectGameGuard.cpp diff --git a/UserInterface/NProtectGameGuard.h b/src/UserInterface/NProtectGameGuard.h similarity index 100% rename from UserInterface/NProtectGameGuard.h rename to src/UserInterface/NProtectGameGuard.h diff --git a/UserInterface/NetworkActorManager.cpp b/src/UserInterface/NetworkActorManager.cpp similarity index 100% rename from UserInterface/NetworkActorManager.cpp rename to src/UserInterface/NetworkActorManager.cpp diff --git a/UserInterface/NetworkActorManager.h b/src/UserInterface/NetworkActorManager.h similarity index 100% rename from UserInterface/NetworkActorManager.h rename to src/UserInterface/NetworkActorManager.h diff --git a/UserInterface/Packet.h b/src/UserInterface/Packet.h similarity index 100% rename from UserInterface/Packet.h rename to src/UserInterface/Packet.h diff --git a/UserInterface/ProcessCRC.cpp b/src/UserInterface/ProcessCRC.cpp similarity index 100% rename from UserInterface/ProcessCRC.cpp rename to src/UserInterface/ProcessCRC.cpp diff --git a/UserInterface/ProcessCRC.h b/src/UserInterface/ProcessCRC.h similarity index 100% rename from UserInterface/ProcessCRC.h rename to src/UserInterface/ProcessCRC.h diff --git a/UserInterface/ProcessScanner.cpp b/src/UserInterface/ProcessScanner.cpp similarity index 100% rename from UserInterface/ProcessScanner.cpp rename to src/UserInterface/ProcessScanner.cpp diff --git a/UserInterface/ProcessScanner.h b/src/UserInterface/ProcessScanner.h similarity index 100% rename from UserInterface/ProcessScanner.h rename to src/UserInterface/ProcessScanner.h diff --git a/UserInterface/PythonApplication.cpp b/src/UserInterface/PythonApplication.cpp similarity index 100% rename from UserInterface/PythonApplication.cpp rename to src/UserInterface/PythonApplication.cpp diff --git a/UserInterface/PythonApplication.h b/src/UserInterface/PythonApplication.h similarity index 100% rename from UserInterface/PythonApplication.h rename to src/UserInterface/PythonApplication.h diff --git a/UserInterface/PythonApplicationCamera.cpp b/src/UserInterface/PythonApplicationCamera.cpp similarity index 100% rename from UserInterface/PythonApplicationCamera.cpp rename to src/UserInterface/PythonApplicationCamera.cpp diff --git a/UserInterface/PythonApplicationCursor.cpp b/src/UserInterface/PythonApplicationCursor.cpp similarity index 100% rename from UserInterface/PythonApplicationCursor.cpp rename to src/UserInterface/PythonApplicationCursor.cpp diff --git a/UserInterface/PythonApplicationEvent.cpp b/src/UserInterface/PythonApplicationEvent.cpp similarity index 100% rename from UserInterface/PythonApplicationEvent.cpp rename to src/UserInterface/PythonApplicationEvent.cpp diff --git a/UserInterface/PythonApplicationLogo.cpp b/src/UserInterface/PythonApplicationLogo.cpp similarity index 100% rename from UserInterface/PythonApplicationLogo.cpp rename to src/UserInterface/PythonApplicationLogo.cpp diff --git a/UserInterface/PythonApplicationModule.cpp b/src/UserInterface/PythonApplicationModule.cpp similarity index 100% rename from UserInterface/PythonApplicationModule.cpp rename to src/UserInterface/PythonApplicationModule.cpp diff --git a/UserInterface/PythonApplicationProcedure.cpp b/src/UserInterface/PythonApplicationProcedure.cpp similarity index 100% rename from UserInterface/PythonApplicationProcedure.cpp rename to src/UserInterface/PythonApplicationProcedure.cpp diff --git a/UserInterface/PythonApplicationWebPage.cpp b/src/UserInterface/PythonApplicationWebPage.cpp similarity index 100% rename from UserInterface/PythonApplicationWebPage.cpp rename to src/UserInterface/PythonApplicationWebPage.cpp diff --git a/UserInterface/PythonBackground.cpp b/src/UserInterface/PythonBackground.cpp similarity index 100% rename from UserInterface/PythonBackground.cpp rename to src/UserInterface/PythonBackground.cpp diff --git a/UserInterface/PythonBackground.h b/src/UserInterface/PythonBackground.h similarity index 100% rename from UserInterface/PythonBackground.h rename to src/UserInterface/PythonBackground.h diff --git a/UserInterface/PythonBackgroundModule.cpp b/src/UserInterface/PythonBackgroundModule.cpp similarity index 100% rename from UserInterface/PythonBackgroundModule.cpp rename to src/UserInterface/PythonBackgroundModule.cpp diff --git a/UserInterface/PythonCharacterManager.cpp b/src/UserInterface/PythonCharacterManager.cpp similarity index 100% rename from UserInterface/PythonCharacterManager.cpp rename to src/UserInterface/PythonCharacterManager.cpp diff --git a/UserInterface/PythonCharacterManager.h b/src/UserInterface/PythonCharacterManager.h similarity index 100% rename from UserInterface/PythonCharacterManager.h rename to src/UserInterface/PythonCharacterManager.h diff --git a/UserInterface/PythonCharacterManagerModule.cpp b/src/UserInterface/PythonCharacterManagerModule.cpp similarity index 100% rename from UserInterface/PythonCharacterManagerModule.cpp rename to src/UserInterface/PythonCharacterManagerModule.cpp diff --git a/UserInterface/PythonCharacterModule.cpp b/src/UserInterface/PythonCharacterModule.cpp similarity index 100% rename from UserInterface/PythonCharacterModule.cpp rename to src/UserInterface/PythonCharacterModule.cpp diff --git a/UserInterface/PythonChat.cpp b/src/UserInterface/PythonChat.cpp similarity index 100% rename from UserInterface/PythonChat.cpp rename to src/UserInterface/PythonChat.cpp diff --git a/UserInterface/PythonChat.h b/src/UserInterface/PythonChat.h similarity index 100% rename from UserInterface/PythonChat.h rename to src/UserInterface/PythonChat.h diff --git a/UserInterface/PythonChatModule.cpp b/src/UserInterface/PythonChatModule.cpp similarity index 100% rename from UserInterface/PythonChatModule.cpp rename to src/UserInterface/PythonChatModule.cpp diff --git a/UserInterface/PythonEffectModule.cpp b/src/UserInterface/PythonEffectModule.cpp similarity index 100% rename from UserInterface/PythonEffectModule.cpp rename to src/UserInterface/PythonEffectModule.cpp diff --git a/UserInterface/PythonEventManager.cpp b/src/UserInterface/PythonEventManager.cpp similarity index 100% rename from UserInterface/PythonEventManager.cpp rename to src/UserInterface/PythonEventManager.cpp diff --git a/UserInterface/PythonEventManager.h b/src/UserInterface/PythonEventManager.h similarity index 100% rename from UserInterface/PythonEventManager.h rename to src/UserInterface/PythonEventManager.h diff --git a/UserInterface/PythonEventManagerMoudle.cpp b/src/UserInterface/PythonEventManagerMoudle.cpp similarity index 100% rename from UserInterface/PythonEventManagerMoudle.cpp rename to src/UserInterface/PythonEventManagerMoudle.cpp diff --git a/UserInterface/PythonExceptionSender.cpp b/src/UserInterface/PythonExceptionSender.cpp similarity index 100% rename from UserInterface/PythonExceptionSender.cpp rename to src/UserInterface/PythonExceptionSender.cpp diff --git a/UserInterface/PythonExceptionSender.h b/src/UserInterface/PythonExceptionSender.h similarity index 100% rename from UserInterface/PythonExceptionSender.h rename to src/UserInterface/PythonExceptionSender.h diff --git a/UserInterface/PythonExchange.cpp b/src/UserInterface/PythonExchange.cpp similarity index 100% rename from UserInterface/PythonExchange.cpp rename to src/UserInterface/PythonExchange.cpp diff --git a/UserInterface/PythonExchange.h b/src/UserInterface/PythonExchange.h similarity index 100% rename from UserInterface/PythonExchange.h rename to src/UserInterface/PythonExchange.h diff --git a/UserInterface/PythonExchangeModule.cpp b/src/UserInterface/PythonExchangeModule.cpp similarity index 100% rename from UserInterface/PythonExchangeModule.cpp rename to src/UserInterface/PythonExchangeModule.cpp diff --git a/UserInterface/PythonFlyModule.cpp b/src/UserInterface/PythonFlyModule.cpp similarity index 100% rename from UserInterface/PythonFlyModule.cpp rename to src/UserInterface/PythonFlyModule.cpp diff --git a/UserInterface/PythonGameEventManagerModule.cpp b/src/UserInterface/PythonGameEventManagerModule.cpp similarity index 100% rename from UserInterface/PythonGameEventManagerModule.cpp rename to src/UserInterface/PythonGameEventManagerModule.cpp diff --git a/UserInterface/PythonGuild.cpp b/src/UserInterface/PythonGuild.cpp similarity index 100% rename from UserInterface/PythonGuild.cpp rename to src/UserInterface/PythonGuild.cpp diff --git a/UserInterface/PythonGuild.h b/src/UserInterface/PythonGuild.h similarity index 100% rename from UserInterface/PythonGuild.h rename to src/UserInterface/PythonGuild.h diff --git a/UserInterface/PythonIME.cpp b/src/UserInterface/PythonIME.cpp similarity index 100% rename from UserInterface/PythonIME.cpp rename to src/UserInterface/PythonIME.cpp diff --git a/UserInterface/PythonIME.h b/src/UserInterface/PythonIME.h similarity index 100% rename from UserInterface/PythonIME.h rename to src/UserInterface/PythonIME.h diff --git a/UserInterface/PythonIMEModule.cpp b/src/UserInterface/PythonIMEModule.cpp similarity index 100% rename from UserInterface/PythonIMEModule.cpp rename to src/UserInterface/PythonIMEModule.cpp diff --git a/UserInterface/PythonItem.cpp b/src/UserInterface/PythonItem.cpp similarity index 100% rename from UserInterface/PythonItem.cpp rename to src/UserInterface/PythonItem.cpp diff --git a/UserInterface/PythonItem.h b/src/UserInterface/PythonItem.h similarity index 100% rename from UserInterface/PythonItem.h rename to src/UserInterface/PythonItem.h diff --git a/UserInterface/PythonItemModule.cpp b/src/UserInterface/PythonItemModule.cpp similarity index 100% rename from UserInterface/PythonItemModule.cpp rename to src/UserInterface/PythonItemModule.cpp diff --git a/UserInterface/PythonMessenger.cpp b/src/UserInterface/PythonMessenger.cpp similarity index 100% rename from UserInterface/PythonMessenger.cpp rename to src/UserInterface/PythonMessenger.cpp diff --git a/UserInterface/PythonMessenger.h b/src/UserInterface/PythonMessenger.h similarity index 100% rename from UserInterface/PythonMessenger.h rename to src/UserInterface/PythonMessenger.h diff --git a/UserInterface/PythonMiniMap.cpp b/src/UserInterface/PythonMiniMap.cpp similarity index 100% rename from UserInterface/PythonMiniMap.cpp rename to src/UserInterface/PythonMiniMap.cpp diff --git a/UserInterface/PythonMiniMap.h b/src/UserInterface/PythonMiniMap.h similarity index 100% rename from UserInterface/PythonMiniMap.h rename to src/UserInterface/PythonMiniMap.h diff --git a/UserInterface/PythonMiniMapModule.cpp b/src/UserInterface/PythonMiniMapModule.cpp similarity index 100% rename from UserInterface/PythonMiniMapModule.cpp rename to src/UserInterface/PythonMiniMapModule.cpp diff --git a/UserInterface/PythonNetworkDatagram.cpp b/src/UserInterface/PythonNetworkDatagram.cpp similarity index 100% rename from UserInterface/PythonNetworkDatagram.cpp rename to src/UserInterface/PythonNetworkDatagram.cpp diff --git a/UserInterface/PythonNetworkDatagram.h b/src/UserInterface/PythonNetworkDatagram.h similarity index 100% rename from UserInterface/PythonNetworkDatagram.h rename to src/UserInterface/PythonNetworkDatagram.h diff --git a/UserInterface/PythonNetworkDatagramModule.cpp b/src/UserInterface/PythonNetworkDatagramModule.cpp similarity index 100% rename from UserInterface/PythonNetworkDatagramModule.cpp rename to src/UserInterface/PythonNetworkDatagramModule.cpp diff --git a/UserInterface/PythonNetworkStream.cpp b/src/UserInterface/PythonNetworkStream.cpp similarity index 100% rename from UserInterface/PythonNetworkStream.cpp rename to src/UserInterface/PythonNetworkStream.cpp diff --git a/UserInterface/PythonNetworkStream.h b/src/UserInterface/PythonNetworkStream.h similarity index 100% rename from UserInterface/PythonNetworkStream.h rename to src/UserInterface/PythonNetworkStream.h diff --git a/UserInterface/PythonNetworkStreamCommand.cpp b/src/UserInterface/PythonNetworkStreamCommand.cpp similarity index 100% rename from UserInterface/PythonNetworkStreamCommand.cpp rename to src/UserInterface/PythonNetworkStreamCommand.cpp diff --git a/UserInterface/PythonNetworkStreamEvent.cpp b/src/UserInterface/PythonNetworkStreamEvent.cpp similarity index 100% rename from UserInterface/PythonNetworkStreamEvent.cpp rename to src/UserInterface/PythonNetworkStreamEvent.cpp diff --git a/UserInterface/PythonNetworkStreamModule.cpp b/src/UserInterface/PythonNetworkStreamModule.cpp similarity index 100% rename from UserInterface/PythonNetworkStreamModule.cpp rename to src/UserInterface/PythonNetworkStreamModule.cpp diff --git a/UserInterface/PythonNetworkStreamPhaseGame.cpp b/src/UserInterface/PythonNetworkStreamPhaseGame.cpp similarity index 100% rename from UserInterface/PythonNetworkStreamPhaseGame.cpp rename to src/UserInterface/PythonNetworkStreamPhaseGame.cpp diff --git a/UserInterface/PythonNetworkStreamPhaseGameActor.cpp b/src/UserInterface/PythonNetworkStreamPhaseGameActor.cpp similarity index 100% rename from UserInterface/PythonNetworkStreamPhaseGameActor.cpp rename to src/UserInterface/PythonNetworkStreamPhaseGameActor.cpp diff --git a/UserInterface/PythonNetworkStreamPhaseGameItem.cpp b/src/UserInterface/PythonNetworkStreamPhaseGameItem.cpp similarity index 100% rename from UserInterface/PythonNetworkStreamPhaseGameItem.cpp rename to src/UserInterface/PythonNetworkStreamPhaseGameItem.cpp diff --git a/UserInterface/PythonNetworkStreamPhaseHandShake.cpp b/src/UserInterface/PythonNetworkStreamPhaseHandShake.cpp similarity index 100% rename from UserInterface/PythonNetworkStreamPhaseHandShake.cpp rename to src/UserInterface/PythonNetworkStreamPhaseHandShake.cpp diff --git a/UserInterface/PythonNetworkStreamPhaseLoading.cpp b/src/UserInterface/PythonNetworkStreamPhaseLoading.cpp similarity index 100% rename from UserInterface/PythonNetworkStreamPhaseLoading.cpp rename to src/UserInterface/PythonNetworkStreamPhaseLoading.cpp diff --git a/UserInterface/PythonNetworkStreamPhaseLogin.cpp b/src/UserInterface/PythonNetworkStreamPhaseLogin.cpp similarity index 100% rename from UserInterface/PythonNetworkStreamPhaseLogin.cpp rename to src/UserInterface/PythonNetworkStreamPhaseLogin.cpp diff --git a/UserInterface/PythonNetworkStreamPhaseOffline.cpp b/src/UserInterface/PythonNetworkStreamPhaseOffline.cpp similarity index 100% rename from UserInterface/PythonNetworkStreamPhaseOffline.cpp rename to src/UserInterface/PythonNetworkStreamPhaseOffline.cpp diff --git a/UserInterface/PythonNetworkStreamPhaseSelect.cpp b/src/UserInterface/PythonNetworkStreamPhaseSelect.cpp similarity index 100% rename from UserInterface/PythonNetworkStreamPhaseSelect.cpp rename to src/UserInterface/PythonNetworkStreamPhaseSelect.cpp diff --git a/UserInterface/PythonNonPlayer.cpp b/src/UserInterface/PythonNonPlayer.cpp similarity index 100% rename from UserInterface/PythonNonPlayer.cpp rename to src/UserInterface/PythonNonPlayer.cpp diff --git a/UserInterface/PythonNonPlayer.h b/src/UserInterface/PythonNonPlayer.h similarity index 100% rename from UserInterface/PythonNonPlayer.h rename to src/UserInterface/PythonNonPlayer.h diff --git a/UserInterface/PythonNonPlayerModule.cpp b/src/UserInterface/PythonNonPlayerModule.cpp similarity index 100% rename from UserInterface/PythonNonPlayerModule.cpp rename to src/UserInterface/PythonNonPlayerModule.cpp diff --git a/UserInterface/PythonPackModule.cpp b/src/UserInterface/PythonPackModule.cpp similarity index 100% rename from UserInterface/PythonPackModule.cpp rename to src/UserInterface/PythonPackModule.cpp diff --git a/UserInterface/PythonPlayer.cpp b/src/UserInterface/PythonPlayer.cpp similarity index 100% rename from UserInterface/PythonPlayer.cpp rename to src/UserInterface/PythonPlayer.cpp diff --git a/UserInterface/PythonPlayer.h b/src/UserInterface/PythonPlayer.h similarity index 100% rename from UserInterface/PythonPlayer.h rename to src/UserInterface/PythonPlayer.h diff --git a/UserInterface/PythonPlayerEventHandler.cpp b/src/UserInterface/PythonPlayerEventHandler.cpp similarity index 100% rename from UserInterface/PythonPlayerEventHandler.cpp rename to src/UserInterface/PythonPlayerEventHandler.cpp diff --git a/UserInterface/PythonPlayerEventHandler.h b/src/UserInterface/PythonPlayerEventHandler.h similarity index 100% rename from UserInterface/PythonPlayerEventHandler.h rename to src/UserInterface/PythonPlayerEventHandler.h diff --git a/UserInterface/PythonPlayerInput.cpp b/src/UserInterface/PythonPlayerInput.cpp similarity index 100% rename from UserInterface/PythonPlayerInput.cpp rename to src/UserInterface/PythonPlayerInput.cpp diff --git a/UserInterface/PythonPlayerInputKeyboard.cpp b/src/UserInterface/PythonPlayerInputKeyboard.cpp similarity index 100% rename from UserInterface/PythonPlayerInputKeyboard.cpp rename to src/UserInterface/PythonPlayerInputKeyboard.cpp diff --git a/UserInterface/PythonPlayerInputMouse.cpp b/src/UserInterface/PythonPlayerInputMouse.cpp similarity index 100% rename from UserInterface/PythonPlayerInputMouse.cpp rename to src/UserInterface/PythonPlayerInputMouse.cpp diff --git a/UserInterface/PythonPlayerModule.cpp b/src/UserInterface/PythonPlayerModule.cpp similarity index 100% rename from UserInterface/PythonPlayerModule.cpp rename to src/UserInterface/PythonPlayerModule.cpp diff --git a/UserInterface/PythonPlayerSkill.cpp b/src/UserInterface/PythonPlayerSkill.cpp similarity index 100% rename from UserInterface/PythonPlayerSkill.cpp rename to src/UserInterface/PythonPlayerSkill.cpp diff --git a/UserInterface/PythonProfilerModule.cpp b/src/UserInterface/PythonProfilerModule.cpp similarity index 100% rename from UserInterface/PythonProfilerModule.cpp rename to src/UserInterface/PythonProfilerModule.cpp diff --git a/UserInterface/PythonQuest.cpp b/src/UserInterface/PythonQuest.cpp similarity index 100% rename from UserInterface/PythonQuest.cpp rename to src/UserInterface/PythonQuest.cpp diff --git a/UserInterface/PythonQuest.h b/src/UserInterface/PythonQuest.h similarity index 100% rename from UserInterface/PythonQuest.h rename to src/UserInterface/PythonQuest.h diff --git a/UserInterface/PythonSafeBox.cpp b/src/UserInterface/PythonSafeBox.cpp similarity index 100% rename from UserInterface/PythonSafeBox.cpp rename to src/UserInterface/PythonSafeBox.cpp diff --git a/UserInterface/PythonSafeBox.h b/src/UserInterface/PythonSafeBox.h similarity index 100% rename from UserInterface/PythonSafeBox.h rename to src/UserInterface/PythonSafeBox.h diff --git a/UserInterface/PythonShop.cpp b/src/UserInterface/PythonShop.cpp similarity index 100% rename from UserInterface/PythonShop.cpp rename to src/UserInterface/PythonShop.cpp diff --git a/UserInterface/PythonShop.h b/src/UserInterface/PythonShop.h similarity index 100% rename from UserInterface/PythonShop.h rename to src/UserInterface/PythonShop.h diff --git a/UserInterface/PythonSkill.cpp b/src/UserInterface/PythonSkill.cpp similarity index 100% rename from UserInterface/PythonSkill.cpp rename to src/UserInterface/PythonSkill.cpp diff --git a/UserInterface/PythonSkill.h b/src/UserInterface/PythonSkill.h similarity index 100% rename from UserInterface/PythonSkill.h rename to src/UserInterface/PythonSkill.h diff --git a/UserInterface/PythonSoundManagerModule.cpp b/src/UserInterface/PythonSoundManagerModule.cpp similarity index 100% rename from UserInterface/PythonSoundManagerModule.cpp rename to src/UserInterface/PythonSoundManagerModule.cpp diff --git a/UserInterface/PythonSystem.cpp b/src/UserInterface/PythonSystem.cpp similarity index 100% rename from UserInterface/PythonSystem.cpp rename to src/UserInterface/PythonSystem.cpp diff --git a/UserInterface/PythonSystem.h b/src/UserInterface/PythonSystem.h similarity index 100% rename from UserInterface/PythonSystem.h rename to src/UserInterface/PythonSystem.h diff --git a/UserInterface/PythonSystemModule.cpp b/src/UserInterface/PythonSystemModule.cpp similarity index 100% rename from UserInterface/PythonSystemModule.cpp rename to src/UserInterface/PythonSystemModule.cpp diff --git a/UserInterface/PythonTextTail.cpp b/src/UserInterface/PythonTextTail.cpp similarity index 100% rename from UserInterface/PythonTextTail.cpp rename to src/UserInterface/PythonTextTail.cpp diff --git a/UserInterface/PythonTextTail.h b/src/UserInterface/PythonTextTail.h similarity index 100% rename from UserInterface/PythonTextTail.h rename to src/UserInterface/PythonTextTail.h diff --git a/UserInterface/PythonTextTailModule.cpp b/src/UserInterface/PythonTextTailModule.cpp similarity index 100% rename from UserInterface/PythonTextTailModule.cpp rename to src/UserInterface/PythonTextTailModule.cpp diff --git a/UserInterface/ServerStateChecker.cpp b/src/UserInterface/ServerStateChecker.cpp similarity index 100% rename from UserInterface/ServerStateChecker.cpp rename to src/UserInterface/ServerStateChecker.cpp diff --git a/UserInterface/ServerStateChecker.h b/src/UserInterface/ServerStateChecker.h similarity index 100% rename from UserInterface/ServerStateChecker.h rename to src/UserInterface/ServerStateChecker.h diff --git a/UserInterface/ServerStateCheckerModule.cpp b/src/UserInterface/ServerStateCheckerModule.cpp similarity index 100% rename from UserInterface/ServerStateCheckerModule.cpp rename to src/UserInterface/ServerStateCheckerModule.cpp diff --git a/UserInterface/StdAfx.cpp b/src/UserInterface/StdAfx.cpp similarity index 100% rename from UserInterface/StdAfx.cpp rename to src/UserInterface/StdAfx.cpp diff --git a/UserInterface/StdAfx.h b/src/UserInterface/StdAfx.h similarity index 100% rename from UserInterface/StdAfx.h rename to src/UserInterface/StdAfx.h diff --git a/UserInterface/Test.h b/src/UserInterface/Test.h similarity index 100% rename from UserInterface/Test.h rename to src/UserInterface/Test.h diff --git a/UserInterface/UserInterface.cpp b/src/UserInterface/UserInterface.cpp similarity index 100% rename from UserInterface/UserInterface.cpp rename to src/UserInterface/UserInterface.cpp diff --git a/UserInterface/UserInterface.rc b/src/UserInterface/UserInterface.rc similarity index 100% rename from UserInterface/UserInterface.rc rename to src/UserInterface/UserInterface.rc diff --git a/UserInterface/UserInterface_VC90.vcxproj b/src/UserInterface/UserInterface.vcxproj similarity index 93% rename from UserInterface/UserInterface_VC90.vcxproj rename to src/UserInterface/UserInterface.vcxproj index 769f349b..90a3436a 100644 --- a/UserInterface/UserInterface_VC90.vcxproj +++ b/src/UserInterface/UserInterface.vcxproj @@ -26,6 +26,7 @@ Perforce Project .. MSSCCI:Perforce SCM + 10.0 @@ -36,9 +37,9 @@ Application - v143 false MultiByte + v143 Application @@ -76,34 +77,35 @@ <_ProjectFileVersion>17.0.32203.90 - ../bin\ - .\Distribute\ true + $(SolutionDir)build\$(Configuration)\ - ../bin\ - .\Debug\ true true + $(SolutionDir)build\$(Configuration)\ - ../bin\ - .\Release\ false + $(SolutionDir)build\$(Configuration)\ - ../bin\ - .\VTune\ false + $(SolutionDir)build\$(Configuration)\ true true + $(Configuration) true + $(Configuration) + + + $(Configuration) @@ -141,9 +143,8 @@ NotSet - Distribute/metin2client.exe true - $(SolutionDir)Extern\debug\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)Extern\lib;%(AdditionalLibraryDirectories) RequireAdministrator .\Distribute/metin2client.pdb @@ -172,7 +173,7 @@ Disabled $(SolutionDir)extern\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;USE_LOD;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;USE_LOD;HAVE_SNPRINTF;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug Use @@ -194,9 +195,7 @@ NotSet - ../bin/metin2client.exe true - $(SolutionDir)Extern\debug\lib;%(AdditionalLibraryDirectories) RequireAdministrator true Windows @@ -204,6 +203,7 @@ false MachineX86 false + $(SolutionDir)Extern\debug\lib;%(AdditionalLibraryDirectories) @@ -239,16 +239,14 @@ NotSet - Release/metin2client.exe true - $(SolutionDir)Extern\debug\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)Extern\lib;%(AdditionalLibraryDirectories) RequireAdministrator false true .\Release/metin2.map Windows true - MachineX86 false @@ -268,7 +266,7 @@ OnlyExplicitInline Size true - ../../extern/include;%(AdditionalIncludeDirectories) + $(SolutionDir)extern\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;USE_LOD;__VTUNE__;%(PreprocessorDefinitions) true MultiThreaded @@ -291,9 +289,8 @@ NotSet - VTune/Metin2VTuned.exe true - $(SolutionDir)Extern\debug\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)Extern\lib;%(AdditionalLibraryDirectories) false true true @@ -620,59 +617,59 @@ - + {d64ae35f-f982-46d4-8e38-09e5c9752955} false - + {790b152d-6582-467f-b767-8603c5a9e613} false - + {678c47dc-b3ef-460e-a932-56f3208fc65e} false - + {e1ff7630-628f-4ad0-bf66-f14d86a04035} false - + {fe95382c-8e3e-40ac-8060-634d1a0d4cf5} false - + {887f89df-a1a2-47df-a869-f3fc84704e3e} false - + {4950ba04-3877-4f66-bca0-60e00de3770b} false - + {24516a87-8544-46a9-a0c8-0a01269642d9} false - + {1801f0ed-7de6-4175-bf25-6fa98aaa350b} false - + {9189ba90-1997-4b47-a673-a54c7df4a4f7} false - + {8b1d0dde-a521-4eb2-9544-f606376278cc} false - + {e682cea2-1d79-4de9-a2ce-6aed27e4170e} false - + {0fddd886-1eb5-4655-80c3-ef08087faefd} false - + {a5d7af9f-0a4f-4ed3-b209-2553b1add17d} false diff --git a/UserInterface/UserInterface_VC90.vcxproj.filters b/src/UserInterface/UserInterface.vcxproj.filters similarity index 100% rename from UserInterface/UserInterface_VC90.vcxproj.filters rename to src/UserInterface/UserInterface.vcxproj.filters diff --git a/UserInterface/Version.h b/src/UserInterface/Version.h similarity index 100% rename from UserInterface/Version.h rename to src/UserInterface/Version.h diff --git a/UserInterface/Version.py b/src/UserInterface/Version.py similarity index 100% rename from UserInterface/Version.py rename to src/UserInterface/Version.py diff --git a/UserInterface/WiseLogicXTrap.cpp b/src/UserInterface/WiseLogicXTrap.cpp similarity index 100% rename from UserInterface/WiseLogicXTrap.cpp rename to src/UserInterface/WiseLogicXTrap.cpp diff --git a/UserInterface/WiseLogicXTrap.h b/src/UserInterface/WiseLogicXTrap.h similarity index 100% rename from UserInterface/WiseLogicXTrap.h rename to src/UserInterface/WiseLogicXTrap.h diff --git a/UserInterface/metin2.ico b/src/UserInterface/metin2.ico similarity index 100% rename from UserInterface/metin2.ico rename to src/UserInterface/metin2.ico diff --git a/UserInterface/metin2client.exe.manifest b/src/UserInterface/metin2client.exe.manifest similarity index 100% rename from UserInterface/metin2client.exe.manifest rename to src/UserInterface/metin2client.exe.manifest diff --git a/UserInterface/resource.h b/src/UserInterface/resource.h similarity index 100% rename from UserInterface/resource.h rename to src/UserInterface/resource.h