Game-Decompilation/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-11-23 06:09:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

a few more small things to get to desert

Browse Source
This commit is contained in:
water 2024-04-12 20:51:55 -04:00
parent 884a1857de
commit 98663db0a0
5 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
decompiler/config/jak3/ntsc_v1/inputs.jsonc
View File

@ -35,7 +35,7 @@
"DGO/ARENACST.DGO",
// // desert
// "DGO/DESA.DGO",
// "DGO/DESB.DGO",
"DGO/DESB.DGO",
// "DGO/DESBATTL.DGO",
// "DGO/DESBCST.DGO",
// "DGO/DESBOSS1.DGO",
@ -273,7 +273,7 @@
// "DGO/LJNDKLEV.DGO",
// "DGO/LKEIRA.DGO",
// "DGO/LKLEEVER.DGO",
// "DGO/LMECH.DGO",
"DGO/LMECH.DGO",
// "DGO/LMHCA.DGO",
// "DGO/LMHCB.DGO",
// "DGO/LNSTCST.DGO",

10
decompiler/level_extractor/extract_merc.cpp
View File

@ -228,8 +228,14 @@ void update_mode_from_alpha1(GsAlpha reg, DrawMode& mode) {
reg.c_mode() == GsAlpha::BlendMode::ZERO_OR_FIXED &&
reg.d_mode() == GsAlpha::BlendMode::DEST) {
// Cv = (Cs - Cd) * FIX + Cd
ASSERT(reg.fix() == 64);
mode.set_alpha_blend(DrawMode::AlphaBlend::SRC_DST_FIX_DST);
if (reg.fix() == 64) {
mode.set_alpha_blend(DrawMode::AlphaBlend::SRC_DST_FIX_DST);
} else if (reg.fix() == 128) {
// Cv = (Cs - Cd) + Cd = Cs... no blend.
mode.set_alpha_blend(DrawMode::AlphaBlend::SRC_SRC_SRC_SRC);
} else {
ASSERT_NOT_REACHED();
}
} else if (reg.a_mode() == GsAlpha::BlendMode::DEST &&
reg.b_mode() == GsAlpha::BlendMode::SOURCE &&
reg.c_mode() == GsAlpha::BlendMode::ZERO_OR_FIXED &&

8
goal_src/jak3/engine/gfx/texture/texture.gc
View File

@ -1421,9 +1421,11 @@
)
)
(((tpage-category hfrag))
(set! (-> lev upload-size 10)
(upload-vram-pages pool (-> pool segment-common) a2-1 (tex-upload-mode seg0-1-2) bucket)
)
;; for PC: disable hfrag texture uploads since we're going to rewrite the renderer.
;; this saves us from creating the bucket renderer and processing uploads.
; (set! (-> lev upload-size 10)
; (upload-vram-pages pool (-> pool segment-common) a2-1 (tex-upload-mode seg0-1-2) bucket)
; )
)
)
;; added nonzero check.

5
goal_src/jak3/engine/level/level.gc
View File

@ -3820,9 +3820,10 @@
((or (= (-> this level i status) 'active)
(= (-> this level i status) 'alive)
(= (-> this level i status) 'loaded))
(set! (-> lev-names i) (symbol->string (-> this level i nickname)))
;; using info nickname since desert's bsp nickname is desert-vis, not dst.
(set! (-> lev-names i) (symbol->string (-> this level i info nickname)))
(if (-> this level i display?)
(set! (-> active-lev-names i) (symbol->string (-> this level i nickname))))
(set! (-> active-lev-names i) (symbol->string (-> this level i info nickname))))
)
)
)

2
goal_src/jak3/game.gp
View File

@ -119,7 +119,7 @@
(cgo-file "arenacst.gd" common-dep)
; ;; desert
; (cgo-file "desa.gd" common-dep)
; (cgo-file "desb.gd" common-dep)
(cgo-file "desb.gd" common-dep)
; (cgo-file "desbattl.gd" common-dep)
; (cgo-file "desbcst.gd" common-dep)
; (cgo-file "desboss1.gd" common-dep)