Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Try to scale and center objects inside the 3d object browser of the map editor #173

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Try to scale and center objects inside the 3d object browser of the map editor #173

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
396acef
Try to scale and center objects inside the 3d object browser
brunoramoslu Jan 15, 2022
d470d56
Clean up code a bit and change do not change 3d_objects code
brunoramoslu Jan 15, 2022
9414cfc
Clean up code a bit and change do not change 3d_objects code
brunoramoslu Jan 15, 2022
994835c
Fix pos_x_increment
brunoramoslu Jan 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 54 additions & 80 deletions map_editor/browser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,54 @@ void display_browser()
display_window(browser_win);
}


void draw_browser_item(window_info *win, int index)
{
int i=cp,valid_object=0;
char fn[80];
float scale;
int pos_x_increment;
int pos_y_increment;

if(i+index<Dir[cd].nf) {

if (index % 2 == 0) {
pos_x_increment = 0;
} else {
pos_x_increment = 200;
}

pos_y_increment = ((int) index / 2) * 180 + 180;

glViewport(win->pos_x + pos_x_increment, window_height - win->pos_y - pos_y_increment, 200, 180);
glClearStencil(0);
glClear(GL_DEPTH_BUFFER_BIT);
#ifdef LINUX
safe_strncpy(fn, exec_path, sizeof(fn));
#else
//Fedora: don't ask me why, if you use exec_path, e3d files are not found
safe_strncpy(fn, "."/*exec_path*/, sizeof(fn));
#endif
safe_strcat(fn, Dir[cd].Files[i + index], sizeof(fn));
valid_object = setobject(index, fn, Dir[cd].xrot[i + index], Dir[cd].yrot[i + index], Dir[cd].zrot[i + index]);
if (valid_object) {
glPushMatrix();
fprintf(stderr, "zoom_level: %f\n", zoom_level);
fprintf(stderr, "max_size: %f\n", o3d[index].e3d_data->max_size);
scale = zoom_level / o3d[index].e3d_data->max_size;
fprintf(stderr, "scale: %f\n", scale);
o3d[index].x_pos -= zoom_level / scale + 1 / scale;
o3d[index].y_pos -= zoom_level / scale + 1 / scale;
fprintf(stderr, "x_pos: %f\n", o3d[index].x_pos);
fprintf(stderr, "y_pos: %f\n", o3d[index].y_pos);
glScalef(scale, scale, scale);
//glScalef(Dir[cd].size[i],Dir[cd].size[i],Dir[cd].size[i]);
draw_3d_object(&o3d[index]);
glPopMatrix();
}
}
}

int display_browser_handler(window_info *win)
{
//title bar
Expand Down Expand Up @@ -216,10 +264,9 @@ int display_browser_handler(window_info *win)
}
}
}else{ // display specified dir
int i=cp,valid_object=0;
int i=cp;
float tz=zoom_level;
char fn[80];


// Prepare to render
Leave2DMode();
glEnable(GL_CULL_FACE);
Expand All @@ -243,83 +290,10 @@ int display_browser_handler(window_info *win)

glColor4f(1.0, 1.0, 1.0, 1.0);

glViewport(win->pos_x,window_height-win->pos_y-150,200,150);
glClearStencil(0);
glClear (GL_DEPTH_BUFFER_BIT);
#ifdef LINUX
safe_strncpy(fn, exec_path, sizeof(fn));
#else
//Fedora: don't ask me why, if you use exec_path, e3d files are not found
safe_strncpy(fn, "."/*exec_path*/, sizeof(fn));
#endif
safe_strcat(fn, Dir[cd].Files[i], sizeof(fn));
valid_object=setobject(0,fn,Dir[cd].xrot[i],Dir[cd].yrot[i],Dir[cd].zrot[i]);
if(valid_object){
glPushMatrix();
glScalef(Dir[cd].size[i],Dir[cd].size[i],Dir[cd].size[i]);
draw_3d_object(&o3d[0]);
glPopMatrix();
}

if(i+1<Dir[cd].nf){
glViewport(win->pos_x+200,window_height-win->pos_y-150,200,150);
glClearStencil(0);
glClear (GL_DEPTH_BUFFER_BIT);
#ifdef LINUX
safe_strncpy(fn, exec_path, sizeof(fn));
#else
//Fedora: don't ask me why, if you use exec_path, e3d files are not found
safe_strncpy(fn, "."/*exec_path*/, sizeof(fn));
#endif
safe_strcat(fn, Dir[cd].Files[i+1], sizeof(fn));
valid_object=setobject(1,fn,Dir[cd].xrot[i+1],Dir[cd].yrot[i+1],Dir[cd].zrot[i+1]);
if(valid_object){
glPushMatrix();
glScalef(Dir[cd].size[i+1],Dir[cd].size[i+1],Dir[cd].size[i+1]);
draw_3d_object(&o3d[1]);
glPopMatrix();
}
}

if(i+2<Dir[cd].nf){
glViewport(win->pos_x,window_height-win->pos_y-350,200,150);
glClearStencil(0);
glClear (GL_DEPTH_BUFFER_BIT);
#ifdef LINUX
safe_strncpy(fn, exec_path, sizeof(fn));
#else
//Fedora: don't ask me why, if you use exec_path, e3d files are not found
safe_strncpy(fn, "."/*exec_path*/, sizeof(fn));
#endif
safe_strcat(fn, Dir[cd].Files[i+2], sizeof(fn));
valid_object=setobject(2,fn,Dir[cd].xrot[i+2],Dir[cd].yrot[i+2],Dir[cd].zrot[i+2]);
if(valid_object){
glPushMatrix();
glScalef(Dir[cd].size[i+2],Dir[cd].size[i+2],Dir[cd].size[i+2]);
draw_3d_object(&o3d[2]);
glPopMatrix();
}
}

if(i+3<Dir[cd].nf){
glViewport(win->pos_x+200,window_height-win->pos_y-350,200,150);
glClearStencil(0);
glClear (GL_DEPTH_BUFFER_BIT);
#ifdef LINUX
safe_strncpy(fn, exec_path, sizeof(fn));
#else
//Fedora: don't ask me why, if you use exec_path, e3d files are not found
safe_strncpy(fn, "."/*exec_path*/, sizeof(fn));
#endif
safe_strcat(fn, Dir[cd].Files[i+3], sizeof(fn));
valid_object=setobject(3,fn,Dir[cd].xrot[i+3],Dir[cd].yrot[i+3],Dir[cd].zrot[i+3]);
if(valid_object){
glPushMatrix();
glScalef(Dir[cd].size[i+3],Dir[cd].size[i+3],Dir[cd].size[i+3]);
draw_3d_object(&o3d[3]);
glPopMatrix();
}
}
draw_browser_item(win,0);
draw_browser_item(win,1);
draw_browser_item(win,2);
draw_browser_item(win,3);

zoom_level=tz;
window_resize();
Expand Down