shaun_chaky/eastern-flames
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

uh oh

Browse source
This commit is contained in:
the me 2022-08-18 18:06:30 -07:00
commit f52e476acf
15 changed files with 259 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

24
eastern flames/objects/ARTICULATOR/Create_0.gml
View file

@ -23,8 +23,12 @@ function getProj(){
function getView(){
var _x = global.camerax;
var _y = global.cameray;
<<<<<<< HEAD
var half = (7.5*32)+40;
return matrix_build_lookat(_x,_y+180,150,_x,_y,0,0,0,-1);
=======
return matrix_build_lookat(_x,_y+100,100,_x,_y,0,0,0,-1);
>>>>>>> a9003c47cacfdee8c6ba2588fdb26b55ad87617b
}
function setCam(){
@ -33,4 +37,22 @@ function setCam(){
camera_set_view_mat(cam,getView())
camera_apply(cam);
}
global.turn = ARMY.US;
<<<<<<< HEAD
global.turn = ARMY.US;
=======
function drawModels(){
gpu_set_cullmode(cull_counterclockwise);
gpu_set_ztestenable(true);
for(var i = 0; i < array_length(models);i++){
models[i].draw();
}
gpu_set_cullmode(cull_noculling);
gpu_set_ztestenable(false);
}
models = [];
var spr = sprite_add("./shrine thing tex.png",0,false,false,0,0);
nu Model("./shrine thing.dat",spr);
>>>>>>> a9003c47cacfdee8c6ba2588fdb26b55ad87617b

4
eastern flames/objects/ARTICULATOR/Draw_72.gml
View file

@ -44,4 +44,6 @@ for (i=0; i<array_length(global.map); i++) {
//matrix_get(matrix_
var a = c_2dto3d(mouse_x,mouse_y);
draw_circle(a.x,a.y,2,false);
draw_circle(a.x,a.y,2,false);
drawModels();