Skip to content

[PoC] Bulk actor manipulator #6067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
garrettjoecox wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[PoC] Bulk actor manipulator #6067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions soh/include/z64collision_check.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#ifndef Z_COLLISION_CHECK_H
#define Z_COLLISION_CHECK_H

#define COLLISION_CHECK_AT_MAX 50
#define COLLISION_CHECK_AC_MAX 60
#define COLLISION_CHECK_OC_MAX 50
#define COLLISION_CHECK_AT_MAX 200
#define COLLISION_CHECK_AC_MAX 200
#define COLLISION_CHECK_OC_MAX 200
#define COLLISION_CHECK_OC_LINE_MAX 3

// From z64.h
Expand Down
477 changes: 467 additions & 10 deletions soh/soh/Enhancements/debugger/actorViewer.cpp
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion soh/soh/SohGui/SohGui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ void SetupGuiElements() {
std::make_shared<CosmeticsEditorWindow>(CVAR_WINDOW("CosmeticsEditor"), "Cosmetics Editor", ImVec2(550, 520));
gui->AddGuiWindow(mCosmeticsEditorWindow);
mActorViewerWindow =
std::make_shared<ActorViewerWindow>(CVAR_WINDOW("ActorViewer"), "Actor Viewer", ImVec2(520, 600));
std::make_shared<ActorViewerWindow>(CVAR_WINDOW("ActorViewer"), "Actor Viewer", ImVec2(1200, 700));
gui->AddGuiWindow(mActorViewerWindow);
mColViewerWindow =
std::make_shared<ColViewerWindow>(CVAR_WINDOW("CollisionViewer"), "Collision Viewer", ImVec2(520, 600));
Expand Down
2 changes: 1 addition & 1 deletion soh/soh/SohGui/SohMenuDevTools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ void SohMenu::AddMenuDevTools() {

// Actor Viewer
path.sidebarName = "Actor Viewer";
AddSidebarEntry("Dev Tools", path.sidebarName, 2);
AddSidebarEntry("Dev Tools", path.sidebarName, 1);
AddWidget(path, "Popout Actor Viewer", WIDGET_WINDOW_BUTTON)
.CVar(CVAR_WINDOW("ActorViewer"))
.WindowName("Actor Viewer")
Expand Down
3 changes: 2 additions & 1 deletion soh/src/code/z_actor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3351,7 +3351,8 @@ Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 pos

objBankIndex = Object_GetIndex(&gPlayState->objectCtx, dbEntry->objectId);

if (objBankIndex < 0 && (!gMapLoading || CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0))) {
if (objBankIndex < 0 && (!gMapLoading || CVarGetInteger(CVAR_ENHANCEMENT("RandomizedEnemies"), 0) ||
CVarGetInteger(CVAR_SETTING("DisableObjectDependency"), 0))) {
objBankIndex = 0;
}

Expand Down
2 changes: 1 addition & 1 deletion soh/src/overlays/actors/ovl_player_actor/z_player.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ static PlayerAgeProperties sAgeProperties[] = {
},
};

static u32 sNoclipEnabled = false;
u32 sNoclipEnabled = false;
Copy link
Contributor

@serprex serprex Jan 3, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s prefix out of place after removal of static

static f32 sControlStickMagnitude = 0.0f;
static s16 sControlStickAngle = 0;
static s16 sControlStickWorldYaw = 0;
Expand Down
Loading