kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'mr-origin-69'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-13 20:26:40 -05:00
parent d55a8d829d d36f6a807c
commit 425e05a58b
80 changed files with 806 additions and 660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core2/nc/dynamicCamF.c
View File

@@ -1,5 +1,6 @@
#include <ultra64.h>
#include "functions.h"
#include <core1/viewport.h>
static f32 __playerStartPosition[3];
@@ -7,8 +8,8 @@ void ncDynamicCamF_init(void){
f32 sp24[3];
f32 sp12[3];
viewport_get_position_vec3f(sp24);
viewport_get_rotation_vec3f(sp12);
viewport_getPosition_vec3f(sp24);
viewport_getRotation_vec3f(sp12);
ncDynamicCamera_setPosition(sp24);
ncDynamicCamera_setRotation(sp12);
player_getPosition(__playerStartPosition);

21
src/core2/nc/dynamicCamera.c
View File

@@ -1,11 +1,12 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include <core1/viewport.h>
extern bool func_80245314(f32[3], f32[3], f32, f32, u32);
extern int func_80244D94(f32[3], f32[3], f32[3], u32, f32);
extern int func_8024575C(f32[3], f32[3], f32, f32[3], s32, u32);
extern void func_8024C510(f32);
extern f32 func_80258708(f32[3], f32[3]);
extern f32 func_80259198(f32, f32);
extern f32 func_8028E82C(void);
@@ -211,8 +212,8 @@ void func_802BCBD4(void) {
func_802C0120();
func_802C2258();
func_802C0F4C();
viewport_get_rotation_vec3f(cameraRotation);
viewport_get_position_vec3f(cameraPosition);
viewport_getRotation_vec3f(cameraRotation);
viewport_getPosition_vec3f(cameraPosition);
ml_vec3f_copy(D_8037D948, cameraPosition);
ml_vec3f_clear(D_8037D9C8);
ml_vec3f_clear(D_8037D9E0);
@@ -365,8 +366,8 @@ void ncDynamicCamera_update(void){
if(dynamicCameraInFirstPerson){
ncFirstPersonCamera_getPositionAndRotation(sp24, sp18);
}
viewport_set_position_vec3f(sp24);
viewport_set_rotation_vec3f(sp18);
viewport_setPosition_vec3f(sp24);
viewport_setRotation_vec3f(sp18);
}
int ncDynamicCamera_getState(void){
@@ -939,8 +940,8 @@ void func_802BE720(void){
f32 sp28[3];
f32 sp1C[3];
viewport_get_position_vec3f(sp28);
viewport_get_rotation_vec3f(sp1C);
viewport_getPosition_vec3f(sp28);
viewport_getRotation_vec3f(sp1C);
ncDynamicCamera_setPosition(sp28);
ncDynamicCamera_setRotation(sp1C);
@@ -960,9 +961,9 @@ void func_802BE794(void){
sp2C[1] += 100.0f;
player_getRotation(sp20);
sp20[1] = mlNormalizeAngle(sp20[1] + 180.0f);
viewport_set_position_vec3f(sp2C);
viewport_set_rotation_vec3f(sp20);
func_8024C510(300.0f);
viewport_setPosition_vec3f(sp2C);
viewport_setRotation_vec3f(sp20);
viewport_moveAlongZAxis(300.0f);
func_802BE720();
}//L802BE828
}

13
src/core2/nc/randomCamera.c
View File

@@ -1,6 +1,7 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include <core1/viewport.h>
/* .bss */
struct {
@@ -15,8 +16,8 @@ void ncRandomCamera_init(void) {
s32 sp24[3];
s32 sp18[3];
viewport_get_position_vec3f(D_8037DA50.storedPosition);
viewport_get_rotation_vec3f(D_8037DA50.storedRotation);
viewport_getPosition_vec3f(D_8037DA50.storedPosition);
viewport_getRotation_vec3f(D_8037DA50.storedRotation);
mapModel_getBounds(sp24, sp18);
D_8037DA50.minPosition[0] = (f32) sp24[0];
@@ -30,8 +31,8 @@ void ncRandomCamera_init(void) {
void ncRandomCamera_end(void){
viewport_set_position_vec3f(D_8037DA50.storedPosition);
viewport_set_rotation_vec3f(D_8037DA50.storedRotation);
viewport_setPosition_vec3f(D_8037DA50.storedPosition);
viewport_setRotation_vec3f(D_8037DA50.storedRotation);
}
void ncRandomCamera_update(void) {
@@ -45,6 +46,6 @@ void ncRandomCamera_update(void) {
sp18[0] = randf2(-90.0f, 90.0f);\
sp18[1] = randf2(0.0f, 360.0f);\
sp18[2] = 0.0f;
viewport_set_position_vec3f(sp24);
viewport_set_rotation_vec3f(sp18);
viewport_setPosition_vec3f(sp24);
viewport_setRotation_vec3f(sp18);
}

5
src/core2/nc/staticCamera.c
View File

@@ -1,6 +1,7 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include <core1/viewport.h>
#include "core2/nc/camera.h"
@@ -33,8 +34,8 @@ void ncStaticCamera_setPosition(f32 arg0[3]){
}
void ncStaticCamera_update(void){
viewport_set_position_vec3f(ncStaticCameraPosition);
viewport_set_rotation_vec3f(ncStaticCameraRotation);
viewport_setPosition_vec3f(ncStaticCameraPosition);
viewport_setRotation_vec3f(ncStaticCameraRotation);
}
void __ncStaticCamera_setToNode(s32 camera_node_index){