mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 14:20:11 +00:00
Code Issues Projects Releases Wiki Activity

object_bg and object_mir_ray OK (#714)

Browse source 
* object_bg and object_mir_ray

* remove externs in mir_ray

* newline at end of xml

* fix a couple of warnings in Obj_Tsubo
This commit is contained in:
EllipticEllipsis 2021-03-18 07:46:42 +00:00 • committed by GitHub
parent e48e565ffe
commit 77ec4d4916
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 112 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
View file

@ -5,6 +5,7 @@
*/
#include "z_mir_ray.h"
#include "objects/object_mir_ray/object_mir_ray.h"
#define FLAGS 0x00000030
@ -112,9 +113,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP),
};
extern Gfx D_060000B0[];
extern Gfx D_06000C50[];
void MirRay_SetupCollider(MirRay* this) {
Vec3f colliderOffset;
MirRayDataEntry* dataEntry = &sMirRayData[this->actor.params];
@ -505,7 +503,7 @@ void MirRay_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_mir_ray.c", 972),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 150, (s16)(temp = this->reflectIntensity * 100.0f));
gSPDisplayList(POLY_XLU_DISP++, D_06000C50);
gSPDisplayList(POLY_XLU_DISP++, &gShieldBeamGlowDL);
MirRay_SetupReflectionPolys(this, globalCtx, reflection);
MirRay_RemoveSimilarReflections(reflection);
MirRay_ReflectedBeam(this, globalCtx, reflection);
@ -529,7 +527,7 @@ void MirRay_Draw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetRenderMode(POLY_XLU_DISP++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_DECAL2);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 150, reflection[0].opacity);
gSPDisplayList(POLY_XLU_DISP++, D_060000B0);
gSPDisplayList(POLY_XLU_DISP++, &gShieldBeamImageDL);
}
}