Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5158 in orxonox.OLD


Ignore:
Timestamp:
Sep 4, 2005, 10:20:59 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: better drawing of the Shell

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/configure

    r5066 r5158  
    55185518
    55195519CPPFLAGS="-I/usr/X11R6/include -I/usr/include"
    5520 LDFLAGS="-L/usr/lib/opengl/xorg-x11/lib -L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS"
     5520##LDFLAGS="-L/usr/lib/opengl/xorg-x11/lib -L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS"
    55215521# checking gl header
    55225522

  • trunk/configure.ac

    r5066 r5158  
    347347
    348348CPPFLAGS="-I/usr/X11R6/include -I/usr/include"
    349 LDFLAGS="-L/usr/lib/opengl/xorg-x11/lib -L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS"
     349##LDFLAGS="-L/usr/lib/opengl/xorg-x11/lib -L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS"
    350350# checking gl header
    351351   AC_CHECK_HEADERS([GL/gl.h] ,,

  • trunk/orxonox.kdevelop

    r5100 r5158  
    1010    <projectdirectory>.</projectdirectory>
    1111    <absoluteprojectpath>false</absoluteprojectpath>
    12     <description/>
     12    <description></description>
    1313    <secondaryLanguages>
    1414      <language>C</language>
    1515    </secondaryLanguages>
    16     <versioncontrol/>
     16    <versioncontrol>kdevsubversion</versioncontrol>
    1717  </general>
    1818  <kdevcustomproject>
    … …  
    2121      <directoryradio>build</directoryradio>
    2222      <customdirectory>/</customdirectory>
    23       <programargs/>
     23      <programargs></programargs>
    2424      <terminal>false</terminal>
    2525      <autocompile>true</autocompile>
    … …  
    2828    <build>
    2929      <buildtool>make</buildtool>
    30       <builddir/>
     30      <builddir></builddir>
    3131    </build>
    3232    <make>
    … …  
    3535      <prio>0</prio>
    3636      <dontact>false</dontact>
    37       <makebin/>
    38       <makeoptions/>
     37      <makebin></makebin>
     38      <makeoptions></makeoptions>
    3939      <selectedenvironment>default</selectedenvironment>
    4040      <environments>
    4141        <default/>
    4242      </environments>
    43       <defaulttarget/>
     43      <defaulttarget></defaulttarget>
    4444    </make>
    4545  </kdevcustomproject>
    4646  <kdevdebugger>
    4747    <general>
    48       <dbgshell/>
    49       <programargs/>
    50       <gdbpath/>
    51       <configGdbScript/>
    52       <runShellScript/>
    53       <runGdbScript/>
     48      <dbgshell></dbgshell>
     49      <programargs></programargs>
     50      <gdbpath></gdbpath>
     51      <configGdbScript></configGdbScript>
     52      <runShellScript></runShellScript>
     53      <runGdbScript></runGdbScript>
    5454      <breakonloadinglibs>true</breakonloadinglibs>
    5555      <separatetty>false</separatetty>
    … …  
    131131    </codecompletion>
    132132    <creategettersetter>
    133       <prefixGet/>
     133      <prefixGet></prefixGet>
    134134      <prefixSet>set</prefixSet>
    135135      <prefixVariable>m_,_</prefixVariable>
    … …  
    140140  </kdevcppsupport>
    141141  <kdevfileview>
    142     <groups>
    143       <hidenonprojectfiles>false</hidenonprojectfiles>
    144       <hidenonlocation>false</hidenonlocation>
    145     </groups>
     142    <groups/>
    146143    <tree>
    147144      <hidepatterns>*.o,*.lo,*~,*in</hidepatterns>
    … …  
    157154  <kdevdocumentation>
    158155    <projectdoc>
    159       <docsystem/>
    160       <docurl/>
    161       <usermanualurl/>
     156      <docsystem></docsystem>
     157      <docurl></docurl>
     158      <usermanualurl></usermanualurl>
    162159    </projectdoc>
    163160  </kdevdocumentation>
    164161  <ctagspart>
    165     <customArguments/>
    166     <customTagfilePath/>
     162    <customArguments></customArguments>
     163    <customTagfilePath></customTagfilePath>
    167164  </ctagspart>
    168165</kdevelop>

  • trunk/src/orxonox.cc

    r5098 r5158  
    2121   ### File Specific:
    2222   main-programmer: Patrick Boenzli
    23    co-programmer: Christian Meyer
     23co-programmer: Christian Meyer
    2424   co-programmer: Benjamin Grauer: injected ResourceManager/GraphicsEngine/GUI
    2525*/
    … …  
    3131#include "world.h"
    3232#include "ini_parser.h"
    33 #include "game_loader.h"
     33#include "game_loader.h"               
    3434
    3535//ENGINES

  • trunk/src/util/shell.cc

    r5157 r5158  
    5656  //this->bufferSize = 0;
    5757  this->bufferText = NULL;
    58   this->setBufferSize(100);
     58  this->setBufferSize(10);
    5959  this->bufferDisplaySize = 10;
    6060  this->setAbsCoor2D(3, -400);
    … …  
    184184    this->bufferText[i]->setText(this->bufferIterator->prevElement(), false);
    185185}
     186
    186187
    187188/**
    … …  
    632633  glBlendFunc(GL_SRC_ALPHA, GL_ONE);
    633634
    634 //  glBindTexture(GL_TEXTURE_2D, this->texture);
    635   glBegin(GL_QUADS);
    636 
    637 //  glTexCoord2f(this->texCoord.minU, this->texCoord.minV);
     635  glBindTexture(GL_TEXTURE_2D, 0);
     636  glBegin(GL_TRIANGLE_STRIP);
     637
     638  glTexCoord2f(0, 0);
    638639  glVertex2f(this->getAbsCoor2D().x,   this->getAbsCoor2D().y  );
    639640
    640 //  glTexCoord2f(this->texCoord.maxU, this->texCoord.minV);
     641  glTexCoord2f(1, 0);
    641642  glVertex2f(GraphicsEngine::getInstance()->getResolutionX() - this->getAbsCoor2D().x, this->getAbsCoor2D().y  );
    642643
    643 //  glTexCoord2f(this->texCoord.maxU, this->texCoord.maxV);
     644  glTexCoord2f(0, 1);
     645  glVertex2f(this->getAbsCoor2D().x, this->getAbsCoor2D().y + this->shellHeight);
     646
     647  glTexCoord2f(1, 1);
    644648  glVertex2f(GraphicsEngine::getInstance()->getResolutionX() - this->getAbsCoor2D().x, this->getAbsCoor2D().y + this->shellHeight);
    645 
    646 //  glTexCoord2f(this->texCoord.minU, this->texCoord.maxV);
    647   glVertex2f(this->getAbsCoor2D().x, this->getAbsCoor2D().y + this->shellHeight);
    648649
    649650  glEnd();
Note: See TracChangeset for help on using the changeset viewer.