Skip to content

Commit

Permalink
Scale emotes window.
Browse files Browse the repository at this point in the history
  • Loading branch information
@pjbroad
pjbroad committed Aug 5, 2017
1 parent acd2eb4 commit 59b3122
Show file tree
Hide file tree
Showing 2 changed files with 96 additions and 57 deletions.
144 changes: 91 additions & 53 deletions emotes.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,22 @@
#include "items.h"
#include "actors.h"
#include "colors.h"

#include "text.h"

#ifdef OPENGL_TRACE
#include "gl_init.h"
#endif

//TO ENABLE POSES, CHECK COMMENTS at lines 31,40,59

// TO ENABLE POSES, follow comments for EMOTES_CATEGORIES, emote_cats and emote_sel

#define EMOTES_SCROLLBAR_CATEGORIES 1000
#define EMOTES_SCROLLBAR_ITEMS 1001
//Set EMOTE_CATEGORIES to 5 for poses
#define EMOTES_CATEGORIES 1
#define EMOTES_CATEGORIES 1 //Set EMOTE_CATEGORIES to 5 for poses
#define EMOTES_SHOWN 9

#define EMOTE_SPAM_TIME 1000

#define SET_COLOR(x) glColor4f((float) colors_list[x].r1 / 255.0f,(float) colors_list[x].g1 / 255.0f,(float) colors_list[x].b1 / 255.0f,1.0f)

