• R/O
  • HTTP
  • SSH
  • HTTPS

提交

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqtwindows誰得cocoapythonphprubygameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

Violet Vreath is Shooter Game for Windows XP+(個人制作シューティングゲーム)


Commit MetaInfo

修订版9eb53cdd0ba04489e04770deb6d3bd9b37a8a00e (tree)
时间2022-07-17 01:46:55
作者gecchi <gecchi@192....>
Commitergecchi

Log Message

ちょこっと

更改概述

差异

--- a/GgafDx/src/jp/ggaf/dx/God.cpp
+++ b/GgafDx/src/jp/ggaf/dx/God.cpp
@@ -337,10 +337,6 @@ void God::setAppropriateDisplaySize(bool allow_chang_rezo) {
337337 _paPresetPrm[_secondary_adapter_no].BackBufferHeight = CONFIG::DUAL_VIEW_FULL_SCREEN2_HEIGHT;
338338 } else {
339339 //メモ:ゲーム画面3画面目以降1画面目・2画面目の解像度は、現状の解像度をそのまま設定。
340-// pixcoord width = _paAvailableAdapter[adapter_no].rcMonitor.right - _paAvailableAdapter[adapter_no].rcMonitor.left;
341-// pixcoord height = _paAvailableAdapter[adapter_no].rcMonitor.bottom - _paAvailableAdapter[adapter_no].rcMonitor.top;
342-// _paPresetPrm[adapter_no].BackBufferWidth = width;
343-// _paPresetPrm[adapter_no].BackBufferHeight = height;
344340 D3DDISPLAYMODE structD3DDisplayMode;
345341 hr = _pID3D9->GetAdapterDisplayMode(adapter_no, &structD3DDisplayMode);
346342 _paPresetPrm[adapter_no].BackBufferWidth = (pixcoord)(structD3DDisplayMode.Width);
--- a/GgafLib/GgafLib.vcxproj
+++ b/GgafLib/GgafLib.vcxproj
@@ -117,6 +117,7 @@
117117 <ClInclude Include="include\jp\ggaf\lib\util\wmkeyinput.h" />
118118 </ItemGroup>
119119 <ItemGroup>
120+ <ClCompile Include="src\GgafLib.cpp" />
120121 <ClCompile Include="src\jp\ggaf\lib\actor\camera\CameraWorkerChanger.cpp" />
121122 <ClCompile Include="src\jp\ggaf\lib\actor\camera\DefaultCamera.cpp" />
122123 <ClCompile Include="src\jp\ggaf\lib\actor\camera\DefaultCameraUpVector.cpp" />
--- a/GgafLib/GgafLib_VC14.vcxproj
+++ b/GgafLib/GgafLib_VC14.vcxproj
@@ -133,6 +133,7 @@
133133 <ClInclude Include="include\jp\ggaf\lib\util\WMKeyInput.h" />
134134 </ItemGroup>
135135 <ItemGroup>
136+ <ClCompile Include="src\GgafLib.cpp" />
136137 <ClCompile Include="src\jp\ggaf\lib\actor\camera\CameraWorkerChanger.cpp" />
137138 <ClCompile Include="src\jp\ggaf\lib\actor\camera\DefaultCamera.cpp" />
138139 <ClCompile Include="src\jp\ggaf\lib\actor\camera\DefaultCameraUpVector.cpp" />
--- a/GgafLib/GgafLib_VC14.vcxproj.filters
+++ b/GgafLib/GgafLib_VC14.vcxproj.filters
@@ -575,5 +575,8 @@
575575 <ClCompile Include="src\jp\ggaf\lib\LibConfig.cpp">
576576 <Filter>ソース ファイル</Filter>
577577 </ClCompile>
578+ <ClCompile Include="src\GgafLib.cpp">
579+ <Filter>ソース ファイル</Filter>
580+ </ClCompile>
578581 </ItemGroup>
579582 </Project>
\ No newline at end of file
--- a/GgafLib/GgafLib_VC16.vcxproj
+++ b/GgafLib/GgafLib_VC16.vcxproj
@@ -117,6 +117,7 @@
117117 <ClInclude Include="include\jp\ggaf\lib\util\WMKeyInput.h" />
118118 </ItemGroup>
119119 <ItemGroup>
120+ <ClCompile Include="src\GgafLib.cpp" />
120121 <ClCompile Include="src\jp\ggaf\lib\actor\camera\CameraWorkerChanger.cpp" />
121122 <ClCompile Include="src\jp\ggaf\lib\actor\camera\DefaultCamera.cpp" />
122123 <ClCompile Include="src\jp\ggaf\lib\actor\camera\DefaultCameraUpVector.cpp" />
--- a/GgafLib/include/GgafLib.h
+++ b/GgafLib/include/GgafLib.h
@@ -1,48 +1,19 @@
11 #ifndef GGAF_LIB_H_
22 #define GGAF_LIB_H_
33 #include "GgafLibCommonHeader.h"
4-
54 #include <windows.h>
6-#ifdef __GNUG__
7- #undef __in
8- #undef __out
9-#endif
10-#include "jp/ggaf/dx/util/Input.h"
11-#include "jp/ggaf/lib/LibConfig.h"
12-#include "jp/ggaf/lib/DefaultGod.h"
13-#include "jp/ggaf/lib/util/WMKeyInput.h"
145
156 HINSTANCE WinMain_hInstance;
167 HINSTANCE WinMain_hPrevInstance;
178 LPTSTR WinMain_lpCmdLine;
189 int WinMain_nCmdShow;
19-
2010 /**
2111 * メイン処理 .
2212 * @param argc
2313 * @param argv
2414 * @return
2515 */
26-int LibMain(int argc, char *argv[]) {
27- STARTUPINFO StatUpInfo;
28- HINSTANCE hInstance;
29- HANDLE hPrevInstance;
30- LPSTR lpCmdLine;
31- int nCmdShow;
32-
33- GetStartupInfo(&StatUpInfo);
34- hInstance = GetModuleHandle(0);
35- hPrevInstance = 0;
36- lpCmdLine = GetCommandLine();
37- nCmdShow = (StatUpInfo.dwFlags & STARTF_USESHOWWINDOW) ? StatUpInfo.wShowWindow : SW_SHOWNORMAL;
38-
39- //PG名除去
40- while (*lpCmdLine != ' ' && *lpCmdLine != '\0') { ++lpCmdLine; }
41- while (*lpCmdLine == ' ') { ++lpCmdLine; }
42-
43- //本来のWinMainへ
44- return ::WinMain((HINSTANCE)hInstance, (HINSTANCE)hPrevInstance, lpCmdLine, nCmdShow);
45-}
16+int LibMain(int argc, char *argv[]);
4617
4718 /**
4819 * WinMainの初期処理 .
@@ -51,14 +22,7 @@ int LibMain(int argc, char *argv[]) {
5122 * @param lpCmdLine
5223 * @param nCmdShow
5324 */
54-void LibWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) {
55- UNREFERENCED_PARAMETER(hPrevInstance);
56- UNREFERENCED_PARAMETER(lpCmdLine);
57- WinMain_hInstance = hInstance;
58- WinMain_hPrevInstance = hPrevInstance;
59- WinMain_lpCmdLine = lpCmdLine;
60- WinMain_nCmdShow = nCmdShow;
61-}
25+void LibWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow);
6226
6327 /**
6428 * GgafCore::フレームワークのウィンドウプロシージャ処理 .
@@ -67,124 +31,8 @@ void LibWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine,
6731 * @param wParam
6832 * @param lParam
6933 */
70-void LibWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
71- switch (message) {
72- case WM_CHAR: {
73- GgafLib::WMKeyInput::catchWmChar(wParam);
74- break;
75- }
76- case WM_SIZE: {
77- if (pGOD && pGOD->_pHWndPrimary) {
78- if (!CONFIG::FULL_SCREEN) {
79- pGOD->_adjustGameWindow = true;
80- pGOD->_pHWnd_adjustScreen = hWnd; //サイズ変更したほうのWINDOW
81- }
82- }
83- GgafCore::God::_pGod->syncTimeFrame();
84- break;
85- }
86- case WM_SIZING: {
87- GgafCore::God::_pGod->syncTimeFrame();
88- break;
89- }
90- case WM_MOVING: {
91- GgafCore::God::_pGod->syncTimeFrame();
92- break;
93- }
94- case WM_CONTEXTMENU: {
95- GgafCore::God::_pGod->syncTimeFrame();
96- break;
97- }
98- case WM_SETFOCUS: {
99- if (pGOD->_pHWndPrimary) {
100- HRESULT hr;
101- // マウス強調レベル設定
102- if (GgafDx::Input::_pMouseInputDevice) {
103- hr = GgafDx::Input::_pMouseInputDevice->SetCooperativeLevel(hWnd, DISCL_NONEXCLUSIVE | DISCL_FOREGROUND);
104- if (hr != D3D_OK) {
105- _TRACE_("LibWndProc() _pHWndSecondaryマウスのSetCooperativeLevelに失敗しました");
106- }
107- }
108- // キーボード強調レベル設定
109- if (GgafDx::Input::_pKeyboardInputDevice) {
110- hr = GgafDx::Input::_pKeyboardInputDevice->SetCooperativeLevel(hWnd, DISCL_NONEXCLUSIVE | DISCL_FOREGROUND);
111- if (hr != D3D_OK) {
112- MessageBox(hWnd, "LibWndProc() キーボードのSetCooperativeLevelに失敗しました",
113- "ERROR", MB_OK | MB_ICONSTOP | MB_SETFOREGROUND | MB_TOPMOST);
114- }
115- }
116- if (GgafDx::Input::_pJoystickInputDevice) {
117- // ゲームスティック協調レベルを設定する
118- hr = GgafDx::Input::_pJoystickInputDevice->SetCooperativeLevel(hWnd, DISCL_FOREGROUND | DISCL_NONEXCLUSIVE);
119- if (hr != D3D_OK) {
120- _TRACE_("LibWndProc() ジョイスティックSetCooperativeLevelに失敗しました");
121- // ゲームスティックデバイスの初期化を試みる
122- GgafDx::Input::initJoyStick();
123- }
124- } else {
125- // ゲームスティックデバイスの初期化を試みる
126- GgafDx::Input::initJoyStick();
127- }
128- }
129- break;
130- }
131- case WM_SYSCOMMAND: {
132- if(wParam == SC_CLOSE) {
133- PostQuitMessage(0);
134- }
135- break;
136- }
137- case WM_DESTROY: {
138- PostQuitMessage(0);
139- break;
140- }
141- default:
142- break;
143- }
144-}
145-
146-
147-
34+void LibWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
14835
149-//int main(void) {
150-// PIP_ADAPTER_INFO pAdapterInfo;
151-// DWORD aiSize;
152-// BYTE* paBuff;
153-//
154-// GetAdaptersInfo(nullptr, &aiSize);//必要バッファサイズ取得
155-// paBuff = new BYTE[aiSize];
156-// pAdapterInfo = (PIP_ADAPTER_INFO) paBuff;
157-//
158-// if (GetAdaptersInfo(pAdapterInfo, &aiSize) != ERROR_SUCCESS) {
159-// printf("GetAdapterInfo呼び出し失敗\n");
160-// return 1;
161-// }
162-// std::stringstream ss;
163-//
164-//
165-// while (pAdapterInfo) {
166-// //fprintf(stdout, "MACアドレス = [");
167-//
168-// for (UINT i = 0; i < pAdapterInfo->AddressLength; i++) {
169-// ss.width(2);
170-// ss.fill('0');
171-// ss << std::hex << (int)pAdapterInfo->Address[i];
172-// //fprintf(stdout, "%.2X", (int)pAdapterInfo->Address[i]);
173-//
174-// if (i == (pAdapterInfo->AddressLength - 1)) {
175-// //fputs("]\n", stdout);
176-// } else {
177-// ss.width(1);
178-// ss << "-";
179-// //fputs("-", stdout);
180-// }
181-// }
182-// pAdapterInfo = pAdapterInfo->Next;
183-// }
184-// delete[] paBuff;
185-// printf("%s", ss.str().c_str());
186-// return 0;
187-//}
18836
18937
19038 #endif /*GGAF_LIB_H_*/
--- /dev/null
+++ b/GgafLib/src/GgafLib.cpp
@@ -0,0 +1,187 @@
1+#include "GgafLibCommonHeader.h"
2+#include <windows.h>
3+
4+#ifdef __GNUG__
5+ #undef __in
6+ #undef __out
7+#endif
8+
9+#include "jp/ggaf/dx/util/Input.h"
10+#include "jp/ggaf/lib/LibConfig.h"
11+#include "jp/ggaf/lib/DefaultGod.h"
12+#include "jp/ggaf/lib/util/WMKeyInput.h"
13+
14+extern HINSTANCE WinMain_hInstance;
15+extern HINSTANCE WinMain_hPrevInstance;
16+extern LPTSTR WinMain_lpCmdLine;
17+extern int WinMain_nCmdShow;
18+
19+/**
20+ * メイン処理 .
21+ * @param argc
22+ * @param argv
23+ * @return
24+ */
25+int LibMain(int argc, char *argv[]) {
26+ STARTUPINFO StatUpInfo;
27+ HINSTANCE hInstance;
28+ HANDLE hPrevInstance;
29+ LPSTR lpCmdLine;
30+ int nCmdShow;
31+
32+ GetStartupInfo(&StatUpInfo);
33+ hInstance = GetModuleHandle(0);
34+ hPrevInstance = 0;
35+ lpCmdLine = GetCommandLine();
36+ nCmdShow = (StatUpInfo.dwFlags & STARTF_USESHOWWINDOW) ? StatUpInfo.wShowWindow : SW_SHOWNORMAL;
37+
38+ //PG名除去
39+ while (*lpCmdLine != ' ' && *lpCmdLine != '\0') { ++lpCmdLine; }
40+ while (*lpCmdLine == ' ') { ++lpCmdLine; }
41+
42+ //本来のWinMainへ
43+ return ::WinMain((HINSTANCE)hInstance, (HINSTANCE)hPrevInstance, lpCmdLine, nCmdShow);
44+}
45+
46+/**
47+ * WinMainの初期処理 .
48+ * @param hInstance
49+ * @param hPrevInstance
50+ * @param lpCmdLine
51+ * @param nCmdShow
52+ */
53+void LibWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) {
54+ UNREFERENCED_PARAMETER(hPrevInstance);
55+ UNREFERENCED_PARAMETER(lpCmdLine);
56+ WinMain_hInstance = hInstance;
57+ WinMain_hPrevInstance = hPrevInstance;
58+ WinMain_lpCmdLine = lpCmdLine;
59+ WinMain_nCmdShow = nCmdShow;
60+}
61+
62+/**
63+ * GgafCore::フレームワークのウィンドウプロシージャ処理 .
64+ * @param hWnd
65+ * @param message
66+ * @param wParam
67+ * @param lParam
68+ */
69+void LibWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
70+ switch (message) {
71+ case WM_CHAR: {
72+ GgafLib::WMKeyInput::catchWmChar(wParam);
73+ break;
74+ }
75+ case WM_SIZE: {
76+ if (pGOD && pGOD->_pHWndPrimary) {
77+ if (!CONFIG::FULL_SCREEN) {
78+ pGOD->_adjustGameWindow = true;
79+ pGOD->_pHWnd_adjustScreen = hWnd; //サイズ変更したほうのWINDOW
80+ }
81+ }
82+ GgafCore::God::_pGod->syncTimeFrame();
83+ break;
84+ }
85+ case WM_SIZING: {
86+ GgafCore::God::_pGod->syncTimeFrame();
87+ break;
88+ }
89+ case WM_MOVING: {
90+ GgafCore::God::_pGod->syncTimeFrame();
91+ break;
92+ }
93+ case WM_CONTEXTMENU: {
94+ GgafCore::God::_pGod->syncTimeFrame();
95+ break;
96+ }
97+ case WM_SETFOCUS: {
98+ if (pGOD->_pHWndPrimary) {
99+ HRESULT hr;
100+ // マウス強調レベル設定
101+ if (GgafDx::Input::_pMouseInputDevice) {
102+ hr = GgafDx::Input::_pMouseInputDevice->SetCooperativeLevel(hWnd, DISCL_NONEXCLUSIVE | DISCL_FOREGROUND);
103+ if (hr != D3D_OK) {
104+ _TRACE_("LibWndProc() _pHWndSecondaryマウスのSetCooperativeLevelに失敗しました");
105+ }
106+ }
107+ // キーボード強調レベル設定
108+ if (GgafDx::Input::_pKeyboardInputDevice) {
109+ hr = GgafDx::Input::_pKeyboardInputDevice->SetCooperativeLevel(hWnd, DISCL_NONEXCLUSIVE | DISCL_FOREGROUND);
110+ if (hr != D3D_OK) {
111+ MessageBox(hWnd, "LibWndProc() キーボードのSetCooperativeLevelに失敗しました",
112+ "ERROR", MB_OK | MB_ICONSTOP | MB_SETFOREGROUND | MB_TOPMOST);
113+ }
114+ }
115+ if (GgafDx::Input::_pJoystickInputDevice) {
116+ // ゲームスティック協調レベルを設定する
117+ hr = GgafDx::Input::_pJoystickInputDevice->SetCooperativeLevel(hWnd, DISCL_FOREGROUND | DISCL_NONEXCLUSIVE);
118+ if (hr != D3D_OK) {
119+ _TRACE_("LibWndProc() ジョイスティックSetCooperativeLevelに失敗しました");
120+ // ゲームスティックデバイスの初期化を試みる
121+ GgafDx::Input::initJoyStick();
122+ }
123+ } else {
124+ // ゲームスティックデバイスの初期化を試みる
125+ GgafDx::Input::initJoyStick();
126+ }
127+ }
128+ break;
129+ }
130+ case WM_SYSCOMMAND: {
131+ if(wParam == SC_CLOSE) {
132+ PostQuitMessage(0);
133+ }
134+ break;
135+ }
136+ case WM_DESTROY: {
137+ PostQuitMessage(0);
138+ break;
139+ }
140+ default:
141+ break;
142+ }
143+}
144+
145+
146+
147+
148+//int main(void) {
149+// PIP_ADAPTER_INFO pAdapterInfo;
150+// DWORD aiSize;
151+// BYTE* paBuff;
152+//
153+// GetAdaptersInfo(nullptr, &aiSize);//必要バッファサイズ取得
154+// paBuff = new BYTE[aiSize];
155+// pAdapterInfo = (PIP_ADAPTER_INFO) paBuff;
156+//
157+// if (GetAdaptersInfo(pAdapterInfo, &aiSize) != ERROR_SUCCESS) {
158+// printf("GetAdapterInfo呼び出し失敗\n");
159+// return 1;
160+// }
161+// std::stringstream ss;
162+//
163+//
164+// while (pAdapterInfo) {
165+// //fprintf(stdout, "MACアドレス = [");
166+//
167+// for (UINT i = 0; i < pAdapterInfo->AddressLength; i++) {
168+// ss.width(2);
169+// ss.fill('0');
170+// ss << std::hex << (int)pAdapterInfo->Address[i];
171+// //fprintf(stdout, "%.2X", (int)pAdapterInfo->Address[i]);
172+//
173+// if (i == (pAdapterInfo->AddressLength - 1)) {
174+// //fputs("]\n", stdout);
175+// } else {
176+// ss.width(1);
177+// ss << "-";
178+// //fputs("-", stdout);
179+// }
180+// }
181+// pAdapterInfo = pAdapterInfo->Next;
182+// }
183+// delete[] paBuff;
184+// printf("%s", ss.str().c_str());
185+// return 0;
186+//}
187+
--- a/Hogera/HgrRs/model/LockOn001.sprx
+++ b/Hogera/HgrRs/model/LockOn001.sprx
@@ -1,6 +1,6 @@
11 xof 0303txt 0032
22
3-SpriteDef LockOn001 {
3+SpriteModelDef LockOn001 {
44 128.0; # FLOAT Width
55 128.0; # FLOAT Height
66 "LockOn001.png"; # STRING TextureFile
--- a/VioletVreath_launcher/src/VioletVreath_launcher.cpp
+++ b/VioletVreath_launcher/src/VioletVreath_launcher.cpp
@@ -53,6 +53,30 @@ int main(int argc, char *argv[]) {
5353 */
5454 int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) {
5555 LibWinMain(hInstance, hPrevInstance, lpCmdLine, nCmdShow);
56+
57+#ifdef MY_DEBUG
58+ #ifdef _MSC_VER
59+ #ifdef _DEBUG
60+ ::_CrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF | _CRTDBG_ALLOC_MEM_DF);
61+ #else
62+ //特に何も無し
63+ #endif
64+ #else
65+ //メモリーリ−クチェックBEGIN
66+ // ::detectMemoryLeaksStart(std::cout);
67+ #endif
68+#else
69+ #ifdef _MSC_VER
70+ #ifdef _DEBUG
71+ ::_CrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF | _CRTDBG_ALLOC_MEM_DF);
72+ #else
73+ //特に何も無し
74+ #endif
75+ #else
76+ //特に何も無し
77+ #endif
78+#endif
79+
5680 TCHAR current_dir[MAX_PATH];
5781 GetCurrentDirectory(MAX_PATH, current_dir);
5882 LPTSTR command_line = GetCommandLine();
@@ -100,29 +124,6 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
100124 WNDCLASSEX wcex2 = wcex1;
101125 wcex2.lpszClassName = "secondary";
102126 DWORD dwStyle = WS_OVERLAPPEDWINDOW;
103-#ifdef MY_DEBUG
104- #ifdef _MSC_VER
105- #ifdef _DEBUG
106- ::_CrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF | _CRTDBG_ALLOC_MEM_DF);
107- #else
108- //特に何も無し
109- #endif
110- #else
111- //メモリーリ−クチェックBEGIN
112- // ::detectMemoryLeaksStart(std::cout);
113- #endif
114-#else
115- #ifdef _MSC_VER
116- #ifdef _DEBUG
117- ::_CrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF | _CRTDBG_ALLOC_MEM_DF);
118- #else
119- //特に何も無し
120- #endif
121- #else
122- //特に何も無し
123- #endif
124-#endif
125-
126127 MSG msg;
127128 #ifdef MY_DEBUG
128129 try {