mirror of
https://github.com/GRRLIB/GRRLIB.git
synced 2024-12-23 02:39:19 +00:00
[NEW] GRRLIB_DrawImgQuad (+ new example nonameno01 how to use it)
but it seems a little distorted, perhaps need fix.
This commit is contained in:
N0NameN0
parent
71ac1a21b3
commit
5836c028de
7 changed files with 8053 additions and 0 deletions
|
|
@ -564,6 +564,57 @@ inline void GRRLIB_DrawImg(f32 xpos, f32 ypos, GRRLIB_texImg tex, float degrees,
|
|||
GX_SetVtxDesc(GX_VA_TEX0, GX_NONE);
|
||||
}
|
||||
|
||||
/**
|
||||
* Draw a textured quad.
|
||||
* @param pos vector array of the 4 points
|
||||
* @param tex texture to draw.
|
||||
* @param color
|
||||
*/
|
||||
inline void GRRLIB_DrawImgQuad(Vector pos[4], GRRLIB_texImg tex, u32 color) {
|
||||
GXTexObj texObj;
|
||||
Mtx m, m1, m2, mv;
|
||||
|
||||
GX_InitTexObj(&texObj, tex.data, tex.w, tex.h, GX_TF_RGBA8, GX_CLAMP, GX_CLAMP, GX_FALSE);
|
||||
if (GRRLIB_Settings.antialias == false) {
|
||||
GX_InitTexObjLOD(&texObj, GX_NEAR, GX_NEAR, 0.0f, 0.0f, 0.0f, 0, 0, GX_ANISO_1);
|
||||
}
|
||||
GX_LoadTexObj(&texObj, GX_TEXMAP0);
|
||||
|
||||
GX_SetTevOp(GX_TEVSTAGE0, GX_MODULATE);
|
||||
GX_SetVtxDesc(GX_VA_TEX0, GX_DIRECT);
|
||||
|
||||
guMtxIdentity(m1);
|
||||
guMtxScaleApply(m1, m1, 1, 1, 1.0);
|
||||
Vector axis = (Vector) {0, 0, 1 };
|
||||
guMtxRotAxisDeg (m2, &axis, 0);
|
||||
guMtxConcat(m2, m1, m);
|
||||
|
||||
guMtxConcat(GXmodelView2D, m, mv);
|
||||
|
||||
GX_LoadPosMtxImm(mv, GX_PNMTX0);
|
||||
GX_Begin(GX_QUADS, GX_VTXFMT0, 4);
|
||||
GX_Position3f32(pos[0].x, pos[0].y, 0);
|
||||
GX_Color1u32(color);
|
||||
GX_TexCoord2f32(0, 0);
|
||||
|
||||
GX_Position3f32(pos[1].x, pos[1].y, 0);
|
||||
GX_Color1u32(color);
|
||||
GX_TexCoord2f32(1, 0);
|
||||
|
||||
GX_Position3f32(pos[2].x, pos[2].y, 0);
|
||||
GX_Color1u32(color);
|
||||
GX_TexCoord2f32(1, 1);
|
||||
|
||||
GX_Position3f32(pos[3].x, pos[3].y, 0);
|
||||
GX_Color1u32(color);
|
||||
GX_TexCoord2f32(0, 1);
|
||||
GX_End();
|
||||
GX_LoadPosMtxImm(GXmodelView2D, GX_PNMTX0);
|
||||
|
||||
GX_SetTevOp(GX_TEVSTAGE0, GX_PASSCLR);
|
||||
GX_SetVtxDesc(GX_VA_TEX0, GX_NONE);
|
||||
}
|
||||
|
||||
/**
|
||||
* Draw a tile.
|
||||
* @param xpos Specifies the x-coordinate of the upper-left corner.
|
||||
|
|
|
|||
|
|
@ -116,6 +116,7 @@ void GRRLIB_FreeBMF(GRRLIB_bytemapFont bmf);
|
|||
void GRRLIB_InitTileSet(struct GRRLIB_texImg *tex, unsigned int tilew, unsigned int tileh, unsigned int tilestart);
|
||||
|
||||
inline void GRRLIB_DrawImg(f32 xpos, f32 ypos, GRRLIB_texImg tex, float degrees, float scaleX, f32 scaleY, u32 color );
|
||||
inline void GRRLIB_DrawImgQuad(Vector pos[4], GRRLIB_texImg tex, u32 color);
|
||||
inline void GRRLIB_DrawTile(f32 xpos, f32 ypos, GRRLIB_texImg tex, float degrees, float scaleX, f32 scaleY, u32 color, int frame);
|
||||
|
||||
void GRRLIB_Printf(f32 xpos, f32 ypos, GRRLIB_texImg tex, u32 color, f32 zoom, const char *text, ...);
|
||||
|
|
|
|||
140
examples/nonameno01/Makefile
Normal file
140
examples/nonameno01/Makefile
Normal file
|
|
@ -0,0 +1,140 @@
|
|||
#---------------------------------------------------------------------------------
|
||||
# Clear the implicit built in rules
|
||||
#---------------------------------------------------------------------------------
|
||||
.SUFFIXES:
|
||||
#---------------------------------------------------------------------------------
|
||||
ifeq ($(strip $(DEVKITPPC)),)
|
||||
$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC)
|
||||
endif
|
||||
|
||||
include $(DEVKITPPC)/wii_rules
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# TARGET is the name of the output
|
||||
# BUILD is the directory where object files & intermediate files will be placed
|
||||
# SOURCES is a list of directories containing source code
|
||||
# INCLUDES is a list of directories containing extra header files
|
||||
#---------------------------------------------------------------------------------
|
||||
GRRLIB := ../../GRRLIB
|
||||
TARGET := $(notdir $(CURDIR))
|
||||
BUILD := build
|
||||
SOURCES := source source/gfx $(GRRLIB)/GRRLIB $(GRRLIB)/lib/libpng/pngu
|
||||
DATA := data
|
||||
INCLUDES :=
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# options for code generation
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
CFLAGS = -g -O2 -mrvl -Wall $(MACHDEP) $(INCLUDE)
|
||||
CXXFLAGS = $(CFLAGS)
|
||||
|
||||
LDFLAGS = -g $(MACHDEP) -mrvl -Wl,-Map,$(notdir $@).map
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# any extra libraries we wish to link with the project
|
||||
#---------------------------------------------------------------------------------
|
||||
LIBS := -lpng -ljpeg -lz -lfat -lwiiuse -lbte -logc -lm
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# list of directories containing libraries, this must be the top level containing
|
||||
# include and lib
|
||||
#---------------------------------------------------------------------------------
|
||||
LIBDIRS := $(CURDIR)/$(GRRLIB)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# no real need to edit anything past this point unless you need to add additional
|
||||
# rules for different file extensions
|
||||
#---------------------------------------------------------------------------------
|
||||
ifneq ($(BUILD),$(notdir $(CURDIR)))
|
||||
#---------------------------------------------------------------------------------
|
||||
|
||||
export OUTPUT := $(CURDIR)/$(TARGET)
|
||||
|
||||
export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
|
||||
$(foreach dir,$(DATA),$(CURDIR)/$(dir))
|
||||
|
||||
export DEPSDIR := $(CURDIR)/$(BUILD)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# automatically build a list of object files for our project
|
||||
#---------------------------------------------------------------------------------
|
||||
CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
|
||||
CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
|
||||
sFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
|
||||
SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
|
||||
BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# use CXX for linking C++ projects, CC for standard C
|
||||
#---------------------------------------------------------------------------------
|
||||
ifeq ($(strip $(CPPFILES)),)
|
||||
export LD := $(CC)
|
||||
else
|
||||
export LD := $(CXX)
|
||||
endif
|
||||
|
||||
export OFILES := $(addsuffix .o,$(BINFILES)) \
|
||||
$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
|
||||
$(sFILES:.s=.o) $(SFILES:.S=.o)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# build a list of include paths
|
||||
#---------------------------------------------------------------------------------
|
||||
export INCLUDE := $(foreach dir,$(INCLUDES), -iquote $(CURDIR)/$(dir)) \
|
||||
$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
|
||||
-I$(CURDIR)/$(BUILD) \
|
||||
-I$(LIBOGC_INC)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# build a list of library paths
|
||||
#---------------------------------------------------------------------------------
|
||||
export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) \
|
||||
-L$(LIBOGC_LIB)
|
||||
|
||||
export OUTPUT := $(CURDIR)/$(TARGET)
|
||||
.PHONY: $(BUILD) clean
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
$(BUILD):
|
||||
@[ -d $@ ] || mkdir -p $@
|
||||
@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
clean:
|
||||
@echo clean ...
|
||||
@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
run:
|
||||
psoload $(TARGET).dol
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
reload:
|
||||
psoload -r $(TARGET).dol
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
else
|
||||
|
||||
DEPENDS := $(OFILES:.o=.d)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# main targets
|
||||
#---------------------------------------------------------------------------------
|
||||
$(OUTPUT).dol: $(OUTPUT).elf
|
||||
$(OUTPUT).elf: $(OFILES)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# This rule links in binary data with the .jpg extension
|
||||
#---------------------------------------------------------------------------------
|
||||
%.jpg.o : %.jpg
|
||||
#---------------------------------------------------------------------------------
|
||||
@echo $(notdir $<)
|
||||
$(bin2o)
|
||||
|
||||
-include $(DEPENDS)
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
endif
|
||||
#---------------------------------------------------------------------------------
|
||||
7782
examples/nonameno01/source/gfx/pirate.c
Normal file
7782
examples/nonameno01/source/gfx/pirate.c
Normal file
File diff suppressed because it is too large
Load diff
14
examples/nonameno01/source/gfx/pirate.h
Normal file
14
examples/nonameno01/source/gfx/pirate.h
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
/*
|
||||
This file was autogenerated by raw2c.
|
||||
Visit http://www.devkitpro.org
|
||||
*/
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
#ifndef _pirate_h_
|
||||
#define _pirate_h_
|
||||
//---------------------------------------------------------------------------------
|
||||
extern const unsigned char pirate[];
|
||||
extern const int pirate_size;
|
||||
//---------------------------------------------------------------------------------
|
||||
#endif //_pirate_h_
|
||||
//---------------------------------------------------------------------------------
|
||||
BIN
examples/nonameno01/source/gfx/pirate.png
Normal file
BIN
examples/nonameno01/source/gfx/pirate.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 122 KiB |
65
examples/nonameno01/source/main.c
Normal file
65
examples/nonameno01/source/main.c
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
/*===========================================
|
||||
GRRLIB (GX version) 3.0.5 alpha
|
||||
Code : NoNameNo
|
||||
Additional Code : Crayon
|
||||
GX hints : RedShade
|
||||
|
||||
Minimum Code To Use GRRLIB
|
||||
============================================*/
|
||||
#include "../../../GRRLIB/GRRLIB/GRRLIB.h"
|
||||
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
#include <wiiuse/wpad.h>
|
||||
|
||||
#include "gfx/pirate.h"
|
||||
|
||||
|
||||
Mtx GXmodelView2D;
|
||||
|
||||
int main() {
|
||||
u32 wpaddown;
|
||||
|
||||
Vector ln[4];
|
||||
Vector d[4];
|
||||
float xt,yt,zt;
|
||||
int i;
|
||||
float a=0.0,b=0.0;
|
||||
float c=2;
|
||||
Vector l[4]={{-0.8,-0.8,0},{0.8,-0.8,0},{0.8,0.8,0},{-0.8,0.8,0}};
|
||||
|
||||
GRRLIB_Init();
|
||||
WPAD_Init();
|
||||
GRRLIB_texImg tex_pirate = GRRLIB_LoadTexture(pirate);
|
||||
|
||||
while(1) {
|
||||
WPAD_ScanPads();
|
||||
wpaddown = WPAD_ButtonsDown(0);
|
||||
|
||||
a=a+0.04;
|
||||
b=b+0.02;
|
||||
for(i=0;i<4;i++){
|
||||
xt=l[i].x*cos(a)-l[i].z*sin(a);
|
||||
yt=l[i].y;
|
||||
zt=l[i].x*sin(a)+l[i].z*cos(a);
|
||||
ln[i].x=xt;
|
||||
ln[i].y=yt*cos(b)-zt*sin(b);
|
||||
ln[i].z=yt*sin(b)+zt*cos(b)+c;
|
||||
d[i].x=(640/2)+(480*ln[i].x)/(2*ln[i].z);
|
||||
d[i].y=(480/2)+(480*ln[i].y)/(2*ln[i].z);
|
||||
}
|
||||
|
||||
GRRLIB_FillScreen(0xFFFFFFFF);
|
||||
GRRLIB_DrawImgQuad(d, tex_pirate, 0xFFFFFFFF);
|
||||
|
||||
|
||||
|
||||
GRRLIB_Render();
|
||||
if(wpaddown & WPAD_BUTTON_HOME) {
|
||||
exit(0);
|
||||
}
|
||||
}
|
||||
GRRLIB_Exit(); // Be a good boy, clear the memory allocated by GRRLIB
|
||||
return 0;
|
||||
}
|
||||
Loading…
Reference in a new issue