Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9406 in orxonox.OLD for trunk/src/world_entities/environments


Ignore:
Timestamp:
Jul 24, 2006, 11:09:47 AM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

Location:
trunk/src/world_entities/environments
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/environments/building.cc

    r7193 r9406  
    2121#include "util/loading/factory.h"
    2222
    23 using namespace std;
     23
    2424
    2525
  • trunk/src/world_entities/environments/mapped_water.cc

    r9235 r9406  
    374374        waterColorR->setValue(this->waterColor.x);
    375375        waterColorR->setStep(0.1f);
    376         waterColorR->connect(SIGNAL(waterColorR, valueChanged), this, SLOT(MappedWater, resetWaterColorR));
     376        waterColorR->valueChanged.connect(this, &MappedWater::resetWaterColorR);
    377377        waterColorBox->pack(waterColorR);
    378378
     
    381381        waterColorG->setStep(0.1f);
    382382        waterColorG->setValue(this->waterColor.y);
    383         waterColorG->connect(SIGNAL(waterColorG, valueChanged), this, SLOT(MappedWater, resetWaterColorG));
     383        waterColorG->valueChanged.connect(this, &MappedWater::resetWaterColorG);
    384384        waterColorBox->pack(waterColorG);
    385385
     
    388388        waterColorB->setStep(0.1f);
    389389        waterColorB->setValue(this->waterColor.z);
    390         waterColorB->connect(SIGNAL(waterColorB, valueChanged), this, SLOT(MappedWater, resetWaterColorB));
     390        waterColorB->valueChanged.connect(this, &MappedWater::resetWaterColorB);
    391391        waterColorBox->pack(waterColorB);
    392392      }
     
    403403        waterUV->setValue(this->waterUV);
    404404        waterUV->setStep(1);
    405         waterUV->connect(SIGNAL(waterUV, valueChanged), this, SLOT(MappedWater, setWaterUV));
     405        waterUV->valueChanged.connect(this, &MappedWater::setWaterUV);
    406406        waterUVBox->pack(waterUV);
    407407      }
     
    418418        waterFlow->setValue(this->waterFlow);
    419419        waterFlow->setStep(0.02f);
    420         waterFlow->connect(SIGNAL(waterFlow, valueChanged), this, SLOT(MappedWater, setWaterFlow));
     420        waterFlow->valueChanged.connect(this, &MappedWater::setWaterFlow);
    421421        waterFlowBox->pack(waterFlow);
    422422      }
     
    433433        shineSize->setValue(this->shineSize);
    434434        shineSize->setStep(1);
    435         shineSize->connect(SIGNAL(shineSize, valueChanged), this, SLOT(MappedWater, resetShineSize));
     435        shineSize->valueChanged.connect(this, &MappedWater::resetShineSize);
    436436        shineSizeBox->pack(shineSize);
    437437      }
     
    448448        shineStrength->setValue(this->shineStrength);
    449449        shineStrength->setStep(0.1f);
    450         shineStrength->connect(SIGNAL(shineStrength, valueChanged), this, SLOT(MappedWater, resetShineStrength));
     450        shineStrength->valueChanged.connect(this, &MappedWater::resetShineStrength);
    451451        shineStrengthBox->pack(shineStrength);
    452452      }
     
    463463        reflStrength->setValue(this->reflStrength);
    464464        reflStrength->setStep(0.1f);
    465         reflStrength->connect(SIGNAL(reflStrength, valueChanged), this, SLOT(MappedWater, resetReflStrength));
     465        reflStrength->valueChanged.connect(this, &MappedWater::resetReflStrength);
    466466        reflStrengthBox->pack(reflStrength);
    467467      }
     
    478478        refraction->setValue(this->refraction);
    479479        refraction->setStep(0.004f);
    480         refraction->connect(SIGNAL(refraction, valueChanged), this, SLOT(MappedWater, resetRefraction));
     480        refraction->valueChanged.connect(this, &MappedWater::resetRefraction);
    481481        refractionBox->pack(refraction);
    482482      }
     
    493493        lightPosX->setValue(this->lightPos.x);
    494494        lightPosX->setStep(15);
    495         lightPosX->connect(SIGNAL(lightPosX, valueChanged), this, SLOT(MappedWater, resetLightPosX));
     495        lightPosX->valueChanged.connect(this, &MappedWater::resetLightPosX);
    496496        lightPosBox->pack(lightPosX);
    497497
     
    500500        lightPosY->setStep(15);
    501501        lightPosY->setValue(this->lightPos.y);
    502         lightPosY->connect(SIGNAL(lightPosY, valueChanged), this, SLOT(MappedWater, resetLightPosY));
     502        lightPosY->valueChanged.connect(this, &MappedWater::resetLightPosY);
    503503        lightPosBox->pack(lightPosY);
    504504
     
    507507        lightPosZ->setStep(15);
    508508        lightPosZ->setValue(this->lightPos.z);
    509         lightPosZ->connect(SIGNAL(lightPosZ, valueChanged), this, SLOT(MappedWater, resetLightPosZ));
     509        lightPosZ->valueChanged.connect(this, &MappedWater::resetLightPosZ);
    510510        lightPosBox->pack(lightPosZ);
    511511      }
     
    522522        waterHeight->setValue(this->waterHeight);
    523523        waterHeight->setStep(4);
    524         waterHeight->connect(SIGNAL(waterHeight, valueChanged), this, SLOT(MappedWater, setWaterHeight));
     524        waterHeight->valueChanged.connect(this, &MappedWater::setWaterHeight);
    525525        waterHeightBox->pack(waterHeight);
    526526      }
  • trunk/src/world_entities/environments/model_entity.cc

    r9235 r9406  
    2121#include "util/loading/factory.h"
    2222
    23 using namespace std;
     23
    2424
    2525
  • trunk/src/world_entities/environments/water.cc

    r7954 r9406  
    3232#include "network_game_manager.h"
    3333
    34 using namespace std;
     34
    3535
    3636CREATE_FACTORY(Water, CL_WATER);
Note: See TracChangeset for help on using the changeset viewer.