diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index 7be8a31..84d7400 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -4,24 +4,21 @@ "type": "split", "children": [ { - "id": "6af5a6d9d594eddb", + "id": "b1afd552ee0aa86f", "type": "tabs", "children": [ { - "id": "8378a0bf909bafbc", + "id": "5afb910d292b0d7d", "type": "leaf", "state": { - "type": "canvas", + "type": "markdown", "state": { - "file": "P2EP/cdRead.canvas", - "viewState": { - "x": 606.6612480877737, - "y": 272.9525231873553, - "zoom": -0.9999999999999999 - } + "file": "conflict-files-obsidian-git.md", + "mode": "source", + "source": false }, - "icon": "lucide-layout-dashboard", - "title": "cdRead" + "icon": "lucide-file", + "title": "conflict-files-obsidian-git" } } ] @@ -179,9 +176,13 @@ "obsidian-git:Open Git source control": false } }, - "active": "8378a0bf909bafbc", + "active": "5afb910d292b0d7d", "lastOpenFiles": [ + "conflict-files-obsidian-git.md", "P2EP/cdRead.canvas", + "PERSONAL PROJECTS/P2EP/cdRead.canvas", + "PERSONAL PROJECTS/P2EP", + "PERSONAL PROJECTS", "WORK & PROJECTS/Mol/Ideas/Все идеи для Моли.md", "P2EP", "WORK & PROJECTS/Mol/Серверы/access.md", @@ -201,8 +202,6 @@ "WORK & PROJECTS/Mol/Серверы/DOCS/Load Balancer 2.md", "SKILLS DOCS/kubernetes.pdf.crdownload", "SKILLS DOCS/devops.pdf.crdownload", - "SKILLS DOCS/backend.pdf.crdownload", - "SKILLS DOCS", "WORK & PROJECTS/Mol/Серверы/DOCS/Load Balancer.md", "WORK & PROJECTS/img/Pasted image 20241212175929.png", "WORK & PROJECTS/img/Pasted image 20241212175851.png", diff --git a/P2EP/cdRead.canvas b/PERSONAL PROJECTS/P2EP/cdRead.canvas similarity index 78% rename from P2EP/cdRead.canvas rename to PERSONAL PROJECTS/P2EP/cdRead.canvas index abb81d8..adabf01 100644 --- a/P2EP/cdRead.canvas +++ b/PERSONAL PROJECTS/P2EP/cdRead.canvas @@ -1,31 +1,32 @@ { "nodes":[ - {"id":"b5fa17fb7685a3a6","type":"text","text":"**set params pointer TO**\n\nimageClut_copy_VRAM_set\nOR\nunRleImage_main\nOR\nunLZSS_file_main\n\n","x":580,"y":160,"width":325,"height":200,"color":"6"}, {"id":"bde85c8bca071905","type":"text","text":"unRleFile_process","x":1480,"y":-270,"width":250,"height":50}, {"id":"8adedfda5f58a391","type":"text","text":"unLZSS_file_proc","x":1480,"y":-137,"width":250,"height":50}, {"id":"776634a3de2a22b7","type":"text","text":"unRleImage_main","x":990,"y":-270,"width":250,"height":50}, {"id":"c4a01a477d5732fc","type":"text","text":"imageClut_copy_VRAM_set","x":990,"y":0,"width":290,"height":50}, {"id":"0f695e983835c491","type":"text","text":"unLZSS_file_main","x":990,"y":-137,"width":250,"height":50}, - {"id":"59093a7250747b11","type":"text","text":"PckFile_DecompressImageFromRLE\nOR\nPckFile_DecompressBinToRAM","x":533,"y":465,"width":420,"height":110,"color":"5"}, - {"id":"0faf880ce3d5728c","type":"text","text":"unRle_FileTypeCheckAndDecompress","x":-510,"y":680,"width":380,"height":60}, {"id":"e5fc6194f176e243","type":"text","text":"file_lengthSetUnrleExecute","x":443,"y":690,"width":275,"height":50}, - {"id":"2d027af7fb4f4de1","type":"text","text":"unRle_execute","x":1103,"y":690,"width":250,"height":60}, - {"id":"f1b9d32f4231ce49","type":"text","text":"***PTR_UNRLE_DATA_TYPES_FUNCS**\n\nPckFile_DecompressBinToRAM\nPckFile_DecompressImageFromRLE\nPckFile_DecompressToSPU","x":108,"y":440,"width":335,"height":160,"color":"6"}, - {"id":"165564475b931695","type":"text","text":"unRle_continue","x":2050,"y":515,"width":250,"height":60}, - {"id":"5ec88caef424e4c4","type":"text","text":"","x":-510,"y":858,"width":83,"height":50}, - {"id":"a45355602c676c05","type":"text","text":"","x":2175,"y":858,"width":80,"height":50}, - {"id":"73e17a5505e4c0df","type":"text","text":"CD_ReadDecompressParse","x":-564,"y":-800,"width":275,"height":60}, - {"id":"0147f3e3d893c507","type":"text","text":"CD_Read_Sector_Loop","x":-552,"y":-660,"width":250,"height":60}, - {"id":"44e24b0dd73d8a27","type":"text","text":"RDLogo_show","x":-277,"y":-1040,"width":250,"height":60}, - {"id":"30d0bceba7588c05","type":"text","text":"MAIN_GAME_LOOP","x":-857,"y":-1040,"width":250,"height":60}, - {"id":"843028a497a8fba1","type":"text","text":"CD_Execute_m1","x":-552,"y":-570,"width":250,"height":50}, - {"id":"4d68778de1cc4bfe","type":"text","text":"CD_ExecuteReading","x":-552,"y":-520,"width":250,"height":50}, - {"id":"6ae7a0619adc1889","type":"text","text":"**CD_SectorRead**\n\nChecks CD statuses while CD reads and execute actions","x":-552,"y":-432,"width":250,"height":212}, - {"id":"f3b8eddd211ca742","type":"text","text":"????","x":213,"y":-470,"width":250,"height":60}, - {"id":"42e975d2e486d316","type":"text","text":"*params[0]","x":-360,"y":-60,"width":183,"height":60,"color":"3"}, - {"id":"95602eb206b87c58","type":"text","text":"CDRunCmdFromPointer","x":-700,"y":-60,"width":250,"height":60}, {"id":"ee4bb15a8d7d0ea6","type":"text","text":"**RECTToVRAM**\n\nTEXTURE LOAD TO VRAM","x":1465,"y":110,"width":280,"height":100,"color":"4"}, - {"id":"7118f94ce6d92aea","type":"text","text":"ReadCDEvent","x":-142,"y":-500,"width":250,"height":60} + {"id":"a45355602c676c05","type":"text","text":"","x":2220,"y":858,"width":80,"height":50}, + {"id":"165564475b931695","type":"text","text":"unRle_continue","x":2050,"y":490,"width":250,"height":60}, + {"id":"6ae7a0619adc1889","type":"text","text":"**CD_SectorRead**\n\nChecks CD statuses while CD reads and execute actions","x":-552,"y":-509,"width":250,"height":212}, + {"id":"95602eb206b87c58","type":"text","text":"CDRunCmdFromPointer","x":-700,"y":-137,"width":250,"height":60}, + {"id":"30d0bceba7588c05","type":"text","text":"MAIN_GAME_LOOP","x":-857,"y":-1117,"width":250,"height":60}, + {"id":"44e24b0dd73d8a27","type":"text","text":"RDLogo_show","x":-277,"y":-1117,"width":250,"height":60}, + {"id":"73e17a5505e4c0df","type":"text","text":"CD_ReadDecompressParse","x":-564,"y":-877,"width":275,"height":60}, + {"id":"0147f3e3d893c507","type":"text","text":"CD_Read_Sector_Loop","x":-552,"y":-737,"width":250,"height":60}, + {"id":"843028a497a8fba1","type":"text","text":"CD_Execute_m1","x":-552,"y":-647,"width":250,"height":50}, + {"id":"4d68778de1cc4bfe","type":"text","text":"CD_ExecuteReading","x":-552,"y":-597,"width":250,"height":50}, + {"id":"42e975d2e486d316","type":"text","text":"*params[0]","x":-200,"y":-142,"width":183,"height":60,"color":"6"}, + {"id":"0faf880ce3d5728c","type":"text","text":"unRle_FileTypeCheckAndDecompress","x":-385,"y":685,"width":380,"height":60}, + {"id":"5ec88caef424e4c4","type":"text","text":"","x":-385,"y":863,"width":83,"height":50}, + {"id":"f1b9d32f4231ce49","type":"text","text":"***PTR_UNRLE_DATA_TYPES_FUNCS**\n\nPckFile_DecompressBinToRAM\nPckFile_DecompressImageFromRLE\nPckFile_DecompressToSPU","x":159,"y":440,"width":335,"height":160,"color":"6"}, + {"id":"59093a7250747b11","type":"text","text":"PckFile_DecompressImageFromRLE\nOR\nPckFile_DecompressBinToRAM","x":696,"y":465,"width":420,"height":110,"color":"5"}, + {"id":"b5fa17fb7685a3a6","type":"text","text":"**set params pointer TO**\n\nimageClut_copy_VRAM_set\nOR\nunRleImage_main\nOR\nunLZSS_file_main\n\n","x":744,"y":110,"width":325,"height":200,"color":"6"}, + {"id":"451813cea87889ca","x":109,"y":-137,"width":50,"height":50,"type":"text","text":""}, + {"id":"2d027af7fb4f4de1","type":"text","text":"unRle_execute","x":1115,"y":685,"width":250,"height":60}, + {"id":"7118f94ce6d92aea","type":"text","text":"ReadCDEvent","x":-141,"y":-602,"width":250,"height":60}, + {"id":"f3b8eddd211ca742","type":"text","text":"????","x":494,"y":-817,"width":250,"height":60} ], "edges":[ {"id":"5ecaadef728e1c15","fromNode":"0faf880ce3d5728c","fromSide":"right","toNode":"f1b9d32f4231ce49","toSide":"left","color":"6"}, @@ -45,10 +46,10 @@ {"id":"b805b30acd7c9c95","fromNode":"165564475b931695","fromSide":"right","toNode":"a45355602c676c05","toSide":"right"}, {"id":"f4420ecbec7b06b5","fromNode":"a45355602c676c05","fromSide":"left","toNode":"5ec88caef424e4c4","toSide":"right","label":"DECOMPRESS / SECTOR COPY LOOP"}, {"id":"fb59aa9a4785d0a6","fromNode":"5ec88caef424e4c4","fromSide":"left","toNode":"0faf880ce3d5728c","toSide":"left"}, - {"id":"0f3a092ce3a5055e","fromNode":"42e975d2e486d316","fromSide":"right","toNode":"0faf880ce3d5728c","toSide":"left","color":"3"}, - {"id":"d8c2a9c2a8c123c5","fromNode":"42e975d2e486d316","fromSide":"right","toNode":"776634a3de2a22b7","toSide":"left","color":"3"}, - {"id":"8eac95f56267159e","fromNode":"42e975d2e486d316","fromSide":"right","toNode":"c4a01a477d5732fc","toSide":"left","color":"3"}, - {"id":"db8417a603e90e11","fromNode":"42e975d2e486d316","fromSide":"right","toNode":"0f695e983835c491","toSide":"left","color":"3"}, + {"id":"0f3a092ce3a5055e","fromNode":"451813cea87889ca","fromSide":"bottom","toNode":"0faf880ce3d5728c","toSide":"left","color":"3"}, + {"id":"d8c2a9c2a8c123c5","fromNode":"451813cea87889ca","fromSide":"right","toNode":"776634a3de2a22b7","toSide":"left","color":"3"}, + {"id":"8eac95f56267159e","fromNode":"451813cea87889ca","fromSide":"right","toNode":"c4a01a477d5732fc","toSide":"left","color":"3"}, + {"id":"db8417a603e90e11","fromNode":"451813cea87889ca","fromSide":"right","toNode":"0f695e983835c491","toSide":"left","color":"3"}, {"id":"7f1d0195c0c1d4b2","fromNode":"4d68778de1cc4bfe","fromSide":"right","toNode":"7118f94ce6d92aea","toSide":"left"}, {"id":"31ff75c59e463292","fromNode":"4d68778de1cc4bfe","fromSide":"bottom","toNode":"6ae7a0619adc1889","toSide":"top"}, {"id":"cfcd075a15e242f1","fromNode":"7118f94ce6d92aea","fromSide":"right","toNode":"f3b8eddd211ca742","toSide":"left"}, @@ -60,6 +61,7 @@ {"id":"afa457e631b79b78","fromNode":"42e975d2e486d316","fromSide":"bottom","toNode":"95602eb206b87c58","toSide":"bottom","label":"while *p!=0"}, {"id":"e21b4efcb9c62fd5","fromNode":"c4a01a477d5732fc","fromSide":"right","toNode":"ee4bb15a8d7d0ea6","toSide":"left"}, {"id":"079a759fdabbba92","fromNode":"6ae7a0619adc1889","fromSide":"bottom","toNode":"95602eb206b87c58","toSide":"top","label":"*file_struct, file_count"}, - {"id":"84f4f93f0a4db7fd","fromNode":"95602eb206b87c58","fromSide":"right","toNode":"42e975d2e486d316","toSide":"left"} + {"id":"84f4f93f0a4db7fd","fromNode":"95602eb206b87c58","fromSide":"right","toNode":"42e975d2e486d316","toSide":"left"}, + {"id":"0b5abeb46804b847","fromNode":"42e975d2e486d316","fromSide":"right","toNode":"451813cea87889ca","toSide":"left","color":"3"} ] } \ No newline at end of file