Skip to content

Commit 79ac3b7

Browse files
sblondonsblondon
committed
refacto: replace magical values
Hexadecimal constants are replaced by the same value, defined by the FRAME_SIZE macro. These changes are based on the same replacement already done in clut.c.
1 parent 3c93bc0 commit 79ac3b7

File tree

16 files changed

+30
-31
lines changed

16 files changed

+30
-31
lines changed

‎src/samples/gu/beginobject/beginobject.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ int main(int argc, char* argv[]) {
125125

126126
sceGuStart(GU_DIRECT,list);
127127
sceGuDrawBuffer(GU_PSM_8888,(void*)0,BUF_WIDTH);
128-
sceGuDispBuffer(SCR_WIDTH,SCR_HEIGHT,(void*)0x88000,BUF_WIDTH);
129-
sceGuDepthBuffer((void*)0x110000,BUF_WIDTH);
128+
sceGuDispBuffer(SCR_WIDTH,SCR_HEIGHT,(void*)FRAME_SIZE,BUF_WIDTH);
129+
sceGuDepthBuffer((void*)(FRAME_SIZE*2),BUF_WIDTH);
130130
sceGuOffset(2048 - (SCR_WIDTH/2),2048 - (SCR_HEIGHT/2));
131131
sceGuViewport(2048,2048,SCR_WIDTH,SCR_HEIGHT);
132132
sceGuDepthRange(0xc350,0x2710);

‎src/samples/gu/celshading/celshading.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ int main(int argc, char* argv[]) {
117117

118118
sceGuStart(GU_DIRECT,list);
119119
sceGuDrawBuffer(GU_PSM_8888,(void*)0,BUF_WIDTH);
120-
sceGuDispBuffer(SCR_WIDTH,SCR_HEIGHT,(void*)0x88000,BUF_WIDTH);
121-
sceGuDepthBuffer((void*)0x110000,BUF_WIDTH);
120+
sceGuDispBuffer(SCR_WIDTH,SCR_HEIGHT,(void*)FRAME_SIZE,BUF_WIDTH);
121+
sceGuDepthBuffer((void*)(FRAME_SIZE*2),BUF_WIDTH);
122122
sceGuOffset(2048 - (SCR_WIDTH/2),2048 - (SCR_HEIGHT/2));
123123
sceGuViewport(2048,2048,SCR_WIDTH,SCR_HEIGHT);
124124
sceGuDepthRange(0xc350,0x2710);

‎src/samples/gu/envmap/envmap.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ extern unsigned char env0_start[];
3535
#define SCR_WIDTH (480)
3636
#define SCR_HEIGHT (272)
3737
#define PIXEL_SIZE (4) /* change this if you change to another screenmode */
38-
#define FRAME_SIZE (BUF_WIDTH * SCR_HEIGHT * PIXEL_SIZE)
3938

4039
#define TORUS_SLICES 48 // numc
4140
#define TORUS_ROWS 48 // numt

‎src/samples/gu/integerdrawing/integerdrawing.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ int main(int argc, char* argv[]) {
188188

189189
sceGuStart(GU_DIRECT,list);
190190
sceGuDrawBuffer(GU_PSM_8888,(void*)0,BUF_WIDTH);
191-
sceGuDispBuffer(SCR_WIDTH,SCR_HEIGHT,(void*)0x88000,BUF_WIDTH);
192-
sceGuDepthBuffer((void*)0x110000,BUF_WIDTH);
191+
sceGuDispBuffer(SCR_WIDTH,SCR_HEIGHT,(void*)FRAME_SIZE,BUF_WIDTH);
192+
sceGuDepthBuffer((void*)(FRAME_SIZE*2),BUF_WIDTH);
193193
sceGuOffset(2048 - (SCR_WIDTH/2),2048 - (SCR_HEIGHT/2));
194194
sceGuViewport(2048,2048,SCR_WIDTH,SCR_HEIGHT);
195195
sceGuDepthRange(0xc350,0x2710);

‎src/samples/gu/morph/morph.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ int main(int argc, char* argv[])
111111

112112
sceGuStart(GU_DIRECT,list);
113113
sceGuDrawBuffer(GU_PSM_8888,(void*)0,BUF_WIDTH);
114-
sceGuDispBuffer(SCR_WIDTH,SCR_HEIGHT,(void*)0x88000,BUF_WIDTH);
115-
sceGuDepthBuffer((void*)0x110000,BUF_WIDTH);
114+
sceGuDispBuffer(SCR_WIDTH,SCR_HEIGHT,(void*)FRAME_SIZE,BUF_WIDTH);
115+
sceGuDepthBuffer((void*)(FRAME_SIZE*2),BUF_WIDTH);
116116
sceGuOffset(2048 - (SCR_WIDTH/2),2048 - (SCR_HEIGHT/2));
117117
sceGuViewport(2048,2048,SCR_WIDTH,SCR_HEIGHT);
118118
sceGuDepthRange(0xc350,0x2710);

‎src/samples/gu/morphskin/morphskin.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ int main(int argc, char* argv[])
8888

8989
sceGuStart(GU_DIRECT,list);
9090
sceGuDrawBuffer(GU_PSM_8888,(void*)0,BUF_WIDTH);
91-
sceGuDispBuffer(SCR_WIDTH,SCR_HEIGHT,(void*)0x88000,BUF_WIDTH);
92-
sceGuDepthBuffer((void*)0x110000,BUF_WIDTH);
91+
sceGuDispBuffer(SCR_WIDTH,SCR_HEIGHT,(void*)FRAME_SIZE,BUF_WIDTH);
92+
sceGuDepthBuffer((void*)(FRAME_SIZE*2),BUF_WIDTH);
9393
sceGuOffset(2048 - (SCR_WIDTH/2),2048 - (SCR_HEIGHT/2));
9494
sceGuViewport(2048,2048,SCR_WIDTH,SCR_HEIGHT);
9595
sceGuDepthRange(0xc350,0x2710);

‎src/samples/gu/reflection/reflection.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ int main(int argc, char* argv[])
117117

118118
sceGuStart(GU_DIRECT,list);
119119
sceGuDrawBuffer(GU_PSM_8888,(void*)0,BUF_WIDTH);
120-
sceGuDispBuffer(SCR_WIDTH,SCR_HEIGHT,(void*)0x88000,BUF_WIDTH);
121-
sceGuDepthBuffer((void*)0x110000,BUF_WIDTH);
120+
sceGuDispBuffer(SCR_WIDTH,SCR_HEIGHT,(void*)FRAME_SIZE,BUF_WIDTH);
121+
sceGuDepthBuffer((void*)(FRAME_SIZE*2),BUF_WIDTH);
122122
sceGuOffset(2048 - (SCR_WIDTH/2),2048 - (SCR_HEIGHT/2));
123123
sceGuViewport(2048,2048,SCR_WIDTH,SCR_HEIGHT);
124124
sceGuDepthRange(0xc350,0x2710);

‎src/samples/gu/signals/signals.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ int main(int argc, char* argv[])
222222
// setup GU
223223
sceGuStart(GU_DIRECT,list);
224224
sceGuDrawBuffer(GU_PSM_8888,(void*)0,BUF_WIDTH);
225-
sceGuDispBuffer(SCR_WIDTH,SCR_HEIGHT,(void*)0x88000,BUF_WIDTH);
226-
sceGuDepthBuffer((void*)0x110000,BUF_WIDTH);
225+
sceGuDispBuffer(SCR_WIDTH,SCR_HEIGHT,(void*)FRAME_SIZE,BUF_WIDTH);
226+
sceGuDepthBuffer((void*)(FRAME_SIZE*2),BUF_WIDTH);
227227
sceGuOffset(2048 - (SCR_WIDTH/2),2048 - (SCR_HEIGHT/2));
228228
sceGuViewport(2048,2048,SCR_WIDTH,SCR_HEIGHT);
229229
sceGuDepthRange(0xc350,0x2710);

‎src/samples/gu/skinning/skinning.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ int main(int argc, char* argv[])
8181

8282
sceGuStart(GU_DIRECT,list);
8383
sceGuDrawBuffer(GU_PSM_8888,(void*)0,BUF_WIDTH);
84-
sceGuDispBuffer(SCR_WIDTH,SCR_HEIGHT,(void*)0x88000,BUF_WIDTH);
85-
sceGuDepthBuffer((void*)0x110000,BUF_WIDTH);
84+
sceGuDispBuffer(SCR_WIDTH,SCR_HEIGHT,(void*)FRAME_SIZE,BUF_WIDTH);
85+
sceGuDepthBuffer((void*)(FRAME_SIZE*2),BUF_WIDTH);
8686
sceGuOffset(2048 - (SCR_WIDTH/2),2048 - (SCR_HEIGHT/2));
8787
sceGuViewport(2048,2048,SCR_WIDTH,SCR_HEIGHT);
8888
sceGuDepthRange(0xc350,0x2710);

‎src/samples/gu/spharm/cube.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ int main(int argc, char* argv[])
153153
// setup
154154
sceGuStart(GU_DIRECT,list);
155155
sceGuDrawBuffer(GU_PSM_8888,(void*)0,BUF_WIDTH);
156-
sceGuDispBuffer(SCR_WIDTH,SCR_HEIGHT,(void*)0x88000,BUF_WIDTH);
157-
sceGuDepthBuffer((void*)0x110000,BUF_WIDTH);
156+
sceGuDispBuffer(SCR_WIDTH,SCR_HEIGHT,(void*)FRAME_SIZE,BUF_WIDTH);
157+
sceGuDepthBuffer((void*)(FRAME_SIZE*2),BUF_WIDTH);
158158
sceGuOffset(2048 - (SCR_WIDTH/2),2048 - (SCR_HEIGHT/2));
159159
sceGuViewport(2048,2048,SCR_WIDTH,SCR_HEIGHT);
160160
sceGuDepthRange(0xc350,0x2710);//0xc350=50000 0x2710=10000

0 commit comments

Comments
 (0)