Skip to content

Commit 7350ab6

Browse files
GallaskoGallasko
authored
Merge pull request #58 from Gallasko/dev
Merge dev
2 parents 0b74c79 + 0ba550d commit 7350ab6

413 files changed

Lines changed: 23075 additions & 7529 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.claude/settings.local.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"permissions": {
3+
"allow": [
4+
"Bash(xargs grep:*)",
5+
"Bash(grep -n \"__dprint\" /x/Document/GitHub/PgEngine/src/Engine/Compiler/*.cpp)"
6+
]
7+
}
8+
}

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches: [main, dev]
66
pull_request:
77
branches: [main, dev]
8+
workflow_dispatch:
89

910
jobs:
1011
build-and-test:

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,7 @@ profile_data.csv
2222
global.sz
2323
*.generated.*
2424
*.serialization.cpp
25-
src/**/temp.pgc
25+
src/**/temp.pgc
26+
test/pgcompiler/scripts/*compiled.pgc
27+
.vscode/.intellisense-cache
28+
graph.dot

‎.vscode/c_cpp_properties.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
{
44
"name": "Linux",
55
"includePath": [
6-
"${workspaceFolder}/**",
6+
// "${workspaceFolder}/**",
77
"${workspaceFolder}/src/**",
8-
"${workspaceFolder}/import/**"
8+
// "${workspaceFolder}/import/**"
99
],
1010
"defines": [
1111
"_DEBUG",
@@ -16,8 +16,7 @@
1616
"cStandard": "c17",
1717
"cppStandard": "c++17",
1818
"intelliSenseMode": "linux-gcc-x64",
19-
"compileCommands": "${workspaceFolder}/build/compile_commands.json",
20-
"configurationProvider": "ms-vscode.cmake-tools"
19+
"compileCommands": "${workspaceFolder}/build/compile_commands.json"
2120
}
2221
],
2322
"version": 4

‎.vscode/launch.json‎

Lines changed: 108 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"linux": {
1414
"MIMode": "gdb",
1515
"miDebuggerPath": "gdb",
16-
"program": "${workspaceFolder}/build/Asteroid"
16+
"program": "${workspaceFolder}/build/BasicTerminal"
1717
},
1818
"osx": {
1919
"MIMode": "lldb",
@@ -40,7 +40,7 @@
4040
"linux": {
4141
"MIMode": "gdb",
4242
"miDebuggerPath": "gdb",
43-
"program": "${workspaceFolder}/release/ColumbaEngineEditor"
43+
"program": "${workspaceFolder}/build/ColumbaEngineEditor"
4444
},
4545
"osx": {
4646
"MIMode": "lldb",
@@ -82,20 +82,73 @@
8282
// },
8383
// "preLaunchTask": "build"
8484
},
85+
{
86+
"name": "NetworkTestServer",
87+
"type": "cppdbg",
88+
"request": "launch",
89+
"args": ["--mode=server"],
90+
"stopAtEntry": false,
91+
"cwd": "${workspaceFolder}",
92+
"environment": [],
93+
"externalConsole": false,
94+
"linux": {
95+
"MIMode": "gdb",
96+
"miDebuggerPath": "gdb",
97+
"program": "${workspaceFolder}/build/SimpleClientServer"
98+
},
99+
"osx": {
100+
"MIMode": "lldb",
101+
"miDebuggerPath": "lldb-mi",
102+
"program": "${workspaceFolder}/debug/main"
103+
},
104+
"windows": {
105+
"MIMode": "gdb",
106+
"miDebuggerPath": "gdb.exe",
107+
"program": "${workspaceFolder}/debug/GameOff.exe"
108+
}
109+
// },
110+
// "preLaunchTask": "build"
111+
},
85112
{
86113
"name": "Test",
87114
"type": "cppdbg",
88115
"request": "launch",
89-
"args": [],
116+
"args": ["--gtest_filter=Regis*"],
90117
"stopAtEntry": false,
91118
"cwd": "${workspaceFolder}",
92119
"environment": [],
93120
"externalConsole": false,
94121
"linux": {
95122
"MIMode": "gdb",
96123
"miDebuggerPath": "gdb",
124+
"program": "${workspaceFolder}/build/test_compiler"
125+
},
126+
"osx": {
127+
"MIMode": "lldb",
128+
"miDebuggerPath": "lldb-mi",
97129
"program": "${workspaceFolder}/release/test"
98130
},
131+
"windows": {
132+
"MIMode": "gdb",
133+
"miDebuggerPath": "gdb.exe",
134+
"program": "${workspaceFolder}/release/test.exe"
135+
},
136+
// "preLaunchTask": "test"
137+
},
138+
{
139+
"name": "Bench",
140+
"type": "cppdbg",
141+
"request": "launch",
142+
"args": ["--gtest_filter=Serialization*"],
143+
"stopAtEntry": false,
144+
"cwd": "${workspaceFolder}",
145+
"environment": [],
146+
"externalConsole": false,
147+
"linux": {
148+
"MIMode": "gdb",
149+
"miDebuggerPath": "gdb",
150+
"program": "${workspaceFolder}/build/bench"
151+
},
99152
"osx": {
100153
"MIMode": "lldb",
101154
"miDebuggerPath": "lldb-mi",
@@ -106,7 +159,57 @@
106159
"miDebuggerPath": "gdb.exe",
107160
"program": "${workspaceFolder}/release/test.exe"
108161
},
109-
"preLaunchTask": "test"
110-
}
162+
// "preLaunchTask": "test"
163+
},
164+
{
165+
"name": "RenderTest",
166+
"type": "cppdbg",
167+
"request": "launch",
168+
"args": [],
169+
"stopAtEntry": false,
170+
"cwd": "${workspaceFolder}",
171+
"environment": [],
172+
"externalConsole": false,
173+
"linux": {
174+
"MIMode": "gdb",
175+
"miDebuggerPath": "gdb",
176+
"program": "${workspaceFolder}/build/RenderingTest"
177+
},
178+
"osx": {
179+
"MIMode": "lldb",
180+
"miDebuggerPath": "lldb-mi",
181+
"program": "${workspaceFolder}/debug/main"
182+
},
183+
"windows": {
184+
"MIMode": "gdb",
185+
"miDebuggerPath": "gdb.exe",
186+
"program": "${workspaceFolder}/debug/GameOff.exe"
187+
}
188+
},
189+
{
190+
"name": "AsteroidTest",
191+
"type": "cppdbg",
192+
"request": "launch",
193+
"args": [],
194+
"stopAtEntry": false,
195+
"cwd": "${workspaceFolder}",
196+
"environment": [],
197+
"externalConsole": false,
198+
"linux": {
199+
"MIMode": "gdb",
200+
"miDebuggerPath": "gdb",
201+
"program": "${workspaceFolder}/release/Asteroid"
202+
},
203+
"osx": {
204+
"MIMode": "lldb",
205+
"miDebuggerPath": "lldb-mi",
206+
"program": "${workspaceFolder}/debug/main"
207+
},
208+
"windows": {
209+
"MIMode": "gdb",
210+
"miDebuggerPath": "gdb.exe",
211+
"program": "${workspaceFolder}/debug/GameOff.exe"
212+
}
213+
},
111214
]
112215
}

‎.vscode/settings.json‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,5 +151,22 @@
151151
"markdown": false,
152152
"scminput": false
153153
},
154-
"CodeGPT.apiKey": "Claude Code"
154+
"CodeGPT.apiKey": "Claude Code",
155+
"C_Cpp.exclusionPolicy": "checkFilesAndFolders",
156+
"C_Cpp.files.exclude": {
157+
"**/build/**": true,
158+
"**/build_profile/**": true,
159+
"**/build-clang/**": true,
160+
"**/release/**": true,
161+
"**/em/**": true,
162+
"**/import/**": true,
163+
"**/.vscode/**": true,
164+
"**/*.o": true,
165+
"**/*.a": true
166+
},
167+
"C_Cpp.default.browse.limitSymbolsToIncludedHeaders": true,
168+
"C_Cpp.intelliSenseEngineFallback": "disabled",
169+
"C_Cpp.default.compileCommands": "${workspaceFolder}/build/compile_commands.json",
170+
"C_Cpp.intelliSenseCachePath": "${workspaceFolder}/.vscode/.intellisense-cache",
171+
"C_Cpp.intelliSenseCacheSize": 1024
155172
}

‎.vscode/tasks.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
"showOutput": "always",
135135
"args": [
136136
"-c",
137-
"cd ${workspaceFolder}/em; emcmake cmake .; cmake --build . --config Release --target InvadersBreaker -j 10 --"
137+
"cd ${workspaceFolder}/em; emcmake cmake .; cmake --build . --config Release --target BoxBouncer -j 10 --"
138138
]
139139
},
140140
"linux": {

0 commit comments

Comments
 (0)