some kinda merge
This commit is contained in:
commit
f53d693a0c
14 changed files with 17 additions and 12 deletions
|
@ -17,6 +17,7 @@ global.gh = 360;
|
|||
global.camerax = 0;
|
||||
global.cameray = 0;
|
||||
state = st_control;
|
||||
cursor = new vec2(0, 0);
|
||||
//these are functions bc c_2dto3d uses them
|
||||
function getProj(){
|
||||
return matrix_build_projection_perspective_fov(60,-16/9,1,4000)
|
||||
|
@ -37,11 +38,14 @@ function setCam(){
|
|||
global.turn = ARMY.US;
|
||||
|
||||
function drawModels(){
|
||||
gpu_set_cullmode(cull_counterclockwise);
|
||||
//gpu_set_cullmode(cull_counterclockwise);
|
||||
gpu_set_ztestenable(true);
|
||||
gpu_set_alphatestenable(true);
|
||||
gpu_set_alphatestref(128);
|
||||
for(var i = 0; i < array_length(models);i++){
|
||||
models[i].draw();
|
||||
}
|
||||
gpu_set_alphatestenable(false);
|
||||
gpu_set_cullmode(cull_noculling);
|
||||
gpu_set_ztestenable(false);
|
||||
}
|
||||
|
@ -49,7 +53,8 @@ function drawModels(){
|
|||
models = [];
|
||||
|
||||
//var spr = sprite_add("./shrine thing tex.png",0,false,false,0,0);
|
||||
var spr = sprite_add("./Map 1/MapAtlas.png",0,false,false,0,0);
|
||||
nu Model("./Map 1/Map 1.dat",spr);
|
||||
|
||||
textbox_create(txt_test);
|
||||
textbox_create(txt_test);
|
||||
var spr = sprite_add("./map1/mapatlas.png",0,false,false,0,0);
|
||||
nu Model("./map1/map1.dat", spr, u, 200, 140, u, .65, u, u, u,);
|
||||
setCam();
|
Loading…
Add table
Add a link
Reference in a new issue