Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed STL usage of Extras/ConvexBuilder and replaced by btAlignedObjectArray

Browse Source 
fixed several warnings, thanks to sparkprime
added comments patch for linear math, thanks to Tully Foote
This commit is contained in:
erwin.coumans
2008-10-28 18:52:46 +00:00
parent c5112e68e5
commit 28e580c203
39 changed files with 435 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Extras/glui/glui_textbox.cpp
View File

@@ -344,7 +344,7 @@ void GLUI_TextBox::activate( int how )
orig_text = text;
sel_start = 0;
sel_end = text.length();
sel_end = int(text.length());
insertion_pt = 0;
if ( debug )
dump( stdout, "<- ACTIVATE" );
@@ -438,7 +438,7 @@ void GLUI_TextBox::draw( int x, int y )
/* Begin Drawing Lines of Text */
substring_start = 0;
substring_end = 0;
text_length = text.length()-1;
text_length = int(text.length())-1;
/* Figure out how wide the box is */
box_width = get_box_width();
@@ -496,7 +496,7 @@ void GLUI_TextBox::draw( int x, int y )
int GLUI_TextBox::update_substring_bounds( void )
{
int box_width;
int text_len = text.length();
int text_len = int(text.length());
int old_start, old_end;
old_start = substring_start;
@@ -676,7 +676,7 @@ int GLUI_TextBox::find_insertion_pt( int x, int y )
insert_x = x;
insert_y = y;
int text_length = text.length()-1;
int text_length = int(text.length())-1;
int box_width = get_box_width();
int sol = 0;
@@ -789,7 +789,7 @@ void GLUI_TextBox::draw_insertion_pt( void )
sol = 0;
eol = 0;
text_length = text.length()-1;
text_length = int(text.length())-1;
//while (eol < text_length && text[eol] != '\n'
// && substring_width(sol, eol + 1) < box_width )
@@ -947,7 +947,7 @@ int GLUI_TextBox::special_handler( int key,int modifiers )
// update keygoal_x!
}
else if ( key == GLUT_KEY_END ) {
insertion_pt = text.length();
insertion_pt = int(text.length());
// update keygoal_x!
}
@@ -984,7 +984,7 @@ int GLUI_TextBox::find_word_break( int start, int direction )
{
int i, j;
char breaks[] = " \n\t:-.,";
int num_break_chars = (int)strlen(breaks), text_len = text.length();
int num_break_chars = (int)strlen(breaks), text_len = int(text.length());
int new_pt;
/** If we're moving left, we have to start two back, in case we're either
@@ -1046,7 +1046,7 @@ void GLUI_TextBox::set_text( const char *new_text )
text = new_text;
substring_start = 0;
substring_end = text.length() - 1;
substring_end = int(text.length()) - 1;
insertion_pt = -1;
sel_start = 0;
sel_end = 0;