Changeset 1808


Ignore:
Timestamp:
Aug 24, 2012, 12:51:51 PM (8 years ago)
Author:
sam
Message:

build: fix shitloads of warnings.

Location:
trunk/src
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/bullet/LinearMath/btConvexHull.cpp

    r1570 r1808  
    276276                                for(btScalar xx = x-btScalar(40.0) ; xx <= x ; xx+= btScalar(5.0))
    277277                                {
    278                                         btScalar s = btSin(SIMD_RADS_PER_DEG*(xx));
    279                                         btScalar c = btCos(SIMD_RADS_PER_DEG*(xx));
    280                                         int md = maxdirfiltered(p,count,dir+(u*s+v*c)*btScalar(0.025),allow);
     278// LOL BEGIN
     279                                        btScalar ss = btSin(SIMD_RADS_PER_DEG*(xx));
     280                                        btScalar cc = btCos(SIMD_RADS_PER_DEG*(xx));
     281                                        int md = maxdirfiltered(p,count,dir+(u*ss+v*cc)*btScalar(0.025),allow);
     282// LOL END
    281283                                        if(mc==m && md==m)
    282284                                        {
     
    310312
    311313
    312 int above(btVector3* vertices,const int3& t, const btVector3 &p, btScalar epsilon);
    313 int above(btVector3* vertices,const int3& t, const btVector3 &p, btScalar epsilon)
     314// LOL BEGIN
     315int above(btVector3 const* vertices,const int3& t, const btVector3 &p, btScalar epsilon);
     316int above(btVector3 const* vertices,const int3& t, const btVector3 &p, btScalar epsilon)
     317// LOL END
    314318{
    315319        btVector3 n=TriNormal(vertices[t[0]],vertices[t[1]],vertices[t[2]]);
     
    487491
    488492
    489 int4 HullLibrary::FindSimplex(btVector3 *verts,int verts_count,btAlignedObjectArray<int> &allow)
     493// LOL BEGIN
     494int4 HullLibrary::FindSimplex(btVector3 const *verts,int verts_count,btAlignedObjectArray<int> &allow)
     495// LOL END
    490496{
    491497        btVector3 basis[3];
     
    523529}
    524530
    525 int HullLibrary::calchullgen(btVector3 *verts,int verts_count, int vlimit)
     531// LOL BEGIN
     532int HullLibrary::calchullgen(btVector3 const *verts,int verts_count, int vlimit)
     533// LOL END
    526534{
    527535        if(verts_count <4) return 0;
     
    571579        while(vlimit >0 && ((te=extrudable(epsilon)) != 0))
    572580        {
    573                 int3 ti=*te;
     581// LOL BEGIN
     582                //int3 ti=*te;
     583// LOL END
    574584                int v=te->vmax;
    575585                btAssert(v != -1);
     
    623633}
    624634
    625 int HullLibrary::calchull(btVector3 *verts,int verts_count, TUIntArray& tris_out, int &tris_count,int vlimit)
     635// LOL BEGIN
     636int HullLibrary::calchull(btVector3 const *verts,int verts_count, TUIntArray& tris_out, int &tris_count,int vlimit)
     637// LOL END
    626638{
    627639        int rc=calchullgen(verts,verts_count,  vlimit) ;
     
    659671       
    660672        int    tris_count;
    661         int ret = calchull( (btVector3 *) vertices, (int) vcount, result.m_Indices, tris_count, static_cast<int>(vlimit) );
     673// LOL BEGIN
     674        int ret = calchull( vertices, (int) vcount, result.m_Indices, tris_count, static_cast<int>(vlimit) );
     675// LOL END
    662676        if(!ret) return false;
    663677        result.mIndexCount = (unsigned int) (tris_count*3);
  • trunk/src/bullet/LinearMath/btConvexHull.h

    r1570 r1808  
    210210        btHullTriangle* extrudable(btScalar epsilon);
    211211
    212         int calchull(btVector3 *verts,int verts_count, TUIntArray& tris_out, int &tris_count,int vlimit);
    213 
    214         int calchullgen(btVector3 *verts,int verts_count, int vlimit);
    215 
    216         int4 FindSimplex(btVector3 *verts,int verts_count,btAlignedObjectArray<int> &allow);
     212// LOL BEGIN
     213        int calchull(btVector3 const *verts,int verts_count, TUIntArray& tris_out, int &tris_count,int vlimit);
     214
     215        int calchullgen(btVector3 const *verts,int verts_count, int vlimit);
     216
     217        int4 FindSimplex(btVector3 const *verts,int verts_count,btAlignedObjectArray<int> &allow);
     218// LOL END
    217219
    218220        class ConvexH* ConvexHCrop(ConvexH& convex,const btPlane& slice);
  • trunk/src/bullet/LinearMath/btQuickprof.cpp

    r1570 r1808  
    527527                float fraction = parent_time > SIMD_EPSILON ? (current_total_time / parent_time) * 100 : 0.f;
    528528                {
    529                         int i;  for (i=0;i<spacing;i++) printf(".");
     529// LOL BEGIN
     530                        int j;  for (j=0;j<spacing;j++) printf(".");
     531// LOL END
    530532                }
    531533                printf("%d -- %s (%.2f %%) :: %.3f ms / frame (%d calls)\n",i, profileIterator->Get_Current_Name(), fraction,(current_total_time / (double)frames_since_reset),profileIterator->Get_Current_Total_Calls());
  • trunk/src/easymesh/easymesh-scanner.l

    r1738 r1808  
    128128int lol::EasyMeshScanner::LexerInput(char* buf, int max_size)
    129129{
     130    (void)max_size; /* unused for now */
     131
    130132    buf[0] = m_input[0];
    131133    if (buf[0])
  • trunk/src/eglapp.cpp

    r1709 r1808  
    264264void EglApp::ShowPointer(bool show)
    265265{
    266     ;
     266    /* FIXME: unimplemented (do we have a mouse pointer anyway? */
     267    (void)show;
    267268}
    268269
  • trunk/src/generated/easymesh-scanner.cpp

    r1738 r1808  
    18451845int lol::EasyMeshScanner::LexerInput(char* buf, int max_size)
    18461846{
     1847    (void)max_size; /* unused for now */
     1848
    18471849    buf[0] = m_input[0];
    18481850    if (buf[0])
  • trunk/src/platform/sdl/sdlinput.cpp

    r1712 r1808  
    197197        if (keystate[i])
    198198            Input::KeyPressed(i, seconds);
     199#else
     200    (void)seconds;
    199201#endif
    200202#endif
  • trunk/src/tileset.cpp

    r1513 r1808  
    231231ivec2 TileSet::GetSize(int tileid) const
    232232{
     233    (void)tileid;
     234
    233235    return data->size;
    234236}
Note: See TracChangeset for help on using the changeset viewer.