char *emote_cats[EMOTES_CATEGORIES]= {
static char *emote_cats[EMOTES_CATEGORIES]= {
"Actions"/*,
"Sit poses",
"Walk poses",
Expand All @@ -47,23 +43,29 @@ char *emote_cats[EMOTES_CATEGORIES]= {
int emotes_win= -1;
int emotes_menu_x=10;
int emotes_menu_y=20;
int emotes_menu_x_len=6*33+15;
int emotes_menu_y_len=290;
int emotes_rect_x=170;
int emotes_rect_y=80;
int emotes_rect_x2=150;
int emotes_rect_y2=120;
static int emotes_rect_x = 0;
static int emotes_rect_y = 0;
static int emotes_rect_x2 = 0;
static int emotes_rect_y2 = 0;

static int border_space = 0;
static int inbox_space = 0;
static int top_border = 0;
static int box_sep = 0;
static int category_y_step = 0;
static int help_width_in_char = 0;
static int EMOTES_SCROLLBAR_ITEMS = 1001;

int cur_cat=0;
emote_data* emote_sel[EMOTES_CATEGORIES]={NULL/*,NULL,NULL,NULL,NULL*/}; //remove the comment for poses
emote_data *selectables[EMOTES_SHOWN];
static int cur_cat=0;
static emote_data* emote_sel[EMOTES_CATEGORIES]={NULL/*,NULL,NULL,NULL,NULL*/}; //remove the comment for poses
static emote_data *selectables[EMOTES_SHOWN];

unsigned char emote_str1[100];
unsigned char emote_str2[100];
static unsigned char emote_str1[100];
static unsigned char emote_str2[100];


void send_emote(int emote_id){
void send_emote(int emote_id)
{
static int last_emote_time=0;
Uint8 str[4];

Expand All @@ -78,14 +80,14 @@ void send_emote(int emote_id){

}

int do_handler(){
static int do_handler(void)
{
if(emote_sel[cur_cat]) send_emote(emote_sel[cur_cat]->id);
return 0;
}



void update_selectables(){
static void update_selectables(void)
{
int pos,i;
hash_entry *he;

Expand Down Expand Up @@ -116,8 +118,8 @@ void update_selectables(){
if(emote_sel[cur_cat]){
emote_dict *emd;

emote_str1[0]=127+c_orange2;
safe_strcat((char*)emote_str1,(char*)emote_sel[cur_cat]->desc,/*sizeof(emote_str1)*/23);
put_small_colored_text_in_box(c_orange2, (const unsigned char*)emote_sel[cur_cat]->desc,
strlen(emote_sel[cur_cat]->desc), help_width_in_char * SMALL_FONT_X_LEN, (char*)emote_str1);
hash_start_iterator(emote_cmds);
while((he=hash_get_next(emote_cmds))){
emd = (emote_dict*)he->item;
Expand All @@ -132,22 +134,21 @@ void update_selectables(){
emote_str2[ll]=127+c_green3;
emote_str2[ll+1]=emote_str2[ll+2]=' ';
emote_str2[ll+3]=0;
safe_strcat((char*)emote_str2,emd->command,/*sizeof(emote_str2)*/23);
safe_strcat((char*)emote_str2,emd->command,help_width_in_char+2);
break; //just one command
}
}
}

}

int display_emotes_handler(window_info *win){
static int display_emotes_handler(window_info *win)
{

int i,pos;
actor *act = get_actor_ptr_from_id(yourself);
static int last_pos=0;



//check if vbar has been moved
pos=vscrollbar_get_pos(emotes_win, EMOTES_SCROLLBAR_ITEMS);
if(pos!=last_pos){
Expand All @@ -159,35 +160,35 @@ int display_emotes_handler(window_info *win){
glEnable(GL_TEXTURE_2D);

SET_COLOR(c_orange1);
draw_string_small(20, 15, (unsigned char*)"Categories",1);
draw_string_small(20, emotes_rect_y+30+5, (unsigned char*)"Emotes",1);
scaled_draw_string_small(border_space, top_border - win->small_font_len_y, (unsigned char*)"Categories",1);
scaled_draw_string_small(border_space, top_border + emotes_rect_y + box_sep - win->small_font_len_y, (unsigned char*)"Emotes",1);

for(i=0;i<EMOTES_CATEGORIES;i++){
if(cur_cat==i) SET_COLOR(c_blue2);
else glColor3f(1.0f, 1.0f, 1.0f);
draw_string_small(23, 32+13*i, (unsigned char*)emote_cats[i],1);
scaled_draw_string_small(border_space + inbox_space, top_border + inbox_space + category_y_step * i, (unsigned char*)emote_cats[i],1);
}

for(i=0;i<EMOTES_SHOWN;i++){
if(emote_sel[cur_cat]==selectables[i]) SET_COLOR(c_blue2);
else glColor3f(1.0f, 1.0f, 1.0f);
if(cur_cat&&act&&selectables[i]==act->poses[cur_cat-1]) SET_COLOR(c_green1);
if(selectables[i])
draw_string_small(23, 30+emotes_rect_y+20+1+13*i, (unsigned char*)selectables[i]->name,1);
scaled_draw_string_small(border_space + inbox_space, top_border + emotes_rect_y + box_sep + inbox_space + category_y_step * i, (unsigned char*)selectables[i]->name,1);
}
glColor3f(0.77f, 0.57f, 0.39f);
//do grids
glDisable(GL_TEXTURE_2D);

rendergrid(1, 1, 20, 30, emotes_rect_x, emotes_rect_y);
rendergrid(1, 1, 20, 30+emotes_rect_y+20, emotes_rect_x2, emotes_rect_y2);
rendergrid(1, 1, border_space, top_border, emotes_rect_x, emotes_rect_y);
rendergrid(1, 1, border_space, top_border + emotes_rect_y + box_sep, emotes_rect_x2, emotes_rect_y2);
glEnable(GL_TEXTURE_2D);


//draw description
if(emote_sel[cur_cat]){
draw_string_small(20, emotes_menu_y_len-36, emote_str1,2);
draw_string_small(20, emotes_menu_y_len-36+16, emote_str2,1);
scaled_draw_string_small(border_space, win->len_y - border_space - (3 * win->small_font_len_y), emote_str1,2);
scaled_draw_string_small(border_space, win->len_y - border_space - (1 * win->small_font_len_y), emote_str2,1);
}

#ifdef OPENGL_TRACE
Expand All @@ -196,20 +197,24 @@ CHECK_GL_ERRORS();
return 1;
}


int click_emotes_handler(window_info *win, int mx, int my, Uint32 flags){
static int click_emotes_handler(window_info *win, int mx, int my, Uint32 flags)
{
static int last_clicked=0;
static int last_pos=-1;
int box_left = border_space;
int box_right = box_left + emotes_rect_x2;
int box_top = top_border + emotes_rect_y + box_sep;
int box_bot = box_top + emotes_rect_y2;

//scroll if wheel on selectables
if(flags&ELW_WHEEL_UP) {
if(mx>20&&mx<20+emotes_rect_x2&&my>30+emotes_rect_y+20&&my<30+emotes_rect_y+20+emotes_rect_y2)
if(mx > box_left && mx < box_right && my > box_top && my < box_bot)
vscrollbar_scroll_up(emotes_win, EMOTES_SCROLLBAR_ITEMS);
update_selectables();
last_pos=-1;
return 0;
} else if(flags&ELW_WHEEL_DOWN) {
if(mx>20&&mx<20+emotes_rect_x2&&my>30+emotes_rect_y+20&&my<30+emotes_rect_y+20+emotes_rect_y2)
if(mx > box_left && mx < box_right && my > box_top && my < box_bot)
vscrollbar_scroll_down(emotes_win, EMOTES_SCROLLBAR_ITEMS);
update_selectables();
last_pos=-1;
Expand All @@ -220,16 +225,16 @@ int click_emotes_handler(window_info *win, int mx, int my, Uint32 flags){
}


if(mx>20&&mx<20+emotes_rect_x&&my>30&&my<30+emotes_rect_y){
if(mx > border_space && mx < border_space + emotes_rect_x && my > top_border && my < top_border + emotes_rect_y){
//click on a cat
cur_cat=(my-30)/13;
cur_cat=(my - top_border) / category_y_step;
if(cur_cat>=EMOTES_CATEGORIES) cur_cat=0;
if(cur_cat>EMOTE_STANDING) cur_cat=EMOTE_STANDING+1;
update_selectables();
last_pos=-1;
} else if(mx>20&&mx<20+emotes_rect_x2&&my>30+20+emotes_rect_y&&my<30+emotes_rect_y+20+emotes_rect_y2) {
} else if(mx > box_left && mx < box_right && my > box_top && my < box_bot) {
//click on selectables
int w=(my-30-emotes_rect_y-20)/13;
int w=(my - top_border - emotes_rect_y - box_sep)/ category_y_step;
emote_sel[cur_cat]=selectables[(w>=EMOTES_SHOWN)?(EMOTES_SHOWN-1):(w)];
update_selectables();
if ( ((SDL_GetTicks() - last_clicked) < 300)&&last_pos==w) do_handler();
Expand All @@ -240,25 +245,58 @@ int click_emotes_handler(window_info *win, int mx, int my, Uint32 flags){
return 0;
}

int ui_scale_emotes_handler(window_info *win)
{
int box_width = win->small_font_len_x * 20;

inbox_space = (int)(0.5 + win->current_scale * 2);
border_space = (int)(0.5 + win->current_scale * 5);
top_border = border_space + win->small_font_len_y;
box_sep = 2 * border_space + win->small_font_len_y;
category_y_step = win->small_font_len_y;

emotes_rect_x = 2 * inbox_space + box_width;
emotes_rect_y = 2 * inbox_space + category_y_step * EMOTES_CATEGORIES;
emotes_rect_x2 = 2 * inbox_space + box_width;
emotes_rect_y2 = 2 * inbox_space + category_y_step * EMOTES_SHOWN;
help_width_in_char = (int)(0.5 + (float)(emotes_rect_x2 + win->box_size) / win->small_font_len_x);
printf("%d\n", help_width_in_char);

resize_window(win->window_id, emotes_rect_x2 + win->box_size + 2 * border_space,
top_border + emotes_rect_y + box_sep + emotes_rect_y2 + 3 * win->small_font_len_y + 2 * border_space);

void display_emotes_menu()
widget_resize(win->window_id, EMOTES_SCROLLBAR_ITEMS, win->box_size, emotes_rect_y2);
widget_move(win->window_id, EMOTES_SCROLLBAR_ITEMS, emotes_rect_x2 + border_space, emotes_rect_y + top_border + box_sep);

return 0;
}

void display_emotes_menu(void)
{
if(emotes_win < 0){
//static int do_button_id=100;
int our_root_win = -1;

int num_emotes;
hash_entry *he;

if (!windows_on_top) {
our_root_win = game_root_win;
}
emotes_win= create_window("Emotes", our_root_win, 0, emotes_menu_x, emotes_menu_y, emotes_menu_x_len, emotes_menu_y_len, ELW_WIN_DEFAULT);
emotes_win= create_window("Emotes", our_root_win, 0, emotes_menu_x, emotes_menu_y, 0, 0, ELW_USE_UISCALE|ELW_WIN_DEFAULT);
set_window_handler(emotes_win, ELW_HANDLER_DISPLAY, &display_emotes_handler );
set_window_handler(emotes_win, ELW_HANDLER_CLICK, &click_emotes_handler );
vscrollbar_add_extended(emotes_win, EMOTES_SCROLLBAR_ITEMS, NULL, emotes_rect_x2+20, 30+emotes_rect_y+20, 20, emotes_rect_y2, 0, 1.0, 0.77f, 0.57f, 0.39f, 0, 1, 20);
set_window_handler(emotes_win, ELW_HANDLER_UI_SCALE, &ui_scale_emotes_handler );

num_emotes = 0;
hash_start_iterator(emotes);
while((he=hash_get_next(emotes)))
num_emotes++;

EMOTES_SCROLLBAR_ITEMS = vscrollbar_add_extended(emotes_win, EMOTES_SCROLLBAR_ITEMS, NULL,
0, 0, 0, 0, 0, 1.0, 0.77f, 0.57f, 0.39f, 0, 1, num_emotes-EMOTES_SHOWN);

if (emotes_win >=0 && emotes_win < windows_list.num_windows)
ui_scale_emotes_handler(&windows_list.window[emotes_win]);

//do_button_id=button_add_extended(emotes_win, do_button_id, NULL, 33*9+18+10, emotes_menu_y_len-36, 70, 0, 0, 1.0f, 0.77f, 0.57f, 0.39f, "Do!");
//widget_set_OnClick(emotes_win, do_button_id, do_handler);
update_selectables();

} else {
Expand Down
9 changes: 5 additions & 4 deletions emotes.h
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@

#ifndef __EMOTES_H__
#define __EMOTES_H__

extern int emotes_menu_x;
extern int emotes_menu_y;
extern int emotes_win;

void display_emotes_menu();


void display_emotes_menu(void);
void send_emote(int emote_id);

#endif

0 comments on commit 59b3122

Please sign in to comment.