From 46329ceaffaaad280a9bcd2eef873a429161d3e5 Mon Sep 17 00:00:00 2001 From: Cyprien Huissoud Date: Sun, 16 Oct 2011 20:27:41 +0200 Subject: [PATCH 1/7] created the body-recursive branch... quite a lot of change, but not that much in reality. --- .../ui/creatureviewerwindow.cpp | 6 +- .../core/engines/bullet/shapes/btbone.cpp | 1 + .../core/engines/bullet/shapes/btbox.cpp | 4 - .../core/engines/simulationmanager.cpp | 11 ++ src/genelab/core/engines/simulationmanager.h | 5 + src/genelab/core/engines/terrain/terrain.cpp | 4 + src/genelab/core/entities/body/bone.cpp | 90 ++++++++++- src/genelab/core/entities/body/bone.h | 36 +++++ src/genelab/core/entities/body/fixation.cpp | 7 - .../effectors/rotationalmotorseffector.h | 42 ++++- .../core/entities/families/genericfamily.cpp | 143 ------------------ .../core/entities/families/genericfamily.h | 8 - .../entities/mutation/mutationsmanager.cpp | 2 - .../core/factories/creaturefactory.cpp | 5 +- .../entities/bonepropertiescontroller.cpp | 80 +++++++++- .../entities/bonepropertiescontroller.h | 5 +- .../entities/brainpropertiescontroller.cpp | 12 -- .../statisticspropertiescontroller.cpp | 2 +- src/genelab/core/utils/tools.h | 4 + src/genelab/core/world/btoscene.cpp | 1 - src/genelab/core/world/btscene.cpp | 2 +- src/genelab/core/world/btworld.cpp | 1 - src/genelab_global/genelab_global.pro | 30 +++- src/genelab_global/main.cpp | 1 + src/genelab_worker/genelab_worker.pro | 2 + 25 files changed, 297 insertions(+), 207 deletions(-) diff --git a/src/genelab/apps/genelab/creatureviewer/ui/creatureviewerwindow.cpp b/src/genelab/apps/genelab/creatureviewer/ui/creatureviewerwindow.cpp index 5661ae3..fdbb5a2 100644 --- a/src/genelab/apps/genelab/creatureviewer/ui/creatureviewerwindow.cpp +++ b/src/genelab/apps/genelab/creatureviewer/ui/creatureviewerwindow.cpp @@ -246,7 +246,7 @@ void CreatureViewerWindow::init() { // ------------------ // Welcome - WelcomeWidget *welcomeWidget = new WelcomeWidget(); + WelcomeWidget *welcomeWidget = new WelcomeWidget(this); welcomeWidget->setMaximumSize(400, 166725); ui->dwWelcome->setWidget(welcomeWidget); @@ -273,9 +273,10 @@ void CreatureViewerWindow::init() { bonePropertiesController = new BonePropertiesController(); bonePropertiesController->connectToInspectorInputManager(cvim); ui->dwBone->setWidget(bonePropertiesController); + simulationManager->addGraphicalWidget(bonePropertiesController); // Stats - statsPropertiesController = new StatisticsPropertiesController(); + statsPropertiesController = new StatisticsPropertiesController(this); ui->dwStats->setWidget(statsPropertiesController); statsPropertiesController->connectToInspectorInputManager(cvim); @@ -341,7 +342,6 @@ void CreatureViewerWindow::init() { //entitySpawner->start(); connect(entitySpawner, SIGNAL(timeout()), this, SLOT(spawnNew())); - switchToWelcomeMode(); } diff --git a/src/genelab/core/engines/bullet/shapes/btbone.cpp b/src/genelab/core/engines/bullet/shapes/btbone.cpp index c966930..934d81f 100644 --- a/src/genelab/core/engines/bullet/shapes/btbone.cpp +++ b/src/genelab/core/engines/bullet/shapes/btbone.cpp @@ -75,6 +75,7 @@ void btBone::init(btScalar length, this->rigidBody = new btRigidBody(mass,motionState,shape,localInertia); this->rigidBody->setFriction(friction); + this->rigidBody->setActivationState(DISABLE_DEACTIVATION); } void btBone::setup() diff --git a/src/genelab/core/engines/bullet/shapes/btbox.cpp b/src/genelab/core/engines/bullet/shapes/btbox.cpp index 8f0fd83..2b9483e 100644 --- a/src/genelab/core/engines/bullet/shapes/btbox.cpp +++ b/src/genelab/core/engines/bullet/shapes/btbox.cpp @@ -28,10 +28,6 @@ void btBox::init(btVector3 size, const btTransform &transform, const btScalar de btScalar friction = 0.9; - qDebug() << transform.getOrigin().x(); - qDebug() << transform.getOrigin().y(); - qDebug() << transform.getOrigin().z(); - // shape this->shape = new btBoxShape(btVector3(size.x()/2.0,size.y()/2.0,size.z()/2.0)); this->motionState = new btDefaultMotionState(transform); diff --git a/src/genelab/core/engines/simulationmanager.cpp b/src/genelab/core/engines/simulationmanager.cpp index 5a1b3b2..1e09b9b 100644 --- a/src/genelab/core/engines/simulationmanager.cpp +++ b/src/genelab/core/engines/simulationmanager.cpp @@ -95,6 +95,7 @@ namespace GeneCraftCore { if(fitness) fitness->step(); + } void SimulationManager::renderUpdate() { @@ -113,6 +114,12 @@ namespace GeneCraftCore { this->eventsManager->afterStep(); //this->translationEngine->afterStep(); this->renderEngine->afterStep(); + + // Update some graphical widgets + foreach(GraphicalWidget* wi, graphWidgets) { + wi->step(); + } + } void SimulationManager::setPhysicsFreq(int stepBySec) { @@ -121,5 +128,9 @@ namespace GeneCraftCore { stepBySec = 1; this->stepTimer->setInterval(1000/stepBySec); } + + void SimulationManager::addGraphicalWidget(GraphicalWidget *widget) { + this->graphWidgets.append(widget); + } } diff --git a/src/genelab/core/engines/simulationmanager.h b/src/genelab/core/engines/simulationmanager.h index f2c42e5..4c6fecd 100644 --- a/src/genelab/core/engines/simulationmanager.h +++ b/src/genelab/core/engines/simulationmanager.h @@ -3,11 +3,13 @@ #include "genecraftcoreclasses.h" #include "widgets/plot/fitnessplot.h" +#include "widgets/graphicalwidget.h" #include #include #include #include +#include namespace GeneCraftCore { @@ -21,6 +23,7 @@ namespace GeneCraftCore { SimulationManager(QMap, QObject *parent = 0); void addEngine(QString name, Engine *engine); + void addGraphicalWidget(GraphicalWidget* widget); void removeEngine(QString name); inline int getPhysicsFreq() @@ -53,6 +56,8 @@ namespace GeneCraftCore { Engine* translationEngine; Engine* eventsManager; + QList graphWidgets; + // Execution timer int nbSteps; int stepBySec; diff --git a/src/genelab/core/engines/terrain/terrain.cpp b/src/genelab/core/engines/terrain/terrain.cpp index 6ba4392..1fa9d21 100644 --- a/src/genelab/core/engines/terrain/terrain.cpp +++ b/src/genelab/core/engines/terrain/terrain.cpp @@ -89,6 +89,9 @@ namespace GeneCraftCore { break; } + if(x == 0 && z == 0) + y = 1; + btVector3 size(terrain->width, terrain->height + terrain->randomHeight, terrain->width); btVector3 pos(x*terrain->width, @@ -161,6 +164,7 @@ namespace GeneCraftCore { void Terrain::removeTerrain(TerrainData* terrain) { this->terrains.removeAll(terrain); + qDeleteAll(terrain->blocs); delete terrain; } } diff --git a/src/genelab/core/entities/body/bone.cpp b/src/genelab/core/entities/body/bone.cpp index 4b242a6..b3505e0 100644 --- a/src/genelab/core/entities/body/bone.cpp +++ b/src/genelab/core/entities/body/bone.cpp @@ -32,6 +32,7 @@ Bone::Bone(btShapesFactory *shapesFactory, btScalar yAxis, btScalar zAxis, btSca : QObject(), yAxis(yAxis), zAxis(zAxis), parentFix(NULL), motorsEffector(NULL) { + motorModifierData = QVariant(); parentCt = 0; body = shapesFactory->createBone(length, radius, endFixRadius, initTransform); @@ -45,6 +46,9 @@ Bone::Bone(btShapesFactory *shapesFactory, btScalar yAxis, btScalar zAxis, btSca endFix = new Fixation(shapesFactory, rigidBody, endFixRadius, endTransform, this); this->shapesFactory = shapesFactory; + this->ref = NULL; + this->sym = NULL; + this->rec = NULL; } Bone::~Bone() @@ -58,13 +62,6 @@ Bone::~Bone() } void Bone::remove() { - -// do it out of here, else bones are remove from fix and can't be deleted because we lose the pointer... -// if(parentFix != NULL) { -// parentFix->removeBone(this); -// parentFix = NULL; -// } - endFix->remove(); entity->removeLinksToEffector(this->motorsEffector); disconnectMotor(0); @@ -215,7 +212,28 @@ void Bone::connectMotor(int i) // ---------------------- void Bone::setyAxis(btScalar yAxis) { + + // Apply this to all referees + foreach(Bone* b, this->referees) { + b->setyAxis(yAxis); + } + + // Do the local modification + QVariantMap localOrientation; + localOrientation["y"] = yAxis; + localOrientation["z"] = zAxis; + + QVariantMap boneMap; + boneMap["endFix"] = QVariantMap(); // don't care + boneMap["localRotation"] = localOrientation; + + foreach(GenomeModifier* modifier, this->usedModifiers) { + boneMap = modifier->modify(boneMap).toMap(); + } + + yAxis = boneMap["localRotation"].toMap()["y"].toFloat(); this->yAxis = yAxis; + btQuaternion local1; local1.setRotation(btVector3(0, 1, 0), yAxis); btQuaternion local2; @@ -226,6 +244,30 @@ void Bone::setyAxis(btScalar yAxis) { } void Bone::setZAxis(btScalar zAxis) { + // Apply this to all referees + foreach(Bone* b, this->referees) { + b->setZAxis(zAxis); + } + + // Do the local modification + QVariantMap localOrientation; + localOrientation["y"] = yAxis; + localOrientation["z"] = zAxis; + + QVariantMap boneMap; + QVariantMap endMap; + endMap["radius"] = 0; // don't care + boneMap["endFix"] = endMap; + boneMap["localRotation"] = localOrientation; + + foreach(GenomeModifier* modifier, this->usedModifiers) { + boneMap = modifier->modify(boneMap).toMap(); + } + + zAxis = boneMap["localRotation"].toMap()["z"].toFloat(); + this->zAxis = zAxis; + + this->zAxis = zAxis; btQuaternion local1; local1.setRotation(btVector3(0, 1, 0), yAxis); @@ -372,6 +414,25 @@ void Bone::setSelected(bool selected) void Bone::setSize(btScalar radius, btScalar length) { + foreach(Bone* referee, referees) { + referee->setSize(radius, length); + } + + // Calculate the new size + QVariantMap boneMap; + boneMap["length"] = length; + boneMap["radius"] = radius; + QVariantMap endFixMap; + endFixMap["radius"] = 0; // Don't care + boneMap["endFix"] = endFixMap; + + foreach(GenomeModifier* modifier, this->usedModifiers) { + boneMap = modifier->modify(boneMap).toMap(); + } + + length = boneMap["length"].toFloat(); + radius = boneMap["radius"].toFloat(); + btScalar oldLength = this->getLength(); body->setSize(radius,length); @@ -387,6 +448,21 @@ void Bone::setSize(btScalar radius, btScalar length) void Bone::setEndFixationRadius(btScalar radius) { + + // Calculate the new size + QVariantMap boneMap; + boneMap["length"] = 0; // Don't care + boneMap["radius"] = 0; // Don't care + QVariantMap endFixMap; + endFixMap["radius"] = radius; + boneMap["endFix"] = endFixMap; + + foreach(GenomeModifier* modifier, this->usedModifiers) { + boneMap = modifier->modify(boneMap).toMap(); + } + + radius = boneMap["endFix"].toMap()["radius"].toFloat(); + body->setEndFixationRadius(radius); // adapt children connections diff --git a/src/genelab/core/entities/body/bone.h b/src/genelab/core/entities/body/bone.h index 4c1b932..7a26a45 100644 --- a/src/genelab/core/entities/body/bone.h +++ b/src/genelab/core/entities/body/bone.h @@ -2,6 +2,7 @@ #define BONE_H #include +#include #include #include "genecraftcoreclasses.h" @@ -9,8 +10,16 @@ #include "BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h" #include "bullet/shapes/btbone.h" +#include "genome/genomemodifier.h" + +#include "symmetry.h" +#include "recursion.h" + namespace GeneCraftCore { + class Symmetry; + class Recursion; + class Bone : public QObject { @@ -20,6 +29,7 @@ class Bone : public QObject // -- constructor and setup -- // --------------------------- Bone(btShapesFactory *shapesFactory, btScalar yAxis, btScalar zAxis, btScalar radius, btScalar lenght, btScalar endFixRadius, const btTransform &initTransform); + ~Bone(); /** add bone and its end fixation in the world */ @@ -80,6 +90,24 @@ class Bone : public QObject void connectMotor(int i); void disconnectMotor(int i); + /** + Referent bone + */ + void setRef(Bone* ref) { this->ref = ref; } + Bone* getRef() { return this->ref;} + void addReferee(Bone* referee) { this->referees.prepend(referee); } + QList getReferees() { return this->referees; } + + void setModifiers(QList modifiers) { this->usedModifiers.append(modifiers); qDebug() << "used: " << usedModifiers.size(); } + + /** + Special genome element + */ + void setSymmetry(Symmetry* sym) { this->sym = sym; } + Symmetry* getSymmetry() { return this->sym; } + void setRecursion(Recursion* rec) { this->rec = rec; } + Recursion* getRecursion() { return this->rec; } + protected: // Shape @@ -108,6 +136,14 @@ class Bone : public QObject // Shape factory btShapesFactory* shapesFactory; + // Referent bone + Bone* ref; + QList referees; + QList usedModifiers; + + Symmetry* sym; + Recursion* rec; + }; } diff --git a/src/genelab/core/entities/body/fixation.cpp b/src/genelab/core/entities/body/fixation.cpp index 8a6b323..5fd6a66 100644 --- a/src/genelab/core/entities/body/fixation.cpp +++ b/src/genelab/core/entities/body/fixation.cpp @@ -463,11 +463,4 @@ namespace GeneCraftCore { return true; } - - // ----------- - // -- UTILS -- - // ----------- -// btWorld *Fixation::getWorld() { -// return sphere->getWorld(); -// } } diff --git a/src/genelab/core/entities/effectors/rotationalmotorseffector.h b/src/genelab/core/entities/effectors/rotationalmotorseffector.h index e471e38..4120a79 100644 --- a/src/genelab/core/entities/effectors/rotationalmotorseffector.h +++ b/src/genelab/core/entities/effectors/rotationalmotorseffector.h @@ -2,19 +2,19 @@ #define ROTATIONALMOTORS_H #include +#include "tools.h" #include "genecraftcoreclasses.h" #include "effector.h" #include "brain/brainout.h" #include "BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h" -#define MIN_CONTRACTION 0.0f +#define MIN_CONTRACTION -1.0f #define MAX_CONTRACTION 1.0f #define MIN_EXPANSION 0.0f #define MAX_EXPANSION 1.0f namespace GeneCraftCore { - /** * Internal class to box motor brain outputs */ @@ -80,10 +80,42 @@ class BrainOutMotor void update() { - motor->m_maxMotorForce - = (boMaxMotorForce->getValue() + boTargetVelocity->getValue())*20000; + float bend = boMaxMotorForce->getValue(); + float expand = boTargetVelocity->getValue(); + + /* + 1st try motor->m_targetVelocity - = (boTargetVelocity->getValue() - boMaxMotorForce->getValue())*20; + = (expand - bend)*20; + + bend -= 0.5; + expand -= 0.5; + if(bend < 0) // The real 0 + bend = 0; + if(expand < 0) // The real 0 + expand = 0; + motor->m_maxMotorForce + = exp(4*(bend + expand))*1000; + */ + + /* + Angular position try + + */ + + float amplitude = motor->m_hiLimit - motor->m_loLimit; + float angular = amplitude/2. * boMaxMotorForce->getValue(); + // Stabilisation properties + float normalPositionMaxError = 0.001; + float normalPositionFactor = 20.0; + + if(motor->m_currentPosition < angular - normalPositionMaxError + || motor->m_currentPosition > angular + normalPositionMaxError) + motor->m_targetVelocity = Tools::sign(angular - motor->m_currentPosition)*exp(angular - motor->m_currentPosition); + + //qDebug() << "a" << angular << "\tamp" << amplitude << "\tpos" << motor->m_currentPosition << "\tvel" << motor->m_targetVelocity; + motor->m_maxMotorForce = 20000; + } btRotationalLimitMotor * motor; diff --git a/src/genelab/core/entities/families/genericfamily.cpp b/src/genelab/core/entities/families/genericfamily.cpp index 23e91c1..9b92f01 100644 --- a/src/genelab/core/entities/families/genericfamily.cpp +++ b/src/genelab/core/entities/families/genericfamily.cpp @@ -26,41 +26,6 @@ GenericFamily::GenericFamily() { } -Entity *GenericFamily::createEntity(QVariant genotype, - btShapesFactory *shapesFactory, - const btVector3 &initialPosition) -{ - QVariantMap entityMap = genotype.toMap(); - - // Entity & origins - QVariantMap origins = entityMap.value("origins").toMap(); - Entity * entity = new Entity(origins.value("name").toString(), - origins.value("family").toString(), - "generic", - origins.value("generation").toInt()); - // Brain - entity->setBrain(new BrainFunctional(entityMap.value("brain"))); - - // Body - QVariantMap body = entityMap.value("body").toMap(); - if(body.value("shapeType").toString().compare(QString("TreeShape")) == 0) - { - TreeShape* treeShape = new TreeShape(shapesFactory); - - btTransform initTransform; - initTransform.setIdentity(); - initTransform.setOrigin(initialPosition); - - Fixation* root = GenericFamily::createRootFromGenotype(shapesFactory, body.value("shape"), initTransform); - treeShape->setRoot(root); - entity->setShape(treeShape); - GenericFamily::buildFixFromGenotype(shapesFactory, root, root,body.value("shape").toMap().value("rootFix")); - } - - - return entity; -} - Entity *GenericFamily::createVirginEntity(btShapesFactory *shapesFactory, btScalar rootFixRadius, @@ -81,113 +46,5 @@ Entity *GenericFamily::createVirginEntity(btShapesFactory *shapesFactory, return entity; } -Fixation* GenericFamily::createRootFromGenotype(btShapesFactory *shapesFactory, QVariant genotype, btTransform initTransform) { - QVariantMap treeShapeMap = genotype.toMap(); - - // Root fix - QVariantMap rootFixMap = treeShapeMap.value("rootFix").toMap(); - - return new Fixation(shapesFactory, rootFixMap.value("radius").toDouble(), initTransform); - -} - -void GenericFamily::buildFixFromGenotype(btShapesFactory *shapesFactory, Fixation *fix, Fixation* root, QVariant fixGenotype) -{ - - // ------------- - // -- sensors -- - // ------------- - foreach(QVariant sensorData, fixGenotype.toMap()["sensors"].toList()) { - QVariantMap sensorMap = sensorData.toMap(); - switch((SensorType)sensorMap["type"].toInt()) { - case accelerometerSensor: { - fix->addSensor(new AccelerometerSensor(sensorData, fix)); - } - break; - case gyroscopicSensor: { - fix->addSensor(new GyroscopicSensor(sensorData, fix)); - } - break; - case positionSensor:{ - - fix->addSensor(new PositionSensor(sensorData, root, fix)); - } - break; - case contactSensor:{ - - fix->addSensor(new ContactSensor(sensorData, fix)); - } - break; - case boxSmellSensor:{ - - fix->addSensor(new BoxSmellSensor(sensorData, fix)); - - break; - } - case distanceSensor:{ - - fix->addSensor(new DistanceSensor(sensorData, fix)); - } - break; - } - } - - // -------------- - // -- effector -- - // -------------- - foreach(QVariant effector, fixGenotype.toMap()["effectors"].toList()) { - QVariantMap effectorMap = effector.toMap(); - switch((EffectorType)effectorMap["type"].toInt()) { - - case rotationalMotorEffector: break; - case gripperEffector: { - fix->addEffector(new GripperEffector(effectorMap, fix)); - } - break; - case flyingEffector:{ - fix->addEffector(new FlyingEffector(effectorMap, fix)); - } - break; - } - } - - // ----------- - // -- bones -- - // ----------- - QVariantList bonesVariantList = fixGenotype.toMap().value("bones").toList(); - - foreach(QVariant bone, bonesVariantList) - { - QVariantMap boneMap = bone.toMap(); - - // Radius & lenght - btScalar boneRadius = boneMap.value("radius").toDouble(); - btScalar boneLength = boneMap.value("length").toDouble(); - - btScalar endFixRadius = boneMap.value("endFix").toMap().value("radius").toDouble(); - - // Yaw & Roll (local) - QVariantMap localRotationMap = boneMap.value("localRotation").toMap(); - btScalar yAxisRot = localRotationMap.value("y").toDouble(); - btScalar zAxisRot = localRotationMap.value("z").toDouble(); - - // Limits - btVector3 lowerLimits, upperLimits; - QVariantMap lowerLimitsMap = boneMap.value("lowerLimits").toMap(); - QVariantMap upperLimitsMap = boneMap.value("upperLimits").toMap(); - - lowerLimits.setValue(lowerLimitsMap.value("x").toDouble(), - lowerLimitsMap.value("y").toDouble(), - lowerLimitsMap.value("z").toDouble()); - upperLimits.setValue(upperLimitsMap.value("x").toDouble(), - upperLimitsMap.value("y").toDouble(), - upperLimitsMap.value("z").toDouble()); - - Bone *bone = fix->addBone(yAxisRot,zAxisRot,boneRadius,boneLength,endFixRadius,lowerLimits,upperLimits); - bone->setMotorModifierData(boneMap["muscle"]); - // Add bone recurcively - GenericFamily::buildFixFromGenotype(shapesFactory, bone->getEndFixation(), root, boneMap.value("endFix")); - } -} } diff --git a/src/genelab/core/entities/families/genericfamily.h b/src/genelab/core/entities/families/genericfamily.h index b2edccb..f651645 100644 --- a/src/genelab/core/entities/families/genericfamily.h +++ b/src/genelab/core/entities/families/genericfamily.h @@ -23,10 +23,6 @@ class GenericFamily GenericFamily(); - // To create an entity with its genome - static Entity *createEntity(QVariant genotype, - btShapesFactory *shapesFactory, - const btVector3 &initialPosition); // To create a virgin entity static Entity *createVirginEntity(btShapesFactory *shapesFactory, @@ -34,10 +30,6 @@ class GenericFamily const btVector3 &initialPosition); - static Fixation* createRootFromGenotype(btShapesFactory *shapesFactory, QVariant genotype, btTransform initTransform); - static void buildFixFromGenotype(btShapesFactory *shapesFactory, Fixation *fix, Fixation* root, QVariant fixGenotype); - - }; } #endif // GENERICFAMILY_H diff --git a/src/genelab/core/entities/mutation/mutationsmanager.cpp b/src/genelab/core/entities/mutation/mutationsmanager.cpp index 603c6aa..8572c67 100644 --- a/src/genelab/core/entities/mutation/mutationsmanager.cpp +++ b/src/genelab/core/entities/mutation/mutationsmanager.cpp @@ -637,10 +637,8 @@ namespace GeneCraftCore { QVariantMap boneMap = bonesList.takeAt(i).toMap(); QVariantMap fixMap = boneMap["endFix"].toMap(); QVariantList bones = fixMap["bones"].toList(); - int nbBones; bonesList.append(bones); i--; - nbBones = bonesList.count(); } // Insert else if(bonesStructural->checkAdd()) { diff --git a/src/genelab/core/factories/creaturefactory.cpp b/src/genelab/core/factories/creaturefactory.cpp index 65a2144..cd11b17 100644 --- a/src/genelab/core/factories/creaturefactory.cpp +++ b/src/genelab/core/factories/creaturefactory.cpp @@ -1,4 +1,5 @@ #include "creaturefactory.h" +#include "genome/genomebuilder.h" #include "families/genericfamily.h" #include "entity.h" @@ -29,10 +30,10 @@ namespace GeneCraftCore { // Generic entity if(entityData["type"].toString() == "generic") - return GenericFamily::createEntity(entityData, shapesFactory, position); + return GenomeBuilder::buildEntity(entityData, shapesFactory, position); // Whatever else if(entityData["type"].toString() == "symetric") - return GenericFamily::createEntity(entityData, shapesFactory, position); + return GenomeBuilder::buildEntity(entityData, shapesFactory, position); // Whatever else return NULL; } diff --git a/src/genelab/core/ui/widgets/entities/bonepropertiescontroller.cpp b/src/genelab/core/ui/widgets/entities/bonepropertiescontroller.cpp index 962b8de..a2a3700 100644 --- a/src/genelab/core/ui/widgets/entities/bonepropertiescontroller.cpp +++ b/src/genelab/core/ui/widgets/entities/bonepropertiescontroller.cpp @@ -35,7 +35,7 @@ btScalar roundPrecision(btScalar n, int precision = 2) } BonePropertiesController::BonePropertiesController(QWidget *parent) : - QWidget(parent), ui(new Ui::BonePropertiesController), bone(0) + GraphicalWidget(parent), ui(new Ui::BonePropertiesController), bone(0) { ui->setupUi(this); @@ -110,8 +110,8 @@ void BonePropertiesController::entityDeleted(Entity *) { setBone(NULL); } -void BonePropertiesController::update() { - if(this->bone != NULL) { +void BonePropertiesController::step() { + /*if(this->bone != NULL && this->bone->getRotationalMotorsEffector() != NULL) { // X BrainOutMotor* muscle = this->bone->getRotationalMotorsEffector()->getBrainOutputs(0); if(muscle) { @@ -139,7 +139,7 @@ void BonePropertiesController::update() { this->ui->lblContractZ->setText(QString::number(0)); this->ui->lblExpandZ->setText(QString::number(0)); } - } + }*/ } void BonePropertiesController::setOutFrom() @@ -180,6 +180,34 @@ void BonePropertiesController::changeRadiusFromSlider(int value) void BonePropertiesController::deleteBone() { + // Symmetric bone ? + + // Recursiv bone ? + if(bone->getSymmetry()) { + Symmetry* sym = bone->getSymmetry(); + // Need to delete the copy + if(sym->copy->getParentFixation() != NULL) + sym->copy->getParentFixation()->removeBone(sym->copy); + + sym->copy->remove(); + emit sBoneDeleted(sym->copy); // will set bone to NULL + delete sym->copy; + + } else if(bone->getRecursion()) { + // Delete as usual, that'll delete child too + } else { // Delete copy also + // Delete the same on the other side + foreach(Bone* b, bone->getReferees()) { + if(b->getParentFixation() != NULL) + b->getParentFixation()->removeBone(bone); + + b->remove(); + emit sBoneDeleted(b); // will set bone to NULL + delete b; + } + } + + if(bone->getParentFixation() != NULL) bone->getParentFixation()->removeBone(bone); @@ -191,6 +219,41 @@ void BonePropertiesController::deleteBone() void BonePropertiesController::deleteBoneAndAttachChildrenToParent() { + if(bone->getSymmetry()) { + // Delete the copy as-well + Bone* b = bone->getSymmetry()->copy; + + if(b->getParentFixation() != NULL) + b->getParentFixation()->removeBone(b); + + b->remove(); + emit sBoneDeleted(b); // will set bone to NULL + delete b; + + } else if(bone->getRecursion()) { + // Delete all child and child-tree + foreach(Bone* b, bone->getRecursion()->childs) { + + if(b->getParentFixation() != NULL) + b->getParentFixation()->removeBone(b); + + b->remove(); + emit sBoneDeleted(b); // will set bone to NULL + delete b; + } + } else { + // Delete the same on the other side + foreach(Bone* b, bone->getReferees()) { + if(b->getParentFixation() != NULL) + b->getParentFixation()->removeBone(b); + + b->removeOnly(); + emit sBoneDeleted(b); // will set bone to NULL + delete b; + } + } + + if(bone->getParentFixation() != NULL) bone->getParentFixation()->removeBone(bone); @@ -288,10 +351,17 @@ void BonePropertiesController::saveChanges() void BonePropertiesController::setBone(Bone * bone) { - this->bone = bone; + if(bone) { + // Try to get the ref + while(bone->getRef()) { + bone = bone->getRef(); + } + + this->bone = bone; + this->setEnabled(true); // Bone outputs diff --git a/src/genelab/core/ui/widgets/entities/bonepropertiescontroller.h b/src/genelab/core/ui/widgets/entities/bonepropertiescontroller.h index c9502d2..37c0f7e 100644 --- a/src/genelab/core/ui/widgets/entities/bonepropertiescontroller.h +++ b/src/genelab/core/ui/widgets/entities/bonepropertiescontroller.h @@ -6,6 +6,7 @@ #include "genecraftcoreclasses.h" #include "sensors/sensor.h" #include "BulletDynamics/Dynamics/btRigidBody.h" +#include "widgets/graphicalwidget.h" using namespace GeneCraftCore; @@ -13,7 +14,7 @@ namespace Ui { class BonePropertiesController; } -class BonePropertiesController : public QWidget +class BonePropertiesController : public GraphicalWidget { Q_OBJECT @@ -21,6 +22,7 @@ class BonePropertiesController : public QWidget explicit BonePropertiesController(QWidget *parent = 0); ~BonePropertiesController(); void connectToInspectorInputManager(InspectorsInputManager * iim); + virtual void step(); signals: @@ -32,7 +34,6 @@ public slots: void setBone(Bone * bone); void boneDeleted(Bone *bone); void entityDeleted(Entity *entity); - void update(); private: Ui::BonePropertiesController *ui; diff --git a/src/genelab/core/ui/widgets/entities/brainpropertiescontroller.cpp b/src/genelab/core/ui/widgets/entities/brainpropertiescontroller.cpp index 9445227..742d72c 100644 --- a/src/genelab/core/ui/widgets/entities/brainpropertiescontroller.cpp +++ b/src/genelab/core/ui/widgets/entities/brainpropertiescontroller.cpp @@ -161,20 +161,8 @@ void BrainPropertiesController::selectSensorFixation() void BrainPropertiesController::setBrainFrequency() { if(entity){ - entity->getBrain()->setFrequency(ui->sBrainFrequency->value()); ui->lBrainFrequency->setText(QString::number(entity->getBrain()->getFrequency())); - - //int size = pow(2,ui->cbBrainSize->currentIndex() + 1); - //int size = ui->sBrainPluggridSize->value(); - //ui->lBrainPluggridSize->setText(QString::number(ui->sBrainPluggridSize->value())); - //entity->getBrain()->getPlugGrid()->setSize(size); - - // update brain in inspectors (important to refresh neurons (QGraphicsRectItem)) - //this->brainViz->setBrain(entity->getBrain()); - //this->brainDezViz->setBrain(entity->getBrain()); - - //emit sEntityUpdated(entity); } } diff --git a/src/genelab/core/ui/widgets/entities/statisticspropertiescontroller.cpp b/src/genelab/core/ui/widgets/entities/statisticspropertiescontroller.cpp index d665ecb..de7cfa7 100644 --- a/src/genelab/core/ui/widgets/entities/statisticspropertiescontroller.cpp +++ b/src/genelab/core/ui/widgets/entities/statisticspropertiescontroller.cpp @@ -30,7 +30,7 @@ StatisticsPropertiesController::StatisticsPropertiesController(QWidget *parent) setEnabled(false); - fitness = new FitnessPlot(this); + fitness = new FitnessPlot(parent); ui->tab_2->layout()->addWidget(fitness); } diff --git a/src/genelab/core/utils/tools.h b/src/genelab/core/utils/tools.h index f2ae541..aee0feb 100644 --- a/src/genelab/core/utils/tools.h +++ b/src/genelab/core/utils/tools.h @@ -26,6 +26,10 @@ class Tools // Used to remove not empty directory (recursively delete) static bool removeDir(QString dirPath); + + static int sign(int v) { + return v > 0 ? 1 : (v < 0 ? -1 : 0); + } }; } diff --git a/src/genelab/core/world/btoscene.cpp b/src/genelab/core/world/btoscene.cpp index 76f7370..a9d8a97 100644 --- a/src/genelab/core/world/btoscene.cpp +++ b/src/genelab/core/world/btoscene.cpp @@ -66,7 +66,6 @@ namespace GeneCraftCore { // flatland if(floor["type"].toString() == "flatland") { - qDebug() << "first"; /*mGlobals = OGRE_NEW Ogre::TerrainGlobalOptions(); mGlobals->setMaxPixelError(0); diff --git a/src/genelab/core/world/btscene.cpp b/src/genelab/core/world/btscene.cpp index b239f8b..15bb258 100644 --- a/src/genelab/core/world/btscene.cpp +++ b/src/genelab/core/world/btscene.cpp @@ -66,7 +66,7 @@ namespace GeneCraftCore { QVariantList staticShapesList = data.value("shapes").toList(); - //floor["type"] = "randomBoxes"; + floor["type"] = "randomBoxes"; // Add the entry to the terrain engine terrainEngine->setShapesFactory(world->getShapesFactory()); terrainData = terrainEngine->addTerrain(floor); diff --git a/src/genelab/core/world/btworld.cpp b/src/genelab/core/world/btworld.cpp index 3ff9e86..073c2da 100644 --- a/src/genelab/core/world/btworld.cpp +++ b/src/genelab/core/world/btworld.cpp @@ -10,7 +10,6 @@ #include "btshapesfactory.h" #include "BulletDynamics/Dynamics/btDynamicsWorld.h" -#include "BulletDynamics/Dynamics/btContinuousDynamicsWorld.h" #include "BulletCollision/BroadphaseCollision/btDbvtBroadphase.h" #include "BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h" #include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h" diff --git a/src/genelab_global/genelab_global.pro b/src/genelab_global/genelab_global.pro index cceb463..8edeb00 100644 --- a/src/genelab_global/genelab_global.pro +++ b/src/genelab_global/genelab_global.pro @@ -67,7 +67,7 @@ LIBS += -lBulletCollision LIBS += -lLinearMath LIBS += -lQxtCore LIBS += -lqwt -LIBS += -lOgreTerrain +#LIBS += -lOgreTerrain #LIBS += -lOgreMain #LIBS += -lConvexDecomposition #LIBS += -lBulletWorldImporter -lBulletFileLoader @@ -197,7 +197,12 @@ SOURCES += \ ../genelab/core/ui/widgets/experiments/conversionctrl.cpp \ ../genelab/core/ui/widgets/plot/fitnessplot.cpp \ ../genelab/core/ui/widgets/experiments/floordialog.cpp \ - ../genelab/core/engines/terrain/terrain.cpp + ../genelab/core/engines/terrain/terrain.cpp \ + ../genelab/core/factories/genome/genomebuilder.cpp \ + ../genelab/core/factories/genome/genomemodifier.cpp \ + ../genelab/core/entities/body/symmetry.cpp \ + ../genelab/core/entities/body/recursion.cpp \ + ../genelab/core/ui/widgets/graphicalwidget.cpp HEADERS += \ @@ -317,7 +322,12 @@ HEADERS += \ ../genelab/core/ui/widgets/experiments/conversionctrl.h \ ../genelab/core/ui/widgets/plot/fitnessplot.h \ ../genelab/core/ui/widgets/experiments/floordialog.h \ - ../genelab/core/engines/terrain/terrain.h + ../genelab/core/engines/terrain/terrain.h \ + ../genelab/core/factories/genome/genomebuilder.h \ + ../genelab/core/factories/genome/genomemodifier.h \ + ../genelab/core/entities/body/symmetry.h \ + ../genelab/core/entities/body/recursion.h \ + ../genelab/core/ui/widgets/graphicalwidget.h FORMS += \ ../genelab/core/ui/widgets/ogrebulletwindows.ui \ @@ -346,3 +356,17 @@ RESOURCES += \ ../genelab/core/ressources/ressources.qrc TRANSLATIONS = genelab_global_fr.ts + + + + + + + + + + + + + + diff --git a/src/genelab_global/main.cpp b/src/genelab_global/main.cpp index 5d65a71..0276618 100644 --- a/src/genelab_global/main.cpp +++ b/src/genelab_global/main.cpp @@ -83,6 +83,7 @@ int main(int argc, char *argv[]) cw.showMaximized(); splash.finish(&cw); + // DOESN'T WORK ?!? // First launch QSettings mySettings; diff --git a/src/genelab_worker/genelab_worker.pro b/src/genelab_worker/genelab_worker.pro index 01ed105..7371aee 100644 --- a/src/genelab_worker/genelab_worker.pro +++ b/src/genelab_worker/genelab_worker.pro @@ -56,6 +56,7 @@ SOURCES += \ ../genelab/core/engines/bullet/shapes/btcylinder.cpp \ ../genelab/core/engines/bullet/shapes/btbone.cpp \ ../genelab/core/engines/entities/entitiesengine.cpp \ + ../genelab/core/engines/terrain/terrain.cpp \ ../genelab/core/entities/entity.cpp \ ../genelab/core/entities/entityfamily.cpp \ ../genelab/core/entities/body/treeshape.cpp \ @@ -131,6 +132,7 @@ HEADERS += \ ../genelab/core/engines/bullet/shapes/btcylinder.h \ ../genelab/core/engines/bullet/shapes/btbone.h \ ../genelab/core/engines/entities/entitiesengine.h \ + ../genelab/core/engines/terrain/terrain.h \ ../genelab/core/entities/entityfamily.h \ ../genelab/core/entities/entity.h \ ../genelab/core/entities/body/treeshape.h \ From 4a611c4a8c7a3b7c49aa90351cfde9e90dc5aa4b Mon Sep 17 00:00:00 2001 From: Cyprien Huissoud Date: Sun, 16 Oct 2011 20:29:01 +0200 Subject: [PATCH 2/7] the missing files --- src/genelab/core/entities/body/recursion.cpp | 9 + src/genelab/core/entities/body/recursion.h | 37 +++ src/genelab/core/entities/body/symmetry.cpp | 10 + src/genelab/core/entities/body/symmetry.h | 31 ++ .../core/factories/genome/genomebuilder.cpp | 296 ++++++++++++++++++ .../core/factories/genome/genomebuilder.h | 45 +++ .../core/factories/genome/genomemodifier.cpp | 116 +++++++ .../core/factories/genome/genomemodifier.h | 52 +++ .../core/ui/widgets/graphicalwidget.cpp | 8 + src/genelab/core/ui/widgets/graphicalwidget.h | 20 ++ 10 files changed, 624 insertions(+) create mode 100644 src/genelab/core/entities/body/recursion.cpp create mode 100644 src/genelab/core/entities/body/recursion.h create mode 100644 src/genelab/core/entities/body/symmetry.cpp create mode 100644 src/genelab/core/entities/body/symmetry.h create mode 100644 src/genelab/core/factories/genome/genomebuilder.cpp create mode 100644 src/genelab/core/factories/genome/genomebuilder.h create mode 100644 src/genelab/core/factories/genome/genomemodifier.cpp create mode 100644 src/genelab/core/factories/genome/genomemodifier.h create mode 100644 src/genelab/core/ui/widgets/graphicalwidget.cpp create mode 100644 src/genelab/core/ui/widgets/graphicalwidget.h diff --git a/src/genelab/core/entities/body/recursion.cpp b/src/genelab/core/entities/body/recursion.cpp new file mode 100644 index 0000000..e9bf195 --- /dev/null +++ b/src/genelab/core/entities/body/recursion.cpp @@ -0,0 +1,9 @@ +#include "recursion.h" +#include "bone.h" + +namespace GeneCraftCore { + Recursion::Recursion(QObject *parent) : + QObject(parent) + { + } +} diff --git a/src/genelab/core/entities/body/recursion.h b/src/genelab/core/entities/body/recursion.h new file mode 100644 index 0000000..d5c1c0e --- /dev/null +++ b/src/genelab/core/entities/body/recursion.h @@ -0,0 +1,37 @@ +#ifndef RECURSION_H +#define RECURSION_H + +#include +#include + +#include "genome/genomemodifier.h" +#include "btBulletCollisionCommon.h" + +namespace GeneCraftCore { + + class Bone; + + class Recursion : public QObject + { + Q_OBJECT + public: + explicit Recursion(QObject *parent = 0); + + btScalar physScale; + btScalar neuralAlpha; + btScalar neuralDelta; + int depth; + QList tail; + QList childs; + Bone* model; + QList modifiers; + + signals: + + public slots: + + }; + +} + +#endif // RECURSION_H diff --git a/src/genelab/core/entities/body/symmetry.cpp b/src/genelab/core/entities/body/symmetry.cpp new file mode 100644 index 0000000..adbd810 --- /dev/null +++ b/src/genelab/core/entities/body/symmetry.cpp @@ -0,0 +1,10 @@ +#include "symmetry.h" + +namespace GeneCraftCore { + +Symmetry::Symmetry(QObject *parent) : + QObject(parent) +{ +} + +} diff --git a/src/genelab/core/entities/body/symmetry.h b/src/genelab/core/entities/body/symmetry.h new file mode 100644 index 0000000..adf43bb --- /dev/null +++ b/src/genelab/core/entities/body/symmetry.h @@ -0,0 +1,31 @@ +#ifndef SYMMETRY_H +#define SYMMETRY_H + +#include +#include +#include "genome/genomemodifier.h" +#include "btBulletCollisionCommon.h" +#include "body/bone.h" + +namespace GeneCraftCore { + + class Symmetry : public QObject + { + Q_OBJECT + public: + explicit Symmetry(QObject *parent = 0); + + btScalar physSymmetry; + btScalar neuralSymmetry; + Bone* model; + Bone* copy; + QList modifiers; + + signals: + + public slots: + + }; +} + +#endif // SYMMETRY_H diff --git a/src/genelab/core/factories/genome/genomebuilder.cpp b/src/genelab/core/factories/genome/genomebuilder.cpp new file mode 100644 index 0000000..e770d6f --- /dev/null +++ b/src/genelab/core/factories/genome/genomebuilder.cpp @@ -0,0 +1,296 @@ +#include "genomebuilder.h" + +#include + +#include "body/bone.h" +#include "body/fixation.h" +#include "body/treeshape.h" + +#include "sensors/sensor.h" +#include "sensors/accelerometersensor.h" +#include "sensors/boxsmellsensor.h" +#include "sensors/contactsensor.h" +#include "sensors/distancesensor.h" +#include "sensors/gyroscopicsensor.h" +#include "sensors/positionsensor.h" +#include "sensors/smellsensor.h" + +#include "effectors/effector.h" +#include "effectors/flyingeffector.h" +#include "effectors/grippereffector.h" +#include "effectors/rotationalmotorseffector.h" + +namespace GeneCraftCore { + + GenomeBuilder::GenomeBuilder(QObject *parent) : + QObject(parent) + { + } + + Entity *GenomeBuilder::buildEntity(QVariant genotype, + btShapesFactory *shapesFactory, + const btVector3 &initialPosition) + { + QVariantMap entityMap = genotype.toMap(); + + // Entity & origins + QVariantMap origins = entityMap.value("origins").toMap(); + Entity * entity = new Entity(origins.value("name").toString(), + origins.value("family").toString(), + "generic", + origins.value("generation").toInt()); + // Brain + entity->setBrain(new BrainFunctional(entityMap.value("brain"))); + + // Body + QVariantMap body = entityMap.value("body").toMap(); + if(body.value("shapeType").toString().compare(QString("TreeShape")) == 0) + { + TreeShape* treeShape = new TreeShape(shapesFactory); + + btTransform initTransform; + initTransform.setIdentity(); + initTransform.setOrigin(initialPosition); + + Fixation* root = GenomeBuilder::buildRoot(shapesFactory, body.value("shape"), initTransform); + treeShape->setRoot(root); + entity->setShape(treeShape); + + QList modifiers; + GenomeBuilder::buildElement(shapesFactory, root, modifiers, body.value("shape").toMap().value("rootFix"), NULL); + } + + + return entity; + } + + + Fixation* GenomeBuilder::buildElement(btShapesFactory* shapesFactory, Fixation *parent, + QList modifiers, QVariant genome, Bone* ref) { + + QVariantMap map = genome.toMap(); + + // If it's not a bone nor a fixation + // It should be a symmetry or a recursion + if(map.contains("type")) { + QString type = map["type"].toString(); + if(type == "symmetry") { + // Create the symmetry modifier + GenomeModifier* modifier = new GenomeModifier(); + modifier->setNeuralSymmetry(map["neuralSymmetry"].toFloat()); + modifier->setPhysicalSymmetry(map["physicalSymmetry"].toFloat()); + QList newModifiers; + newModifiers.append(modifiers); + newModifiers.append(modifier); + + // The symmetry element, for further modification / serialisation + Symmetry* sym = new Symmetry(); + sym->physSymmetry = map["physicalSymmetry"].toFloat(); + sym->neuralSymmetry = map["neuralSymmetry"].toFloat(); + sym->modifiers.append(modifier); + + // Build the original child and the symmetric one, and we arbitrary return the new one + Fixation* refFix = GenomeBuilder::buildElement(shapesFactory, parent, modifiers, map["element"], ref); + Fixation* last = GenomeBuilder::buildElement(shapesFactory, parent, newModifiers, map["element"], refFix->getParentBone()); + + sym->model = refFix->getParentBone(); + sym->copy = last->getParentBone(); + refFix->getParentBone()->setSymmetry(sym); + return last; + + } else if (type == "recursive") { + // Create the recursion modifier + GenomeModifier* modifier = new GenomeModifier(); + modifier->setNeuralRotation(map["neuralAlpha"].toFloat(), map["neuralDelta"].toFloat()); + modifier->setPhysicalScale(map["physicalScale"].toFloat()); + QList newModifiers; + newModifiers.append(modifiers); + + // The recursion element, for further modification / serialisation + Recursion* rec = new Recursion(); + rec->depth = map["depth"].toInt(); + rec->physScale = map["physicalScale"].toFloat(); + rec->neuralAlpha = map["neuralAlpha"].toFloat(); + rec->neuralDelta = map["neuralDelta"].toFloat(); + rec->modifiers.append(modifier); + + // Construct the n-th recursions of the element + int nb = map["depth"].toInt(); + Fixation* refFix = parent = GenomeBuilder::buildElement(shapesFactory, parent, newModifiers, map["element"], ref); + refFix->getParentBone()->setRecursion(rec); + rec->model = refFix->getParentBone(); + for(int i = 0; i < nb; i++) { + newModifiers.append(modifier); + parent = GenomeBuilder::buildElement(shapesFactory, parent, newModifiers, map["element"], refFix->getParentBone()); + rec->childs << parent->getParentBone(); + } + + // Create the tail and add it to the rec + Bone* tailRef = NULL; + if(ref && ref->getRecursion()) { + tailRef = ref->getRecursion()->tail.first(); + } + Fixation* last = GenomeBuilder::buildElement(shapesFactory, parent, modifiers, map["tail"], tailRef); + rec->tail.append(last->getParentBone()); + return last; + } else { + qDebug() << "GenomeBuilder: Could not recognize the type !"; + } + } + + // So it's a fix/bones + if(map.contains("bones")) // Fixation + return GenomeBuilder::buildFix(shapesFactory, parent, modifiers, genome, ref); + else if(map.contains("endFix")) // Bone + return GenomeBuilder::buildBone(shapesFactory, parent, modifiers, genome, ref); + } + + Fixation* GenomeBuilder::buildBone(btShapesFactory* shapesFactory, Fixation *parent, + QList modifiers, QVariant boneGenome, Bone* ref) { + + // We apply the actual modifiers to this genome element + foreach(GenomeModifier* modifier, modifiers) + boneGenome = modifier->modify(boneGenome); + + QVariantMap boneMap = boneGenome.toMap(); + + // Radius & lenght + btScalar boneRadius = boneMap.value("radius").toDouble(); + btScalar boneLength = boneMap.value("length").toDouble(); + + btScalar endFixRadius = boneMap.value("endFix").toMap().value("radius").toDouble(); + + // Yaw & Roll (local) + QVariantMap localRotationMap = boneMap.value("localRotation").toMap(); + btScalar yAxisRot = localRotationMap.value("y").toDouble(); + btScalar zAxisRot = localRotationMap.value("z").toDouble(); + + // Limits + btVector3 lowerLimits, upperLimits; + QVariantMap lowerLimitsMap = boneMap.value("lowerLimits").toMap(); + QVariantMap upperLimitsMap = boneMap.value("upperLimits").toMap(); + + lowerLimits.setValue(lowerLimitsMap.value("x").toDouble(), + lowerLimitsMap.value("y").toDouble(), + lowerLimitsMap.value("z").toDouble()); + upperLimits.setValue(upperLimitsMap.value("x").toDouble(), + upperLimitsMap.value("y").toDouble(), + upperLimitsMap.value("z").toDouble()); + + Bone *bone = parent->addBone(yAxisRot,zAxisRot,boneRadius,boneLength,endFixRadius,lowerLimits,upperLimits); + bone->setMotorModifierData(boneMap["muscle"]); + + + // Get the correct ref + while(ref && ref->getRef()) { + ref = ref->getRef(); + } + // Set a back replication + bone->setRef(ref); + if(ref) + ref->addReferee(bone); + // Set the modifier in case of modification + bone->setModifiers(modifiers); + + + // Add bone recurcively + return GenomeBuilder::buildFix(shapesFactory, bone->getEndFixation(), modifiers, boneMap.value("endFix"), ref); + } + + Fixation* GenomeBuilder::buildFix( btShapesFactory* shapesFactory, Fixation *fix, + QList modifiers, QVariant fixGenotype, Bone* ref) { + + // We apply the actual modifiers to this genome element + foreach(GenomeModifier* modifier, modifiers) + fixGenotype = modifier->modify(fixGenotype); + + // ------------- + // -- sensors -- + // ------------- + foreach(QVariant sensorData, fixGenotype.toMap()["sensors"].toList()) { + QVariantMap sensorMap = sensorData.toMap(); + switch((SensorType)sensorMap["type"].toInt()) { + case accelerometerSensor: { + fix->addSensor(new AccelerometerSensor(sensorData, fix)); + } + break; + case gyroscopicSensor: { + + fix->addSensor(new GyroscopicSensor(sensorData, fix)); + } + break; + case positionSensor:{ + Fixation* referent = fix; + if(fix->getParentBone() && fix->getParentBone()->getParentFixation()) { + referent = fix->getParentBone()->getParentFixation(); + } + fix->addSensor(new PositionSensor(sensorData, fix->getEntity()->getShape()->getRoot(), fix)); + } + break; + case contactSensor:{ + + fix->addSensor(new ContactSensor(sensorData, fix)); + } + break; + case boxSmellSensor:{ + + fix->addSensor(new BoxSmellSensor(sensorData, fix)); + + break; + } + case distanceSensor:{ + + fix->addSensor(new DistanceSensor(sensorData, fix)); + } + break; + } + } + + // -------------- + // -- effector -- + // -------------- + foreach(QVariant effector, fixGenotype.toMap()["effectors"].toList()) { + QVariantMap effectorMap = effector.toMap(); + switch((EffectorType)effectorMap["type"].toInt()) { + + case rotationalMotorEffector: break; + case gripperEffector: { + fix->addEffector(new GripperEffector(effectorMap, fix)); + } + break; + case flyingEffector:{ + fix->addEffector(new FlyingEffector(effectorMap, fix)); + } + break; + } + } + + // ----------- + // -- bones -- + // ----------- + QVariantList bonesVariantList = fixGenotype.toMap().value("bones").toList(); + + Bone* correctRef = NULL; + int i = 0; + foreach(QVariant bone, bonesVariantList) + { + if(ref) + correctRef = ref->getEndFixation()->getBones()[i]; + + GenomeBuilder::buildElement(shapesFactory, fix, modifiers, bone, correctRef); + i++; + } + + return fix; + } + + Fixation* GenomeBuilder::buildRoot(btShapesFactory* shapesFactory, QVariant genotype, + btTransform initPos) { + // Get the data + QVariantMap treeShapeMap = genotype.toMap(); + QVariantMap rootFixMap = treeShapeMap.value("rootFix").toMap(); + // Construct the fixation + return new Fixation(shapesFactory, rootFixMap.value("radius").toDouble(), initPos); + } + +} diff --git a/src/genelab/core/factories/genome/genomebuilder.h b/src/genelab/core/factories/genome/genomebuilder.h new file mode 100644 index 0000000..6f2c341 --- /dev/null +++ b/src/genelab/core/factories/genome/genomebuilder.h @@ -0,0 +1,45 @@ +#ifndef GENOMEBUILDER_H +#define GENOMEBUILDER_H + +#include +#include +#include +#include + +#include "entity.h" + +#include "genomemodifier.h" + +namespace GeneCraftCore { + +class GenomeBuilder : public QObject +{ + Q_OBJECT +public: + explicit GenomeBuilder(QObject *parent = 0); + + // To create an entity with its genome + static Entity* buildEntity(QVariant genotype, + btShapesFactory *shapesFactory, + const btVector3 &initialPosition); + + // Create the root fixation + //static Fixation* createRootFromGenotype(btShapesFactory *shapesFactory, QVariant genotype, btTransform initTransform); + + // Build a fixation from the genome + //static void buildFixFromGenotype(btShapesFactory *shapesFactory, Fixation *fix, Fixation* root, QVariant fixGenotype); + + static Fixation* buildBone(btShapesFactory* shapesFactory, Fixation *parent, QList modifier, QVariant genome, Bone* ref); + static Fixation* buildFix(btShapesFactory* shapesFactory, Fixation *fix, QList modifier, QVariant genome, Bone* ref); + static Fixation* buildElement(btShapesFactory* shapesFactory, Fixation *parent, QList modifier, QVariant genome, Bone* ref); + static Fixation* buildRoot(btShapesFactory* shapesFactory, QVariant genotype, btTransform initPos); +signals: + +public slots: + +}; + +} + +#endif // GENOMEBUILDER_H + diff --git a/src/genelab/core/factories/genome/genomemodifier.cpp b/src/genelab/core/factories/genome/genomemodifier.cpp new file mode 100644 index 0000000..5e086b7 --- /dev/null +++ b/src/genelab/core/factories/genome/genomemodifier.cpp @@ -0,0 +1,116 @@ +#include "genomemodifier.h" +#include + +namespace GeneCraftCore { + + GenomeModifier::GenomeModifier(QObject *parent) : + QObject(parent) + { + isPhysSym = false; + isPhysScale = false; + isNeuralSym = false; + isNeuralRot = false; + + physSym = 0.; + physScale = 1.; + neuralSym = 0.; + neuralAlpha = 0.; + neuralDelta = 0.; + + } + + // Set the modifications parameters + void GenomeModifier::setPhysicalSymmetry(btScalar alpha) { + isPhysSym = true; + physSym = alpha; + } + + void GenomeModifier::setPhysicalScale (btScalar scale) { + isPhysScale = true; + physScale = scale; + } + + void GenomeModifier::setNeuralSymmetry (btScalar alpha) { + isNeuralSym = true; + neuralSym = alpha; + } + + void GenomeModifier::setNeuralRotation (btScalar alpha, btScalar delta) { + isNeuralRot = true; + neuralAlpha = alpha; + neuralDelta = delta; + } + + // The modification will be applied to the bone element and all bone childs + QVariant GenomeModifier::modify(QVariant element) { + QVariantMap map = element.toMap(); + QString type = map["type"].toString(); + if(map.contains("endFix")) { // Bone + // Modify physical parameters + if(isPhysSym) + applyBoneSymmetry(map); + + if(isPhysScale) + applyBoneScale(map); + + } else if(map.contains("bones")) { // Fixation + + // Modify physical parameters + if(isPhysSym) + applyFixSymmetry(map); + + if(isPhysScale) + applyFixScale(map); + } + + return map; + } + + + void GenomeModifier::applyBoneSymmetry(QVariantMap& element) { + + // moving X by sym + // inversing y + QVariantMap rot = element["localRotation"].toMap(); + rot["z"] = rot["z"].toFloat() + physSym; + rot["y"] = -rot["y"].toFloat(); + element["localRotation"] = rot; + + // inversiong some freedom degree to keep coherence + QVariantMap lo = element["lowerLimits"].toMap(); + QVariantMap hi = element["upperLimits"].toMap(); + btScalar loX, loY; + loX = lo["x"].toFloat(); + loY = lo["y"].toFloat(); + lo["x"] = -hi["x"].toFloat(); + hi["x"] = -loX; + lo["y"] = -hi["y"].toFloat(); + hi["y"] = -loY; + element["lowerLimits"] = lo; + element["upperLimits"] = hi; + + } + + void GenomeModifier::applyBoneScale (QVariantMap& element) { + // Reduce length and radius + element["length"] = element["length"].toFloat()*physScale; + element["radius"] = element["radius"].toFloat()*physScale; + + QVariantMap endFix = element["endFix"].toMap(); + this->applyFixScale(endFix); + + element["endFix"] = endFix; + + } + + + void GenomeModifier::applyFixSymmetry(QVariantMap& element) { + // Nothing to do... + } + + void GenomeModifier::applyFixScale(QVariantMap& element) { + // Radius + element["radius"] = element["radius"].toFloat()*physScale; + } + +} diff --git a/src/genelab/core/factories/genome/genomemodifier.h b/src/genelab/core/factories/genome/genomemodifier.h new file mode 100644 index 0000000..41965e5 --- /dev/null +++ b/src/genelab/core/factories/genome/genomemodifier.h @@ -0,0 +1,52 @@ +#ifndef GENOMEMODIFIER_H +#define GENOMEMODIFIER_H + +#include +#include +#include +#include "btBulletCollisionCommon.h" + +namespace GeneCraftCore { + +class GenomeModifier : public QObject +{ + Q_OBJECT +public: + explicit GenomeModifier(QObject *parent = 0); + + // Set the modifications parameters + void setPhysicalSymmetry(btScalar alpha); + void setPhysicalScale (btScalar scale); + void setNeuralSymmetry (btScalar alpha); + void setNeuralRotation (btScalar alpha, btScalar delta); + + // The modification will be applied to the bone element and all bone childs + QVariant modify(QVariant element); + + void applyBoneSymmetry(QVariantMap& element); + void applyBoneScale (QVariantMap& element); + + void applyFixSymmetry(QVariantMap& element); + void applyFixScale(QVariantMap& element); + + +protected: + bool isPhysSym; + bool isPhysScale; + bool isNeuralSym; + bool isNeuralRot; + + btScalar physSym; + btScalar physScale; + btScalar neuralSym; + btScalar neuralAlpha; + btScalar neuralDelta; + +signals: + +public slots: + +}; + +} +#endif // GENOMEMODIFIER_H diff --git a/src/genelab/core/ui/widgets/graphicalwidget.cpp b/src/genelab/core/ui/widgets/graphicalwidget.cpp new file mode 100644 index 0000000..ebd932b --- /dev/null +++ b/src/genelab/core/ui/widgets/graphicalwidget.cpp @@ -0,0 +1,8 @@ +#include "graphicalwidget.h" + +namespace GeneCraftCore { +GraphicalWidget::GraphicalWidget(QWidget *parent) : + QWidget(parent) +{ +} +} diff --git a/src/genelab/core/ui/widgets/graphicalwidget.h b/src/genelab/core/ui/widgets/graphicalwidget.h new file mode 100644 index 0000000..6453d33 --- /dev/null +++ b/src/genelab/core/ui/widgets/graphicalwidget.h @@ -0,0 +1,20 @@ +#ifndef GRAPHICALWIDGET_H +#define GRAPHICALWIDGET_H + +#include + +namespace GeneCraftCore { +class GraphicalWidget : public QWidget +{ + Q_OBJECT +public: + explicit GraphicalWidget(QWidget *parent = 0); + + virtual void step() = 0; +signals: + +public slots: + +}; +} +#endif // GRAPHICALWIDGET_H From bb1f9e825a7a72a158cd0177da45e432aec03bf3 Mon Sep 17 00:00:00 2001 From: Cyprien Huissoud Date: Wed, 19 Oct 2011 13:37:35 +0200 Subject: [PATCH 3/7] moving genelab -> genecraft to reflect master --- .../inputlisteners/creatureviewerinputmanager.cpp | 0 .../inputlisteners/creatureviewerinputmanager.h | 0 .../creatureviewer/ui/creatureviewerabout.cpp | 0 .../creatureviewer/ui/creatureviewerabout.h | 0 .../creatureviewer/ui/creatureviewerabout.ui | 0 .../creatureviewer/ui/creatureviewerwindow.cpp | 0 .../creatureviewer/ui/creatureviewerwindow.h | 0 .../creatureviewer/ui/creatureviewerwindow.ui | 0 .../genecraft}/creatureviewer/ui/welcomewidget.cpp | 0 .../genecraft}/creatureviewer/ui/welcomewidget.h | 0 .../genecraft}/creatureviewer/ui/welcomewidget.ui | 0 .../apps/sandbox/brainsandbox/brainapp.ui | 0 .../apps/sandbox/entitysandbox/entitysandbox.cpp | 0 .../apps/sandbox/entitysandbox/entitysandbox.h | 0 .../apps/sandbox/entitysandbox/entitysandbox.ui | 0 .../core/engines/brains/brainengine.cpp | 0 .../core/engines/brains/brainengine.h | 0 .../core/engines/bullet/bulletengine.cpp | 0 .../core/engines/bullet/bulletengine.h | 0 .../core/engines/bullet/rigidbodyorigin.cpp | 0 .../core/engines/bullet/rigidbodyorigin.h | 0 .../core/engines/bullet/shapes/btbone.cpp | 0 .../core/engines/bullet/shapes/btbone.h | 0 .../core/engines/bullet/shapes/btbox.cpp | 0 .../core/engines/bullet/shapes/btbox.h | 0 .../core/engines/bullet/shapes/btcylinder.cpp | 0 .../core/engines/bullet/shapes/btcylinder.h | 0 .../core/engines/bullet/shapes/btshape.cpp | 0 .../core/engines/bullet/shapes/btshape.h | 0 .../core/engines/bullet/shapes/btsphere.cpp | 0 .../core/engines/bullet/shapes/btsphere.h | 0 .../core/engines/bulletogre/bulletogreengine.cpp | 0 .../core/engines/bulletogre/bulletogreengine.h | 0 .../core/engines/bulletogre/shapes/btobone.cpp | 0 .../core/engines/bulletogre/shapes/btobone.h | 0 .../core/engines/bulletogre/shapes/btobox.cpp | 0 .../core/engines/bulletogre/shapes/btobox.h | 0 .../core/engines/bulletogre/shapes/btocylinder.cpp | 0 .../core/engines/bulletogre/shapes/btocylinder.h | 0 .../core/engines/bulletogre/shapes/btosphere.cpp | 0 .../core/engines/bulletogre/shapes/btosphere.h | 0 src/{genelab => genecraft}/core/engines/engine.cpp | 0 src/{genelab => genecraft}/core/engines/engine.h | 0 .../core/engines/entities/entitiesengine.cpp | 0 .../core/engines/entities/entitiesengine.h | 0 .../core/engines/events/eventsmanager.cpp | 0 .../core/engines/events/eventsmanager.h | 0 .../core/engines/events/inputlistener.cpp | 0 .../core/engines/events/inputlistener.h | 0 .../core/engines/events/inspectorsinputmanager.cpp | 0 .../core/engines/events/inspectorsinputmanager.h | 0 .../core/engines/ogre/entities/ogrefreecamera.cpp | 0 .../core/engines/ogre/entities/ogrefreecamera.h | 0 .../core/engines/ogre/ogreengine.cpp | 0 .../core/engines/ogre/ogreengine.h | 0 .../core/engines/ogre/ogrewidget.cpp | 0 .../core/engines/ogre/ogrewidget.h | 0 .../core/engines/simulationmanager.cpp | 0 .../core/engines/simulationmanager.h | 0 .../core/engines/terrain/terrain.cpp | 0 .../core/engines/terrain/terrain.h | 0 .../core/entities/body/bone.cpp | 0 .../core/entities/body/bone.h | 0 .../core/entities/body/fixation.cpp | 0 .../core/entities/body/fixation.h | 0 .../core/entities/body/recursion.cpp | 0 .../core/entities/body/recursion.h | 0 .../core/entities/body/symmetry.cpp | 0 .../core/entities/body/symmetry.h | 0 .../core/entities/body/treeshape.cpp | 0 .../core/entities/body/treeshape.h | 0 .../core/entities/brain/brain.cpp | 0 .../core/entities/brain/brain.h | 0 .../core/entities/brain/brainfunctional.cpp | 0 .../core/entities/brain/brainfunctional.h | 0 .../core/entities/brain/brainin.cpp | 0 .../core/entities/brain/brainin.h | 0 .../core/entities/brain/brainnode.cpp | 0 .../core/entities/brain/brainnode.h | 0 .../core/entities/brain/brainout.cpp | 0 .../core/entities/brain/brainout.h | 0 .../core/entities/brain/brainpluggrid.cpp | 0 .../core/entities/brain/brainpluggrid.h | 0 .../core/entities/brain/sinusin.cpp | 0 .../core/entities/brain/sinusin.h | 0 .../core/entities/brain/synapse.cpp | 0 .../core/entities/brain/synapse.h | 0 .../core/entities/effectors/effector.cpp | 0 .../core/entities/effectors/effector.h | 0 .../core/entities/effectors/flyingeffector.cpp | 0 .../core/entities/effectors/flyingeffector.h | 0 .../core/entities/effectors/grippereffector.cpp | 0 .../core/entities/effectors/grippereffector.h | 0 .../entities/effectors/rotationalmotorseffector.cpp | 0 .../entities/effectors/rotationalmotorseffector.h | 0 src/{genelab => genecraft}/core/entities/entity.cpp | 0 src/{genelab => genecraft}/core/entities/entity.h | 0 .../core/entities/entityfamily.cpp | 0 .../core/entities/entityfamily.h | 0 .../core/entities/families/antfamily.cpp | 0 .../core/entities/families/antfamily.h | 0 .../core/entities/families/caterpillarfamily.cpp | 0 .../core/entities/families/caterpillarfamily.h | 0 .../core/entities/families/genericfamily.cpp | 0 .../core/entities/families/genericfamily.h | 0 .../core/entities/families/snakefamily.cpp | 0 .../core/entities/families/snakefamily.h | 0 .../core/entities/families/spiderfamily.cpp | 0 .../core/entities/families/spiderfamily.h | 0 .../core/entities/mutation/bonelimitsmutation.cpp | 0 .../core/entities/mutation/bonelimitsmutation.h | 0 .../core/entities/mutation/brainnodemutation.cpp | 0 .../core/entities/mutation/brainnodemutation.h | 0 .../core/entities/mutation/crossovermanager.cpp | 0 .../core/entities/mutation/crossovermanager.h | 0 .../core/entities/mutation/floatmutation.cpp | 0 .../core/entities/mutation/floatmutation.h | 0 .../core/entities/mutation/integermutation.cpp | 0 .../core/entities/mutation/integermutation.h | 0 .../core/entities/mutation/mutation.cpp | 0 .../core/entities/mutation/mutation.h | 0 .../core/entities/mutation/mutationsmanager.cpp | 0 .../core/entities/mutation/mutationsmanager.h | 0 .../entities/mutation/simpleprobabilitymutation.cpp | 0 .../entities/mutation/simpleprobabilitymutation.h | 0 .../core/entities/mutation/structurallist.cpp | 0 .../core/entities/mutation/structurallist.h | 0 .../core/entities/mutation/structuralmutation.cpp | 0 .../core/entities/mutation/structuralmutation.h | 0 .../core/entities/ogrebulletentity.cpp | 0 .../core/entities/ogrebulletentityfamily.cpp | 0 .../core/entities/sensors/accelerometersensor.cpp | 0 .../core/entities/sensors/accelerometersensor.h | 0 .../core/entities/sensors/boxsmellsensor.cpp | 0 .../core/entities/sensors/boxsmellsensor.h | 0 .../core/entities/sensors/contactsensor.cpp | 0 .../core/entities/sensors/contactsensor.h | 0 .../core/entities/sensors/distancesensor.cpp | 0 .../core/entities/sensors/distancesensor.h | 0 .../core/entities/sensors/gyroscopicsensor.cpp | 0 .../core/entities/sensors/gyroscopicsensor.h | 0 .../core/entities/sensors/positionsensor.cpp | 0 .../core/entities/sensors/positionsensor.h | 0 .../core/entities/sensors/sensor.cpp | 0 .../core/entities/sensors/sensor.h | 0 .../core/entities/sensors/smellsensor.cpp | 0 .../core/entities/sensors/smellsensor.h | 0 .../core/entities/statistics/fixationstats.cpp | 0 .../core/entities/statistics/fixationstats.h | 0 .../core/entities/statistics/statisticsprovider.cpp | 0 .../core/entities/statistics/statisticsprovider.h | 0 .../core/entities/statistics/statisticsstorage.cpp | 0 .../core/entities/statistics/statisticsstorage.h | 0 .../core/entities/statistics/treeshapestats.cpp | 0 .../core/entities/statistics/treeshapestats.h | 0 .../core/experiment/experiment.cpp | 0 .../core/experiment/experiment.h | 0 .../core/experiment/experimentmanager.cpp | 0 .../core/experiment/experimentmanager.h | 0 .../core/experiment/result.cpp | 0 src/{genelab => genecraft}/core/experiment/result.h | 0 .../core/experiment/resultsmanager.cpp | 0 .../core/experiment/resultsmanager.h | 0 .../core/factories/btfactory.cpp | 0 .../core/factories/btfactory.h | 0 .../core/factories/btofactory.cpp | 0 .../core/factories/btofactory.h | 0 .../core/factories/btoshapesfactory.cpp | 0 .../core/factories/btoshapesfactory.h | 0 .../core/factories/btoworldfactory.cpp | 0 .../core/factories/btoworldfactory.h | 0 .../core/factories/btshapesfactory.cpp | 0 .../core/factories/btshapesfactory.h | 0 .../core/factories/btworldfactory.cpp | 0 .../core/factories/btworldfactory.h | 0 .../core/factories/creaturefactory.cpp | 0 .../core/factories/creaturefactory.h | 0 .../core/factories/genome/genomebuilder.cpp | 0 .../core/factories/genome/genomebuilder.h | 0 .../core/factories/genome/genomemodifier.cpp | 0 .../core/factories/genome/genomemodifier.h | 0 .../core/factories/ressources/dbrecord.cpp | 0 .../core/factories/ressources/dbrecord.h | 0 .../core/factories/ressources/jsonfile.cpp | 0 .../core/factories/ressources/jsonfile.h | 0 .../core/factories/ressources/ressource.cpp | 0 .../core/factories/ressources/ressource.h | 0 .../core/factories/ressources/ressourcesmanager.cpp | 0 .../core/factories/ressources/ressourcesmanager.h | 0 .../core/factories/worldfactory.cpp | 0 .../core/factories/worldfactory.h | 0 .../core/genecraftcoreclasses.h | 0 .../core/genelabcoreclasses.h | 0 .../core/ressources/help/welcome.html | 0 .../core/ressources/img/icons/add.png | Bin .../core/ressources/img/icons/anchor.png | Bin .../core/ressources/img/icons/arrow_down.png | Bin .../core/ressources/img/icons/arrow_merge.png | Bin .../core/ressources/img/icons/arrow_refresh.png | Bin .../core/ressources/img/icons/arrow_switch.png | Bin .../core/ressources/img/icons/arrow_up.png | Bin .../core/ressources/img/icons/bone.png | Bin .../core/ressources/img/icons/bone_2.png | Bin .../core/ressources/img/icons/bone_add.png | Bin .../core/ressources/img/icons/bone_and_fixation.png | Bin .../core/ressources/img/icons/bone_delete.png | Bin .../core/ressources/img/icons/brain.png | Bin .../core/ressources/img/icons/brain_activity.png | Bin .../core/ressources/img/icons/brain_connections.png | Bin .../core/ressources/img/icons/bug.png | Bin .../core/ressources/img/icons/bug_add.png | Bin .../core/ressources/img/icons/bug_add_from_bdd.png | Bin .../core/ressources/img/icons/bug_add_random.png | Bin .../core/ressources/img/icons/bug_camera.png | Bin .../core/ressources/img/icons/bug_delete.png | Bin .../core/ressources/img/icons/bug_delete_all.png | Bin .../img/icons/bug_delete_all_except_one.png | Bin .../core/ressources/img/icons/bug_error.png | Bin .../core/ressources/img/icons/bug_mutation.png | Bin .../core/ressources/img/icons/bug_save.png | Bin .../core/ressources/img/icons/bug_shadow.png | Bin .../core/ressources/img/icons/bugs.png | Bin .../core/ressources/img/icons/bugs_go.png | Bin .../core/ressources/img/icons/bullet_add.png | Bin .../core/ressources/img/icons/bullet_edit.png | Bin .../core/ressources/img/icons/bullet_feed.png | Bin .../ressources/img/icons/bullet_physics_library.png | Bin .../img/icons/bullet_physics_library_play.png | Bin .../img/icons/bullet_physics_library_stop.png | Bin .../core/ressources/img/icons/camera.png | Bin .../core/ressources/img/icons/chart_curve.png | Bin .../core/ressources/img/icons/chart_line.png | Bin .../core/ressources/img/icons/cog.png | Bin .../core/ressources/img/icons/cog_add.png | Bin .../core/ressources/img/icons/cog_delete.png | Bin .../core/ressources/img/icons/cog_feed.png | Bin .../core/ressources/img/icons/cog_go.png | Bin .../core/ressources/img/icons/control_play_blue.png | Bin .../core/ressources/img/icons/database.png | Bin .../core/ressources/img/icons/delete.png | Bin .../core/ressources/img/icons/dna.png | Bin .../core/ressources/img/icons/dna_32.png | Bin .../core/ressources/img/icons/dna_64.png | Bin .../core/ressources/img/icons/door_out.png | Bin .../core/ressources/img/icons/entity_new.png | Bin .../core/ressources/img/icons/entity_vcard.png | Bin .../core/ressources/img/icons/feed.png | Bin .../core/ressources/img/icons/feed_add.png | Bin .../core/ressources/img/icons/feed_delete.png | Bin .../core/ressources/img/icons/fixation.png | Bin .../core/ressources/img/icons/folder_report.png | Bin .../core/ressources/img/icons/folder_world.png | Bin .../core/ressources/img/icons/help.png | Bin .../core/ressources/img/icons/information.png | Bin .../core/ressources/img/icons/magnifier.png | Bin .../core/ressources/img/icons/new.png | Bin .../core/ressources/img/icons/page_green.png | Bin .../ressources/img/icons/page_white_magnify.png | Bin .../core/ressources/img/icons/report.png | Bin .../core/ressources/img/icons/report_disk.png | Bin .../core/ressources/img/icons/report_go.png | Bin .../core/ressources/img/icons/ruler_pencil_32.png | Bin .../core/ressources/img/icons/theater_32.png | Bin .../core/ressources/img/icons/thumbtack.png | Bin .../core/ressources/img/icons/world.png | Bin .../core/ressources/img/icons/world_save.png | Bin .../core/ressources/img/icons/wrench.png | Bin .../core/ressources/img/logos/GeneCraft.png | Bin .../core/ressources/img/logos/splash.png | Bin .../core/ressources/img/logos/splash.xcf | Bin .../core/ressources/js/js-beautifull.js | 0 .../core/ressources/ressources.qrc | 0 .../core/ui/widgets/entities/bodyitems.h | 0 .../widgets/entities/bonepropertiescontroller.cpp | 0 .../ui/widgets/entities/bonepropertiescontroller.h | 0 .../ui/widgets/entities/bonepropertiescontroller.ui | 0 .../widgets/entities/brainpropertiescontroller.cpp | 0 .../ui/widgets/entities/brainpropertiescontroller.h | 0 .../widgets/entities/brainpropertiescontroller.ui | 0 .../widgets/entities/entitypropertiescontroller.cpp | 0 .../widgets/entities/entitypropertiescontroller.h | 0 .../widgets/entities/entitypropertiescontroller.ui | 0 .../entities/fixationpropertiescontroller.cpp | 0 .../widgets/entities/fixationpropertiescontroller.h | 0 .../entities/fixationpropertiescontroller.ui | 0 .../entities/generic6dofconstraintcontroller.cpp | 0 .../entities/generic6dofconstraintcontroller.h | 0 .../entities/generic6dofconstraintcontroller.ui | 0 .../widgets/entities/pluggriddesignvisualizer.cpp | 0 .../ui/widgets/entities/pluggriddesignvisualizer.h | 0 .../core/ui/widgets/entities/pluggridvisualizer.cpp | 0 .../core/ui/widgets/entities/pluggridvisualizer.h | 0 .../entities/statisticspropertiescontroller.cpp | 0 .../entities/statisticspropertiescontroller.h | 0 .../entities/statisticspropertiescontroller.ui | 0 .../core/ui/widgets/experiments/conversionctrl.cpp | 0 .../core/ui/widgets/experiments/conversionctrl.h | 0 .../core/ui/widgets/experiments/conversionctrl.ui | 0 .../core/ui/widgets/experiments/experimentctrl.cpp | 0 .../core/ui/widgets/experiments/experimentctrl.h | 0 .../core/ui/widgets/experiments/experimentctrl.ui | 0 .../experiments/experimentspropertiescontroller.cpp | 0 .../experiments/experimentspropertiescontroller.h | 0 .../experiments/experimentspropertiescontroller.ui | 0 .../widgets/experiments/floatmutationcontroller.cpp | 0 .../widgets/experiments/floatmutationcontroller.h | 0 .../widgets/experiments/floatmutationcontroller.ui | 0 .../core/ui/widgets/experiments/floordialog.cpp | 0 .../core/ui/widgets/experiments/floordialog.h | 0 .../core/ui/widgets/experiments/floordialog.ui | 0 .../experiments/integermutationcontroller.cpp | 0 .../widgets/experiments/integermutationcontroller.h | 0 .../experiments/integermutationcontroller.ui | 0 .../experiments/mutationelementcontroller.cpp | 0 .../widgets/experiments/mutationelementcontroller.h | 0 .../experiments/mutationelementcontroller.ui | 0 .../core/ui/widgets/experiments/ressourcesItems.h | 0 .../ui/widgets/experiments/ressourcesbrowser.cpp | 0 .../core/ui/widgets/experiments/ressourcesbrowser.h | 0 .../ui/widgets/experiments/ressourcesbrowser.ui | 0 .../experiments/simpleprobabilitycontroller.cpp | 0 .../experiments/simpleprobabilitycontroller.h | 0 .../experiments/simpleprobabilitycontroller.ui | 0 .../experiments/structuralmutationcontroller.cpp | 0 .../experiments/structuralmutationcontroller.h | 0 .../experiments/structuralmutationcontroller.ui | 0 .../ui/widgets/experiments/workerconfiguration.cpp | 0 .../ui/widgets/experiments/workerconfiguration.h | 0 .../ui/widgets/experiments/workerconfiguration.ui | 0 .../core/ui/widgets/experiments/workerctrl.cpp | 0 .../core/ui/widgets/experiments/workerctrl.h | 0 .../core/ui/widgets/experiments/workerctrl.ui | 0 .../core/ui/widgets/graphicalwidget.cpp | 0 .../core/ui/widgets/graphicalwidget.h | 0 .../core/ui/widgets/ogrebulletwindows.cpp | 0 .../core/ui/widgets/ogrebulletwindows.h | 0 .../core/ui/widgets/ogrebulletwindows.ui | 0 .../core/ui/widgets/plot/fitnessplot.cpp | 0 .../core/ui/widgets/plot/fitnessplot.h | 0 .../core/utils/js-beautifull.js | 0 .../core/utils/sandboxtools.cpp | 0 .../core/utils/sandboxtools.h | 0 src/{genelab => genecraft}/core/utils/tools.cpp | 0 src/{genelab => genecraft}/core/utils/tools.h | 0 src/{genelab => genecraft}/core/world/btbiome.cpp | 0 src/{genelab => genecraft}/core/world/btbiome.h | 0 src/{genelab => genecraft}/core/world/btobiome.cpp | 0 src/{genelab => genecraft}/core/world/btobiome.h | 0 src/{genelab => genecraft}/core/world/btoscene.cpp | 0 src/{genelab => genecraft}/core/world/btoscene.h | 0 src/{genelab => genecraft}/core/world/btoworld.cpp | 0 src/{genelab => genecraft}/core/world/btoworld.h | 0 src/{genelab => genecraft}/core/world/btscene.cpp | 0 src/{genelab => genecraft}/core/world/btscene.h | 0 src/{genelab => genecraft}/core/world/btworld.cpp | 0 src/{genelab => genecraft}/core/world/btworld.h | 0 src/{genelab => genecraft}/core/world/spawn.cpp | 0 src/{genelab => genecraft}/core/world/spawn.h | 0 .../genelab_global.pro | 0 .../genelab_global.pro.user.2.2pre5 | 0 .../genelabmainwindow.cpp | 0 .../genelabmainwindow.h | 0 .../genelabmainwindow.ui | 0 src/{genelab_global => genecraft_global}/main.cpp | 0 .../genelab_worker.pro | 0 src/{genelab_worker => genecraft_worker}/main.cpp | 0 src/{genelab_worker => genecraft_worker}/spider.exp | 0 367 files changed, 0 insertions(+), 0 deletions(-) rename src/{genelab/apps/genelab => genecraft/apps/genecraft}/creatureviewer/inputlisteners/creatureviewerinputmanager.cpp (100%) rename src/{genelab/apps/genelab => genecraft/apps/genecraft}/creatureviewer/inputlisteners/creatureviewerinputmanager.h (100%) rename src/{genelab/apps/genelab => genecraft/apps/genecraft}/creatureviewer/ui/creatureviewerabout.cpp (100%) rename src/{genelab/apps/genelab => genecraft/apps/genecraft}/creatureviewer/ui/creatureviewerabout.h (100%) rename src/{genelab/apps/genelab => genecraft/apps/genecraft}/creatureviewer/ui/creatureviewerabout.ui (100%) rename src/{genelab/apps/genelab => genecraft/apps/genecraft}/creatureviewer/ui/creatureviewerwindow.cpp (100%) rename src/{genelab/apps/genelab => genecraft/apps/genecraft}/creatureviewer/ui/creatureviewerwindow.h (100%) rename src/{genelab/apps/genelab => genecraft/apps/genecraft}/creatureviewer/ui/creatureviewerwindow.ui (100%) rename src/{genelab/apps/genelab => genecraft/apps/genecraft}/creatureviewer/ui/welcomewidget.cpp (100%) rename src/{genelab/apps/genelab => genecraft/apps/genecraft}/creatureviewer/ui/welcomewidget.h (100%) rename src/{genelab/apps/genelab => genecraft/apps/genecraft}/creatureviewer/ui/welcomewidget.ui (100%) rename src/{genelab => genecraft}/apps/sandbox/brainsandbox/brainapp.ui (100%) rename src/{genelab => genecraft}/apps/sandbox/entitysandbox/entitysandbox.cpp (100%) rename src/{genelab => genecraft}/apps/sandbox/entitysandbox/entitysandbox.h (100%) rename src/{genelab => genecraft}/apps/sandbox/entitysandbox/entitysandbox.ui (100%) rename src/{genelab => genecraft}/core/engines/brains/brainengine.cpp (100%) rename src/{genelab => genecraft}/core/engines/brains/brainengine.h (100%) rename src/{genelab => genecraft}/core/engines/bullet/bulletengine.cpp (100%) rename src/{genelab => genecraft}/core/engines/bullet/bulletengine.h (100%) rename src/{genelab => genecraft}/core/engines/bullet/rigidbodyorigin.cpp (100%) rename src/{genelab => genecraft}/core/engines/bullet/rigidbodyorigin.h (100%) rename src/{genelab => genecraft}/core/engines/bullet/shapes/btbone.cpp (100%) rename src/{genelab => genecraft}/core/engines/bullet/shapes/btbone.h (100%) rename src/{genelab => genecraft}/core/engines/bullet/shapes/btbox.cpp (100%) rename src/{genelab => genecraft}/core/engines/bullet/shapes/btbox.h (100%) rename src/{genelab => genecraft}/core/engines/bullet/shapes/btcylinder.cpp (100%) rename src/{genelab => genecraft}/core/engines/bullet/shapes/btcylinder.h (100%) rename src/{genelab => genecraft}/core/engines/bullet/shapes/btshape.cpp (100%) rename src/{genelab => genecraft}/core/engines/bullet/shapes/btshape.h (100%) rename src/{genelab => genecraft}/core/engines/bullet/shapes/btsphere.cpp (100%) rename src/{genelab => genecraft}/core/engines/bullet/shapes/btsphere.h (100%) rename src/{genelab => genecraft}/core/engines/bulletogre/bulletogreengine.cpp (100%) rename src/{genelab => genecraft}/core/engines/bulletogre/bulletogreengine.h (100%) rename src/{genelab => genecraft}/core/engines/bulletogre/shapes/btobone.cpp (100%) rename src/{genelab => genecraft}/core/engines/bulletogre/shapes/btobone.h (100%) rename src/{genelab => genecraft}/core/engines/bulletogre/shapes/btobox.cpp (100%) rename src/{genelab => genecraft}/core/engines/bulletogre/shapes/btobox.h (100%) rename src/{genelab => genecraft}/core/engines/bulletogre/shapes/btocylinder.cpp (100%) rename src/{genelab => genecraft}/core/engines/bulletogre/shapes/btocylinder.h (100%) rename src/{genelab => genecraft}/core/engines/bulletogre/shapes/btosphere.cpp (100%) rename src/{genelab => genecraft}/core/engines/bulletogre/shapes/btosphere.h (100%) rename src/{genelab => genecraft}/core/engines/engine.cpp (100%) rename src/{genelab => genecraft}/core/engines/engine.h (100%) rename src/{genelab => genecraft}/core/engines/entities/entitiesengine.cpp (100%) rename src/{genelab => genecraft}/core/engines/entities/entitiesengine.h (100%) rename src/{genelab => genecraft}/core/engines/events/eventsmanager.cpp (100%) rename src/{genelab => genecraft}/core/engines/events/eventsmanager.h (100%) rename src/{genelab => genecraft}/core/engines/events/inputlistener.cpp (100%) rename src/{genelab => genecraft}/core/engines/events/inputlistener.h (100%) rename src/{genelab => genecraft}/core/engines/events/inspectorsinputmanager.cpp (100%) rename src/{genelab => genecraft}/core/engines/events/inspectorsinputmanager.h (100%) rename src/{genelab => genecraft}/core/engines/ogre/entities/ogrefreecamera.cpp (100%) rename src/{genelab => genecraft}/core/engines/ogre/entities/ogrefreecamera.h (100%) rename src/{genelab => genecraft}/core/engines/ogre/ogreengine.cpp (100%) rename src/{genelab => genecraft}/core/engines/ogre/ogreengine.h (100%) rename src/{genelab => genecraft}/core/engines/ogre/ogrewidget.cpp (100%) rename src/{genelab => genecraft}/core/engines/ogre/ogrewidget.h (100%) rename src/{genelab => genecraft}/core/engines/simulationmanager.cpp (100%) rename src/{genelab => genecraft}/core/engines/simulationmanager.h (100%) rename src/{genelab => genecraft}/core/engines/terrain/terrain.cpp (100%) rename src/{genelab => genecraft}/core/engines/terrain/terrain.h (100%) rename src/{genelab => genecraft}/core/entities/body/bone.cpp (100%) rename src/{genelab => genecraft}/core/entities/body/bone.h (100%) rename src/{genelab => genecraft}/core/entities/body/fixation.cpp (100%) rename src/{genelab => genecraft}/core/entities/body/fixation.h (100%) rename src/{genelab => genecraft}/core/entities/body/recursion.cpp (100%) rename src/{genelab => genecraft}/core/entities/body/recursion.h (100%) rename src/{genelab => genecraft}/core/entities/body/symmetry.cpp (100%) rename src/{genelab => genecraft}/core/entities/body/symmetry.h (100%) rename src/{genelab => genecraft}/core/entities/body/treeshape.cpp (100%) rename src/{genelab => genecraft}/core/entities/body/treeshape.h (100%) rename src/{genelab => genecraft}/core/entities/brain/brain.cpp (100%) rename src/{genelab => genecraft}/core/entities/brain/brain.h (100%) rename src/{genelab => genecraft}/core/entities/brain/brainfunctional.cpp (100%) rename src/{genelab => genecraft}/core/entities/brain/brainfunctional.h (100%) rename src/{genelab => genecraft}/core/entities/brain/brainin.cpp (100%) rename src/{genelab => genecraft}/core/entities/brain/brainin.h (100%) rename src/{genelab => genecraft}/core/entities/brain/brainnode.cpp (100%) rename src/{genelab => genecraft}/core/entities/brain/brainnode.h (100%) rename src/{genelab => genecraft}/core/entities/brain/brainout.cpp (100%) rename src/{genelab => genecraft}/core/entities/brain/brainout.h (100%) rename src/{genelab => genecraft}/core/entities/brain/brainpluggrid.cpp (100%) rename src/{genelab => genecraft}/core/entities/brain/brainpluggrid.h (100%) rename src/{genelab => genecraft}/core/entities/brain/sinusin.cpp (100%) rename src/{genelab => genecraft}/core/entities/brain/sinusin.h (100%) rename src/{genelab => genecraft}/core/entities/brain/synapse.cpp (100%) rename src/{genelab => genecraft}/core/entities/brain/synapse.h (100%) rename src/{genelab => genecraft}/core/entities/effectors/effector.cpp (100%) rename src/{genelab => genecraft}/core/entities/effectors/effector.h (100%) rename src/{genelab => genecraft}/core/entities/effectors/flyingeffector.cpp (100%) rename src/{genelab => genecraft}/core/entities/effectors/flyingeffector.h (100%) rename src/{genelab => genecraft}/core/entities/effectors/grippereffector.cpp (100%) rename src/{genelab => genecraft}/core/entities/effectors/grippereffector.h (100%) rename src/{genelab => genecraft}/core/entities/effectors/rotationalmotorseffector.cpp (100%) rename src/{genelab => genecraft}/core/entities/effectors/rotationalmotorseffector.h (100%) rename src/{genelab => genecraft}/core/entities/entity.cpp (100%) rename src/{genelab => genecraft}/core/entities/entity.h (100%) rename src/{genelab => genecraft}/core/entities/entityfamily.cpp (100%) rename src/{genelab => genecraft}/core/entities/entityfamily.h (100%) rename src/{genelab => genecraft}/core/entities/families/antfamily.cpp (100%) rename src/{genelab => genecraft}/core/entities/families/antfamily.h (100%) rename src/{genelab => genecraft}/core/entities/families/caterpillarfamily.cpp (100%) rename src/{genelab => genecraft}/core/entities/families/caterpillarfamily.h (100%) rename src/{genelab => genecraft}/core/entities/families/genericfamily.cpp (100%) rename src/{genelab => genecraft}/core/entities/families/genericfamily.h (100%) rename src/{genelab => genecraft}/core/entities/families/snakefamily.cpp (100%) rename src/{genelab => genecraft}/core/entities/families/snakefamily.h (100%) rename src/{genelab => genecraft}/core/entities/families/spiderfamily.cpp (100%) rename src/{genelab => genecraft}/core/entities/families/spiderfamily.h (100%) rename src/{genelab => genecraft}/core/entities/mutation/bonelimitsmutation.cpp (100%) rename src/{genelab => genecraft}/core/entities/mutation/bonelimitsmutation.h (100%) rename src/{genelab => genecraft}/core/entities/mutation/brainnodemutation.cpp (100%) rename src/{genelab => genecraft}/core/entities/mutation/brainnodemutation.h (100%) rename src/{genelab => genecraft}/core/entities/mutation/crossovermanager.cpp (100%) rename src/{genelab => genecraft}/core/entities/mutation/crossovermanager.h (100%) rename src/{genelab => genecraft}/core/entities/mutation/floatmutation.cpp (100%) rename src/{genelab => genecraft}/core/entities/mutation/floatmutation.h (100%) rename src/{genelab => genecraft}/core/entities/mutation/integermutation.cpp (100%) rename src/{genelab => genecraft}/core/entities/mutation/integermutation.h (100%) rename src/{genelab => genecraft}/core/entities/mutation/mutation.cpp (100%) rename src/{genelab => genecraft}/core/entities/mutation/mutation.h (100%) rename src/{genelab => genecraft}/core/entities/mutation/mutationsmanager.cpp (100%) rename src/{genelab => genecraft}/core/entities/mutation/mutationsmanager.h (100%) rename src/{genelab => genecraft}/core/entities/mutation/simpleprobabilitymutation.cpp (100%) rename src/{genelab => genecraft}/core/entities/mutation/simpleprobabilitymutation.h (100%) rename src/{genelab => genecraft}/core/entities/mutation/structurallist.cpp (100%) rename src/{genelab => genecraft}/core/entities/mutation/structurallist.h (100%) rename src/{genelab => genecraft}/core/entities/mutation/structuralmutation.cpp (100%) rename src/{genelab => genecraft}/core/entities/mutation/structuralmutation.h (100%) rename src/{genelab => genecraft}/core/entities/ogrebulletentity.cpp (100%) rename src/{genelab => genecraft}/core/entities/ogrebulletentityfamily.cpp (100%) rename src/{genelab => genecraft}/core/entities/sensors/accelerometersensor.cpp (100%) rename src/{genelab => genecraft}/core/entities/sensors/accelerometersensor.h (100%) rename src/{genelab => genecraft}/core/entities/sensors/boxsmellsensor.cpp (100%) rename src/{genelab => genecraft}/core/entities/sensors/boxsmellsensor.h (100%) rename src/{genelab => genecraft}/core/entities/sensors/contactsensor.cpp (100%) rename src/{genelab => genecraft}/core/entities/sensors/contactsensor.h (100%) rename src/{genelab => genecraft}/core/entities/sensors/distancesensor.cpp (100%) rename src/{genelab => genecraft}/core/entities/sensors/distancesensor.h (100%) rename src/{genelab => genecraft}/core/entities/sensors/gyroscopicsensor.cpp (100%) rename src/{genelab => genecraft}/core/entities/sensors/gyroscopicsensor.h (100%) rename src/{genelab => genecraft}/core/entities/sensors/positionsensor.cpp (100%) rename src/{genelab => genecraft}/core/entities/sensors/positionsensor.h (100%) rename src/{genelab => genecraft}/core/entities/sensors/sensor.cpp (100%) rename src/{genelab => genecraft}/core/entities/sensors/sensor.h (100%) rename src/{genelab => genecraft}/core/entities/sensors/smellsensor.cpp (100%) rename src/{genelab => genecraft}/core/entities/sensors/smellsensor.h (100%) rename src/{genelab => genecraft}/core/entities/statistics/fixationstats.cpp (100%) rename src/{genelab => genecraft}/core/entities/statistics/fixationstats.h (100%) rename src/{genelab => genecraft}/core/entities/statistics/statisticsprovider.cpp (100%) rename src/{genelab => genecraft}/core/entities/statistics/statisticsprovider.h (100%) rename src/{genelab => genecraft}/core/entities/statistics/statisticsstorage.cpp (100%) rename src/{genelab => genecraft}/core/entities/statistics/statisticsstorage.h (100%) rename src/{genelab => genecraft}/core/entities/statistics/treeshapestats.cpp (100%) rename src/{genelab => genecraft}/core/entities/statistics/treeshapestats.h (100%) rename src/{genelab => genecraft}/core/experiment/experiment.cpp (100%) rename src/{genelab => genecraft}/core/experiment/experiment.h (100%) rename src/{genelab => genecraft}/core/experiment/experimentmanager.cpp (100%) rename src/{genelab => genecraft}/core/experiment/experimentmanager.h (100%) rename src/{genelab => genecraft}/core/experiment/result.cpp (100%) rename src/{genelab => genecraft}/core/experiment/result.h (100%) rename src/{genelab => genecraft}/core/experiment/resultsmanager.cpp (100%) rename src/{genelab => genecraft}/core/experiment/resultsmanager.h (100%) rename src/{genelab => genecraft}/core/factories/btfactory.cpp (100%) rename src/{genelab => genecraft}/core/factories/btfactory.h (100%) rename src/{genelab => genecraft}/core/factories/btofactory.cpp (100%) rename src/{genelab => genecraft}/core/factories/btofactory.h (100%) rename src/{genelab => genecraft}/core/factories/btoshapesfactory.cpp (100%) rename src/{genelab => genecraft}/core/factories/btoshapesfactory.h (100%) rename src/{genelab => genecraft}/core/factories/btoworldfactory.cpp (100%) rename src/{genelab => genecraft}/core/factories/btoworldfactory.h (100%) rename src/{genelab => genecraft}/core/factories/btshapesfactory.cpp (100%) rename src/{genelab => genecraft}/core/factories/btshapesfactory.h (100%) rename src/{genelab => genecraft}/core/factories/btworldfactory.cpp (100%) rename src/{genelab => genecraft}/core/factories/btworldfactory.h (100%) rename src/{genelab => genecraft}/core/factories/creaturefactory.cpp (100%) rename src/{genelab => genecraft}/core/factories/creaturefactory.h (100%) rename src/{genelab => genecraft}/core/factories/genome/genomebuilder.cpp (100%) rename src/{genelab => genecraft}/core/factories/genome/genomebuilder.h (100%) rename src/{genelab => genecraft}/core/factories/genome/genomemodifier.cpp (100%) rename src/{genelab => genecraft}/core/factories/genome/genomemodifier.h (100%) rename src/{genelab => genecraft}/core/factories/ressources/dbrecord.cpp (100%) rename src/{genelab => genecraft}/core/factories/ressources/dbrecord.h (100%) rename src/{genelab => genecraft}/core/factories/ressources/jsonfile.cpp (100%) rename src/{genelab => genecraft}/core/factories/ressources/jsonfile.h (100%) rename src/{genelab => genecraft}/core/factories/ressources/ressource.cpp (100%) rename src/{genelab => genecraft}/core/factories/ressources/ressource.h (100%) rename src/{genelab => genecraft}/core/factories/ressources/ressourcesmanager.cpp (100%) rename src/{genelab => genecraft}/core/factories/ressources/ressourcesmanager.h (100%) rename src/{genelab => genecraft}/core/factories/worldfactory.cpp (100%) rename src/{genelab => genecraft}/core/factories/worldfactory.h (100%) rename src/{genelab => genecraft}/core/genecraftcoreclasses.h (100%) rename src/{genelab => genecraft}/core/genelabcoreclasses.h (100%) rename src/{genelab => genecraft}/core/ressources/help/welcome.html (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/add.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/anchor.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/arrow_down.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/arrow_merge.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/arrow_refresh.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/arrow_switch.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/arrow_up.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bone.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bone_2.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bone_add.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bone_and_fixation.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bone_delete.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/brain.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/brain_activity.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/brain_connections.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bug.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bug_add.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bug_add_from_bdd.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bug_add_random.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bug_camera.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bug_delete.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bug_delete_all.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bug_delete_all_except_one.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bug_error.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bug_mutation.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bug_save.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bug_shadow.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bugs.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bugs_go.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bullet_add.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bullet_edit.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bullet_feed.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bullet_physics_library.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bullet_physics_library_play.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/bullet_physics_library_stop.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/camera.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/chart_curve.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/chart_line.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/cog.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/cog_add.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/cog_delete.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/cog_feed.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/cog_go.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/control_play_blue.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/database.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/delete.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/dna.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/dna_32.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/dna_64.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/door_out.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/entity_new.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/entity_vcard.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/feed.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/feed_add.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/feed_delete.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/fixation.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/folder_report.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/folder_world.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/help.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/information.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/magnifier.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/new.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/page_green.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/page_white_magnify.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/report.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/report_disk.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/report_go.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/ruler_pencil_32.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/theater_32.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/thumbtack.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/world.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/world_save.png (100%) rename src/{genelab => genecraft}/core/ressources/img/icons/wrench.png (100%) rename src/{genelab => genecraft}/core/ressources/img/logos/GeneCraft.png (100%) rename src/{genelab => genecraft}/core/ressources/img/logos/splash.png (100%) rename src/{genelab => genecraft}/core/ressources/img/logos/splash.xcf (100%) rename src/{genelab => genecraft}/core/ressources/js/js-beautifull.js (100%) rename src/{genelab => genecraft}/core/ressources/ressources.qrc (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/bodyitems.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/bonepropertiescontroller.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/bonepropertiescontroller.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/bonepropertiescontroller.ui (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/brainpropertiescontroller.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/brainpropertiescontroller.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/brainpropertiescontroller.ui (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/entitypropertiescontroller.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/entitypropertiescontroller.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/entitypropertiescontroller.ui (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/fixationpropertiescontroller.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/fixationpropertiescontroller.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/fixationpropertiescontroller.ui (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/generic6dofconstraintcontroller.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/generic6dofconstraintcontroller.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/generic6dofconstraintcontroller.ui (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/pluggriddesignvisualizer.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/pluggriddesignvisualizer.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/pluggridvisualizer.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/pluggridvisualizer.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/statisticspropertiescontroller.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/statisticspropertiescontroller.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/entities/statisticspropertiescontroller.ui (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/conversionctrl.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/conversionctrl.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/conversionctrl.ui (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/experimentctrl.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/experimentctrl.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/experimentctrl.ui (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/experimentspropertiescontroller.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/experimentspropertiescontroller.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/experimentspropertiescontroller.ui (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/floatmutationcontroller.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/floatmutationcontroller.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/floatmutationcontroller.ui (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/floordialog.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/floordialog.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/floordialog.ui (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/integermutationcontroller.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/integermutationcontroller.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/integermutationcontroller.ui (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/mutationelementcontroller.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/mutationelementcontroller.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/mutationelementcontroller.ui (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/ressourcesItems.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/ressourcesbrowser.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/ressourcesbrowser.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/ressourcesbrowser.ui (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/simpleprobabilitycontroller.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/simpleprobabilitycontroller.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/simpleprobabilitycontroller.ui (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/structuralmutationcontroller.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/structuralmutationcontroller.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/structuralmutationcontroller.ui (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/workerconfiguration.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/workerconfiguration.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/workerconfiguration.ui (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/workerctrl.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/workerctrl.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/experiments/workerctrl.ui (100%) rename src/{genelab => genecraft}/core/ui/widgets/graphicalwidget.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/graphicalwidget.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/ogrebulletwindows.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/ogrebulletwindows.h (100%) rename src/{genelab => genecraft}/core/ui/widgets/ogrebulletwindows.ui (100%) rename src/{genelab => genecraft}/core/ui/widgets/plot/fitnessplot.cpp (100%) rename src/{genelab => genecraft}/core/ui/widgets/plot/fitnessplot.h (100%) rename src/{genelab => genecraft}/core/utils/js-beautifull.js (100%) rename src/{genelab => genecraft}/core/utils/sandboxtools.cpp (100%) rename src/{genelab => genecraft}/core/utils/sandboxtools.h (100%) rename src/{genelab => genecraft}/core/utils/tools.cpp (100%) rename src/{genelab => genecraft}/core/utils/tools.h (100%) rename src/{genelab => genecraft}/core/world/btbiome.cpp (100%) rename src/{genelab => genecraft}/core/world/btbiome.h (100%) rename src/{genelab => genecraft}/core/world/btobiome.cpp (100%) rename src/{genelab => genecraft}/core/world/btobiome.h (100%) rename src/{genelab => genecraft}/core/world/btoscene.cpp (100%) rename src/{genelab => genecraft}/core/world/btoscene.h (100%) rename src/{genelab => genecraft}/core/world/btoworld.cpp (100%) rename src/{genelab => genecraft}/core/world/btoworld.h (100%) rename src/{genelab => genecraft}/core/world/btscene.cpp (100%) rename src/{genelab => genecraft}/core/world/btscene.h (100%) rename src/{genelab => genecraft}/core/world/btworld.cpp (100%) rename src/{genelab => genecraft}/core/world/btworld.h (100%) rename src/{genelab => genecraft}/core/world/spawn.cpp (100%) rename src/{genelab => genecraft}/core/world/spawn.h (100%) rename src/{genelab_global => genecraft_global}/genelab_global.pro (100%) rename src/{genelab_global => genecraft_global}/genelab_global.pro.user.2.2pre5 (100%) rename src/{genelab_global => genecraft_global}/genelabmainwindow.cpp (100%) rename src/{genelab_global => genecraft_global}/genelabmainwindow.h (100%) rename src/{genelab_global => genecraft_global}/genelabmainwindow.ui (100%) rename src/{genelab_global => genecraft_global}/main.cpp (100%) rename src/{genelab_worker => genecraft_worker}/genelab_worker.pro (100%) rename src/{genelab_worker => genecraft_worker}/main.cpp (100%) rename src/{genelab_worker => genecraft_worker}/spider.exp (100%) diff --git a/src/genelab/apps/genelab/creatureviewer/inputlisteners/creatureviewerinputmanager.cpp b/src/genecraft/apps/genecraft/creatureviewer/inputlisteners/creatureviewerinputmanager.cpp similarity index 100% rename from src/genelab/apps/genelab/creatureviewer/inputlisteners/creatureviewerinputmanager.cpp rename to src/genecraft/apps/genecraft/creatureviewer/inputlisteners/creatureviewerinputmanager.cpp diff --git a/src/genelab/apps/genelab/creatureviewer/inputlisteners/creatureviewerinputmanager.h b/src/genecraft/apps/genecraft/creatureviewer/inputlisteners/creatureviewerinputmanager.h similarity index 100% rename from src/genelab/apps/genelab/creatureviewer/inputlisteners/creatureviewerinputmanager.h rename to src/genecraft/apps/genecraft/creatureviewer/inputlisteners/creatureviewerinputmanager.h diff --git a/src/genelab/apps/genelab/creatureviewer/ui/creatureviewerabout.cpp b/src/genecraft/apps/genecraft/creatureviewer/ui/creatureviewerabout.cpp similarity index 100% rename from src/genelab/apps/genelab/creatureviewer/ui/creatureviewerabout.cpp rename to src/genecraft/apps/genecraft/creatureviewer/ui/creatureviewerabout.cpp diff --git a/src/genelab/apps/genelab/creatureviewer/ui/creatureviewerabout.h b/src/genecraft/apps/genecraft/creatureviewer/ui/creatureviewerabout.h similarity index 100% rename from src/genelab/apps/genelab/creatureviewer/ui/creatureviewerabout.h rename to src/genecraft/apps/genecraft/creatureviewer/ui/creatureviewerabout.h diff --git a/src/genelab/apps/genelab/creatureviewer/ui/creatureviewerabout.ui b/src/genecraft/apps/genecraft/creatureviewer/ui/creatureviewerabout.ui similarity index 100% rename from src/genelab/apps/genelab/creatureviewer/ui/creatureviewerabout.ui rename to src/genecraft/apps/genecraft/creatureviewer/ui/creatureviewerabout.ui diff --git a/src/genelab/apps/genelab/creatureviewer/ui/creatureviewerwindow.cpp b/src/genecraft/apps/genecraft/creatureviewer/ui/creatureviewerwindow.cpp similarity index 100% rename from src/genelab/apps/genelab/creatureviewer/ui/creatureviewerwindow.cpp rename to src/genecraft/apps/genecraft/creatureviewer/ui/creatureviewerwindow.cpp diff --git a/src/genelab/apps/genelab/creatureviewer/ui/creatureviewerwindow.h b/src/genecraft/apps/genecraft/creatureviewer/ui/creatureviewerwindow.h similarity index 100% rename from src/genelab/apps/genelab/creatureviewer/ui/creatureviewerwindow.h rename to src/genecraft/apps/genecraft/creatureviewer/ui/creatureviewerwindow.h diff --git a/src/genelab/apps/genelab/creatureviewer/ui/creatureviewerwindow.ui b/src/genecraft/apps/genecraft/creatureviewer/ui/creatureviewerwindow.ui similarity index 100% rename from src/genelab/apps/genelab/creatureviewer/ui/creatureviewerwindow.ui rename to src/genecraft/apps/genecraft/creatureviewer/ui/creatureviewerwindow.ui diff --git a/src/genelab/apps/genelab/creatureviewer/ui/welcomewidget.cpp b/src/genecraft/apps/genecraft/creatureviewer/ui/welcomewidget.cpp similarity index 100% rename from src/genelab/apps/genelab/creatureviewer/ui/welcomewidget.cpp rename to src/genecraft/apps/genecraft/creatureviewer/ui/welcomewidget.cpp diff --git a/src/genelab/apps/genelab/creatureviewer/ui/welcomewidget.h b/src/genecraft/apps/genecraft/creatureviewer/ui/welcomewidget.h similarity index 100% rename from src/genelab/apps/genelab/creatureviewer/ui/welcomewidget.h rename to src/genecraft/apps/genecraft/creatureviewer/ui/welcomewidget.h diff --git a/src/genelab/apps/genelab/creatureviewer/ui/welcomewidget.ui b/src/genecraft/apps/genecraft/creatureviewer/ui/welcomewidget.ui similarity index 100% rename from src/genelab/apps/genelab/creatureviewer/ui/welcomewidget.ui rename to src/genecraft/apps/genecraft/creatureviewer/ui/welcomewidget.ui diff --git a/src/genelab/apps/sandbox/brainsandbox/brainapp.ui b/src/genecraft/apps/sandbox/brainsandbox/brainapp.ui similarity index 100% rename from src/genelab/apps/sandbox/brainsandbox/brainapp.ui rename to src/genecraft/apps/sandbox/brainsandbox/brainapp.ui diff --git a/src/genelab/apps/sandbox/entitysandbox/entitysandbox.cpp b/src/genecraft/apps/sandbox/entitysandbox/entitysandbox.cpp similarity index 100% rename from src/genelab/apps/sandbox/entitysandbox/entitysandbox.cpp rename to src/genecraft/apps/sandbox/entitysandbox/entitysandbox.cpp diff --git a/src/genelab/apps/sandbox/entitysandbox/entitysandbox.h b/src/genecraft/apps/sandbox/entitysandbox/entitysandbox.h similarity index 100% rename from src/genelab/apps/sandbox/entitysandbox/entitysandbox.h rename to src/genecraft/apps/sandbox/entitysandbox/entitysandbox.h diff --git a/src/genelab/apps/sandbox/entitysandbox/entitysandbox.ui b/src/genecraft/apps/sandbox/entitysandbox/entitysandbox.ui similarity index 100% rename from src/genelab/apps/sandbox/entitysandbox/entitysandbox.ui rename to src/genecraft/apps/sandbox/entitysandbox/entitysandbox.ui diff --git a/src/genelab/core/engines/brains/brainengine.cpp b/src/genecraft/core/engines/brains/brainengine.cpp similarity index 100% rename from src/genelab/core/engines/brains/brainengine.cpp rename to src/genecraft/core/engines/brains/brainengine.cpp diff --git a/src/genelab/core/engines/brains/brainengine.h b/src/genecraft/core/engines/brains/brainengine.h similarity index 100% rename from src/genelab/core/engines/brains/brainengine.h rename to src/genecraft/core/engines/brains/brainengine.h diff --git a/src/genelab/core/engines/bullet/bulletengine.cpp b/src/genecraft/core/engines/bullet/bulletengine.cpp similarity index 100% rename from src/genelab/core/engines/bullet/bulletengine.cpp rename to src/genecraft/core/engines/bullet/bulletengine.cpp diff --git a/src/genelab/core/engines/bullet/bulletengine.h b/src/genecraft/core/engines/bullet/bulletengine.h similarity index 100% rename from src/genelab/core/engines/bullet/bulletengine.h rename to src/genecraft/core/engines/bullet/bulletengine.h diff --git a/src/genelab/core/engines/bullet/rigidbodyorigin.cpp b/src/genecraft/core/engines/bullet/rigidbodyorigin.cpp similarity index 100% rename from src/genelab/core/engines/bullet/rigidbodyorigin.cpp rename to src/genecraft/core/engines/bullet/rigidbodyorigin.cpp diff --git a/src/genelab/core/engines/bullet/rigidbodyorigin.h b/src/genecraft/core/engines/bullet/rigidbodyorigin.h similarity index 100% rename from src/genelab/core/engines/bullet/rigidbodyorigin.h rename to src/genecraft/core/engines/bullet/rigidbodyorigin.h diff --git a/src/genelab/core/engines/bullet/shapes/btbone.cpp b/src/genecraft/core/engines/bullet/shapes/btbone.cpp similarity index 100% rename from src/genelab/core/engines/bullet/shapes/btbone.cpp rename to src/genecraft/core/engines/bullet/shapes/btbone.cpp diff --git a/src/genelab/core/engines/bullet/shapes/btbone.h b/src/genecraft/core/engines/bullet/shapes/btbone.h similarity index 100% rename from src/genelab/core/engines/bullet/shapes/btbone.h rename to src/genecraft/core/engines/bullet/shapes/btbone.h diff --git a/src/genelab/core/engines/bullet/shapes/btbox.cpp b/src/genecraft/core/engines/bullet/shapes/btbox.cpp similarity index 100% rename from src/genelab/core/engines/bullet/shapes/btbox.cpp rename to src/genecraft/core/engines/bullet/shapes/btbox.cpp diff --git a/src/genelab/core/engines/bullet/shapes/btbox.h b/src/genecraft/core/engines/bullet/shapes/btbox.h similarity index 100% rename from src/genelab/core/engines/bullet/shapes/btbox.h rename to src/genecraft/core/engines/bullet/shapes/btbox.h diff --git a/src/genelab/core/engines/bullet/shapes/btcylinder.cpp b/src/genecraft/core/engines/bullet/shapes/btcylinder.cpp similarity index 100% rename from src/genelab/core/engines/bullet/shapes/btcylinder.cpp rename to src/genecraft/core/engines/bullet/shapes/btcylinder.cpp diff --git a/src/genelab/core/engines/bullet/shapes/btcylinder.h b/src/genecraft/core/engines/bullet/shapes/btcylinder.h similarity index 100% rename from src/genelab/core/engines/bullet/shapes/btcylinder.h rename to src/genecraft/core/engines/bullet/shapes/btcylinder.h diff --git a/src/genelab/core/engines/bullet/shapes/btshape.cpp b/src/genecraft/core/engines/bullet/shapes/btshape.cpp similarity index 100% rename from src/genelab/core/engines/bullet/shapes/btshape.cpp rename to src/genecraft/core/engines/bullet/shapes/btshape.cpp diff --git a/src/genelab/core/engines/bullet/shapes/btshape.h b/src/genecraft/core/engines/bullet/shapes/btshape.h similarity index 100% rename from src/genelab/core/engines/bullet/shapes/btshape.h rename to src/genecraft/core/engines/bullet/shapes/btshape.h diff --git a/src/genelab/core/engines/bullet/shapes/btsphere.cpp b/src/genecraft/core/engines/bullet/shapes/btsphere.cpp similarity index 100% rename from src/genelab/core/engines/bullet/shapes/btsphere.cpp rename to src/genecraft/core/engines/bullet/shapes/btsphere.cpp diff --git a/src/genelab/core/engines/bullet/shapes/btsphere.h b/src/genecraft/core/engines/bullet/shapes/btsphere.h similarity index 100% rename from src/genelab/core/engines/bullet/shapes/btsphere.h rename to src/genecraft/core/engines/bullet/shapes/btsphere.h diff --git a/src/genelab/core/engines/bulletogre/bulletogreengine.cpp b/src/genecraft/core/engines/bulletogre/bulletogreengine.cpp similarity index 100% rename from src/genelab/core/engines/bulletogre/bulletogreengine.cpp rename to src/genecraft/core/engines/bulletogre/bulletogreengine.cpp diff --git a/src/genelab/core/engines/bulletogre/bulletogreengine.h b/src/genecraft/core/engines/bulletogre/bulletogreengine.h similarity index 100% rename from src/genelab/core/engines/bulletogre/bulletogreengine.h rename to src/genecraft/core/engines/bulletogre/bulletogreengine.h diff --git a/src/genelab/core/engines/bulletogre/shapes/btobone.cpp b/src/genecraft/core/engines/bulletogre/shapes/btobone.cpp similarity index 100% rename from src/genelab/core/engines/bulletogre/shapes/btobone.cpp rename to src/genecraft/core/engines/bulletogre/shapes/btobone.cpp diff --git a/src/genelab/core/engines/bulletogre/shapes/btobone.h b/src/genecraft/core/engines/bulletogre/shapes/btobone.h similarity index 100% rename from src/genelab/core/engines/bulletogre/shapes/btobone.h rename to src/genecraft/core/engines/bulletogre/shapes/btobone.h diff --git a/src/genelab/core/engines/bulletogre/shapes/btobox.cpp b/src/genecraft/core/engines/bulletogre/shapes/btobox.cpp similarity index 100% rename from src/genelab/core/engines/bulletogre/shapes/btobox.cpp rename to src/genecraft/core/engines/bulletogre/shapes/btobox.cpp diff --git a/src/genelab/core/engines/bulletogre/shapes/btobox.h b/src/genecraft/core/engines/bulletogre/shapes/btobox.h similarity index 100% rename from src/genelab/core/engines/bulletogre/shapes/btobox.h rename to src/genecraft/core/engines/bulletogre/shapes/btobox.h diff --git a/src/genelab/core/engines/bulletogre/shapes/btocylinder.cpp b/src/genecraft/core/engines/bulletogre/shapes/btocylinder.cpp similarity index 100% rename from src/genelab/core/engines/bulletogre/shapes/btocylinder.cpp rename to src/genecraft/core/engines/bulletogre/shapes/btocylinder.cpp diff --git a/src/genelab/core/engines/bulletogre/shapes/btocylinder.h b/src/genecraft/core/engines/bulletogre/shapes/btocylinder.h similarity index 100% rename from src/genelab/core/engines/bulletogre/shapes/btocylinder.h rename to src/genecraft/core/engines/bulletogre/shapes/btocylinder.h diff --git a/src/genelab/core/engines/bulletogre/shapes/btosphere.cpp b/src/genecraft/core/engines/bulletogre/shapes/btosphere.cpp similarity index 100% rename from src/genelab/core/engines/bulletogre/shapes/btosphere.cpp rename to src/genecraft/core/engines/bulletogre/shapes/btosphere.cpp diff --git a/src/genelab/core/engines/bulletogre/shapes/btosphere.h b/src/genecraft/core/engines/bulletogre/shapes/btosphere.h similarity index 100% rename from src/genelab/core/engines/bulletogre/shapes/btosphere.h rename to src/genecraft/core/engines/bulletogre/shapes/btosphere.h diff --git a/src/genelab/core/engines/engine.cpp b/src/genecraft/core/engines/engine.cpp similarity index 100% rename from src/genelab/core/engines/engine.cpp rename to src/genecraft/core/engines/engine.cpp diff --git a/src/genelab/core/engines/engine.h b/src/genecraft/core/engines/engine.h similarity index 100% rename from src/genelab/core/engines/engine.h rename to src/genecraft/core/engines/engine.h diff --git a/src/genelab/core/engines/entities/entitiesengine.cpp b/src/genecraft/core/engines/entities/entitiesengine.cpp similarity index 100% rename from src/genelab/core/engines/entities/entitiesengine.cpp rename to src/genecraft/core/engines/entities/entitiesengine.cpp diff --git a/src/genelab/core/engines/entities/entitiesengine.h b/src/genecraft/core/engines/entities/entitiesengine.h similarity index 100% rename from src/genelab/core/engines/entities/entitiesengine.h rename to src/genecraft/core/engines/entities/entitiesengine.h diff --git a/src/genelab/core/engines/events/eventsmanager.cpp b/src/genecraft/core/engines/events/eventsmanager.cpp similarity index 100% rename from src/genelab/core/engines/events/eventsmanager.cpp rename to src/genecraft/core/engines/events/eventsmanager.cpp diff --git a/src/genelab/core/engines/events/eventsmanager.h b/src/genecraft/core/engines/events/eventsmanager.h similarity index 100% rename from src/genelab/core/engines/events/eventsmanager.h rename to src/genecraft/core/engines/events/eventsmanager.h diff --git a/src/genelab/core/engines/events/inputlistener.cpp b/src/genecraft/core/engines/events/inputlistener.cpp similarity index 100% rename from src/genelab/core/engines/events/inputlistener.cpp rename to src/genecraft/core/engines/events/inputlistener.cpp diff --git a/src/genelab/core/engines/events/inputlistener.h b/src/genecraft/core/engines/events/inputlistener.h similarity index 100% rename from src/genelab/core/engines/events/inputlistener.h rename to src/genecraft/core/engines/events/inputlistener.h diff --git a/src/genelab/core/engines/events/inspectorsinputmanager.cpp b/src/genecraft/core/engines/events/inspectorsinputmanager.cpp similarity index 100% rename from src/genelab/core/engines/events/inspectorsinputmanager.cpp rename to src/genecraft/core/engines/events/inspectorsinputmanager.cpp diff --git a/src/genelab/core/engines/events/inspectorsinputmanager.h b/src/genecraft/core/engines/events/inspectorsinputmanager.h similarity index 100% rename from src/genelab/core/engines/events/inspectorsinputmanager.h rename to src/genecraft/core/engines/events/inspectorsinputmanager.h diff --git a/src/genelab/core/engines/ogre/entities/ogrefreecamera.cpp b/src/genecraft/core/engines/ogre/entities/ogrefreecamera.cpp similarity index 100% rename from src/genelab/core/engines/ogre/entities/ogrefreecamera.cpp rename to src/genecraft/core/engines/ogre/entities/ogrefreecamera.cpp diff --git a/src/genelab/core/engines/ogre/entities/ogrefreecamera.h b/src/genecraft/core/engines/ogre/entities/ogrefreecamera.h similarity index 100% rename from src/genelab/core/engines/ogre/entities/ogrefreecamera.h rename to src/genecraft/core/engines/ogre/entities/ogrefreecamera.h diff --git a/src/genelab/core/engines/ogre/ogreengine.cpp b/src/genecraft/core/engines/ogre/ogreengine.cpp similarity index 100% rename from src/genelab/core/engines/ogre/ogreengine.cpp rename to src/genecraft/core/engines/ogre/ogreengine.cpp diff --git a/src/genelab/core/engines/ogre/ogreengine.h b/src/genecraft/core/engines/ogre/ogreengine.h similarity index 100% rename from src/genelab/core/engines/ogre/ogreengine.h rename to src/genecraft/core/engines/ogre/ogreengine.h diff --git a/src/genelab/core/engines/ogre/ogrewidget.cpp b/src/genecraft/core/engines/ogre/ogrewidget.cpp similarity index 100% rename from src/genelab/core/engines/ogre/ogrewidget.cpp rename to src/genecraft/core/engines/ogre/ogrewidget.cpp diff --git a/src/genelab/core/engines/ogre/ogrewidget.h b/src/genecraft/core/engines/ogre/ogrewidget.h similarity index 100% rename from src/genelab/core/engines/ogre/ogrewidget.h rename to src/genecraft/core/engines/ogre/ogrewidget.h diff --git a/src/genelab/core/engines/simulationmanager.cpp b/src/genecraft/core/engines/simulationmanager.cpp similarity index 100% rename from src/genelab/core/engines/simulationmanager.cpp rename to src/genecraft/core/engines/simulationmanager.cpp diff --git a/src/genelab/core/engines/simulationmanager.h b/src/genecraft/core/engines/simulationmanager.h similarity index 100% rename from src/genelab/core/engines/simulationmanager.h rename to src/genecraft/core/engines/simulationmanager.h diff --git a/src/genelab/core/engines/terrain/terrain.cpp b/src/genecraft/core/engines/terrain/terrain.cpp similarity index 100% rename from src/genelab/core/engines/terrain/terrain.cpp rename to src/genecraft/core/engines/terrain/terrain.cpp diff --git a/src/genelab/core/engines/terrain/terrain.h b/src/genecraft/core/engines/terrain/terrain.h similarity index 100% rename from src/genelab/core/engines/terrain/terrain.h rename to src/genecraft/core/engines/terrain/terrain.h diff --git a/src/genelab/core/entities/body/bone.cpp b/src/genecraft/core/entities/body/bone.cpp similarity index 100% rename from src/genelab/core/entities/body/bone.cpp rename to src/genecraft/core/entities/body/bone.cpp diff --git a/src/genelab/core/entities/body/bone.h b/src/genecraft/core/entities/body/bone.h similarity index 100% rename from src/genelab/core/entities/body/bone.h rename to src/genecraft/core/entities/body/bone.h diff --git a/src/genelab/core/entities/body/fixation.cpp b/src/genecraft/core/entities/body/fixation.cpp similarity index 100% rename from src/genelab/core/entities/body/fixation.cpp rename to src/genecraft/core/entities/body/fixation.cpp diff --git a/src/genelab/core/entities/body/fixation.h b/src/genecraft/core/entities/body/fixation.h similarity index 100% rename from src/genelab/core/entities/body/fixation.h rename to src/genecraft/core/entities/body/fixation.h diff --git a/src/genelab/core/entities/body/recursion.cpp b/src/genecraft/core/entities/body/recursion.cpp similarity index 100% rename from src/genelab/core/entities/body/recursion.cpp rename to src/genecraft/core/entities/body/recursion.cpp diff --git a/src/genelab/core/entities/body/recursion.h b/src/genecraft/core/entities/body/recursion.h similarity index 100% rename from src/genelab/core/entities/body/recursion.h rename to src/genecraft/core/entities/body/recursion.h diff --git a/src/genelab/core/entities/body/symmetry.cpp b/src/genecraft/core/entities/body/symmetry.cpp similarity index 100% rename from src/genelab/core/entities/body/symmetry.cpp rename to src/genecraft/core/entities/body/symmetry.cpp diff --git a/src/genelab/core/entities/body/symmetry.h b/src/genecraft/core/entities/body/symmetry.h similarity index 100% rename from src/genelab/core/entities/body/symmetry.h rename to src/genecraft/core/entities/body/symmetry.h diff --git a/src/genelab/core/entities/body/treeshape.cpp b/src/genecraft/core/entities/body/treeshape.cpp similarity index 100% rename from src/genelab/core/entities/body/treeshape.cpp rename to src/genecraft/core/entities/body/treeshape.cpp diff --git a/src/genelab/core/entities/body/treeshape.h b/src/genecraft/core/entities/body/treeshape.h similarity index 100% rename from src/genelab/core/entities/body/treeshape.h rename to src/genecraft/core/entities/body/treeshape.h diff --git a/src/genelab/core/entities/brain/brain.cpp b/src/genecraft/core/entities/brain/brain.cpp similarity index 100% rename from src/genelab/core/entities/brain/brain.cpp rename to src/genecraft/core/entities/brain/brain.cpp diff --git a/src/genelab/core/entities/brain/brain.h b/src/genecraft/core/entities/brain/brain.h similarity index 100% rename from src/genelab/core/entities/brain/brain.h rename to src/genecraft/core/entities/brain/brain.h diff --git a/src/genelab/core/entities/brain/brainfunctional.cpp b/src/genecraft/core/entities/brain/brainfunctional.cpp similarity index 100% rename from src/genelab/core/entities/brain/brainfunctional.cpp rename to src/genecraft/core/entities/brain/brainfunctional.cpp diff --git a/src/genelab/core/entities/brain/brainfunctional.h b/src/genecraft/core/entities/brain/brainfunctional.h similarity index 100% rename from src/genelab/core/entities/brain/brainfunctional.h rename to src/genecraft/core/entities/brain/brainfunctional.h diff --git a/src/genelab/core/entities/brain/brainin.cpp b/src/genecraft/core/entities/brain/brainin.cpp similarity index 100% rename from src/genelab/core/entities/brain/brainin.cpp rename to src/genecraft/core/entities/brain/brainin.cpp diff --git a/src/genelab/core/entities/brain/brainin.h b/src/genecraft/core/entities/brain/brainin.h similarity index 100% rename from src/genelab/core/entities/brain/brainin.h rename to src/genecraft/core/entities/brain/brainin.h diff --git a/src/genelab/core/entities/brain/brainnode.cpp b/src/genecraft/core/entities/brain/brainnode.cpp similarity index 100% rename from src/genelab/core/entities/brain/brainnode.cpp rename to src/genecraft/core/entities/brain/brainnode.cpp diff --git a/src/genelab/core/entities/brain/brainnode.h b/src/genecraft/core/entities/brain/brainnode.h similarity index 100% rename from src/genelab/core/entities/brain/brainnode.h rename to src/genecraft/core/entities/brain/brainnode.h diff --git a/src/genelab/core/entities/brain/brainout.cpp b/src/genecraft/core/entities/brain/brainout.cpp similarity index 100% rename from src/genelab/core/entities/brain/brainout.cpp rename to src/genecraft/core/entities/brain/brainout.cpp diff --git a/src/genelab/core/entities/brain/brainout.h b/src/genecraft/core/entities/brain/brainout.h similarity index 100% rename from src/genelab/core/entities/brain/brainout.h rename to src/genecraft/core/entities/brain/brainout.h diff --git a/src/genelab/core/entities/brain/brainpluggrid.cpp b/src/genecraft/core/entities/brain/brainpluggrid.cpp similarity index 100% rename from src/genelab/core/entities/brain/brainpluggrid.cpp rename to src/genecraft/core/entities/brain/brainpluggrid.cpp diff --git a/src/genelab/core/entities/brain/brainpluggrid.h b/src/genecraft/core/entities/brain/brainpluggrid.h similarity index 100% rename from src/genelab/core/entities/brain/brainpluggrid.h rename to src/genecraft/core/entities/brain/brainpluggrid.h diff --git a/src/genelab/core/entities/brain/sinusin.cpp b/src/genecraft/core/entities/brain/sinusin.cpp similarity index 100% rename from src/genelab/core/entities/brain/sinusin.cpp rename to src/genecraft/core/entities/brain/sinusin.cpp diff --git a/src/genelab/core/entities/brain/sinusin.h b/src/genecraft/core/entities/brain/sinusin.h similarity index 100% rename from src/genelab/core/entities/brain/sinusin.h rename to src/genecraft/core/entities/brain/sinusin.h diff --git a/src/genelab/core/entities/brain/synapse.cpp b/src/genecraft/core/entities/brain/synapse.cpp similarity index 100% rename from src/genelab/core/entities/brain/synapse.cpp rename to src/genecraft/core/entities/brain/synapse.cpp diff --git a/src/genelab/core/entities/brain/synapse.h b/src/genecraft/core/entities/brain/synapse.h similarity index 100% rename from src/genelab/core/entities/brain/synapse.h rename to src/genecraft/core/entities/brain/synapse.h diff --git a/src/genelab/core/entities/effectors/effector.cpp b/src/genecraft/core/entities/effectors/effector.cpp similarity index 100% rename from src/genelab/core/entities/effectors/effector.cpp rename to src/genecraft/core/entities/effectors/effector.cpp diff --git a/src/genelab/core/entities/effectors/effector.h b/src/genecraft/core/entities/effectors/effector.h similarity index 100% rename from src/genelab/core/entities/effectors/effector.h rename to src/genecraft/core/entities/effectors/effector.h diff --git a/src/genelab/core/entities/effectors/flyingeffector.cpp b/src/genecraft/core/entities/effectors/flyingeffector.cpp similarity index 100% rename from src/genelab/core/entities/effectors/flyingeffector.cpp rename to src/genecraft/core/entities/effectors/flyingeffector.cpp diff --git a/src/genelab/core/entities/effectors/flyingeffector.h b/src/genecraft/core/entities/effectors/flyingeffector.h similarity index 100% rename from src/genelab/core/entities/effectors/flyingeffector.h rename to src/genecraft/core/entities/effectors/flyingeffector.h diff --git a/src/genelab/core/entities/effectors/grippereffector.cpp b/src/genecraft/core/entities/effectors/grippereffector.cpp similarity index 100% rename from src/genelab/core/entities/effectors/grippereffector.cpp rename to src/genecraft/core/entities/effectors/grippereffector.cpp diff --git a/src/genelab/core/entities/effectors/grippereffector.h b/src/genecraft/core/entities/effectors/grippereffector.h similarity index 100% rename from src/genelab/core/entities/effectors/grippereffector.h rename to src/genecraft/core/entities/effectors/grippereffector.h diff --git a/src/genelab/core/entities/effectors/rotationalmotorseffector.cpp b/src/genecraft/core/entities/effectors/rotationalmotorseffector.cpp similarity index 100% rename from src/genelab/core/entities/effectors/rotationalmotorseffector.cpp rename to src/genecraft/core/entities/effectors/rotationalmotorseffector.cpp diff --git a/src/genelab/core/entities/effectors/rotationalmotorseffector.h b/src/genecraft/core/entities/effectors/rotationalmotorseffector.h similarity index 100% rename from src/genelab/core/entities/effectors/rotationalmotorseffector.h rename to src/genecraft/core/entities/effectors/rotationalmotorseffector.h diff --git a/src/genelab/core/entities/entity.cpp b/src/genecraft/core/entities/entity.cpp similarity index 100% rename from src/genelab/core/entities/entity.cpp rename to src/genecraft/core/entities/entity.cpp diff --git a/src/genelab/core/entities/entity.h b/src/genecraft/core/entities/entity.h similarity index 100% rename from src/genelab/core/entities/entity.h rename to src/genecraft/core/entities/entity.h diff --git a/src/genelab/core/entities/entityfamily.cpp b/src/genecraft/core/entities/entityfamily.cpp similarity index 100% rename from src/genelab/core/entities/entityfamily.cpp rename to src/genecraft/core/entities/entityfamily.cpp diff --git a/src/genelab/core/entities/entityfamily.h b/src/genecraft/core/entities/entityfamily.h similarity index 100% rename from src/genelab/core/entities/entityfamily.h rename to src/genecraft/core/entities/entityfamily.h diff --git a/src/genelab/core/entities/families/antfamily.cpp b/src/genecraft/core/entities/families/antfamily.cpp similarity index 100% rename from src/genelab/core/entities/families/antfamily.cpp rename to src/genecraft/core/entities/families/antfamily.cpp diff --git a/src/genelab/core/entities/families/antfamily.h b/src/genecraft/core/entities/families/antfamily.h similarity index 100% rename from src/genelab/core/entities/families/antfamily.h rename to src/genecraft/core/entities/families/antfamily.h diff --git a/src/genelab/core/entities/families/caterpillarfamily.cpp b/src/genecraft/core/entities/families/caterpillarfamily.cpp similarity index 100% rename from src/genelab/core/entities/families/caterpillarfamily.cpp rename to src/genecraft/core/entities/families/caterpillarfamily.cpp diff --git a/src/genelab/core/entities/families/caterpillarfamily.h b/src/genecraft/core/entities/families/caterpillarfamily.h similarity index 100% rename from src/genelab/core/entities/families/caterpillarfamily.h rename to src/genecraft/core/entities/families/caterpillarfamily.h diff --git a/src/genelab/core/entities/families/genericfamily.cpp b/src/genecraft/core/entities/families/genericfamily.cpp similarity index 100% rename from src/genelab/core/entities/families/genericfamily.cpp rename to src/genecraft/core/entities/families/genericfamily.cpp diff --git a/src/genelab/core/entities/families/genericfamily.h b/src/genecraft/core/entities/families/genericfamily.h similarity index 100% rename from src/genelab/core/entities/families/genericfamily.h rename to src/genecraft/core/entities/families/genericfamily.h diff --git a/src/genelab/core/entities/families/snakefamily.cpp b/src/genecraft/core/entities/families/snakefamily.cpp similarity index 100% rename from src/genelab/core/entities/families/snakefamily.cpp rename to src/genecraft/core/entities/families/snakefamily.cpp diff --git a/src/genelab/core/entities/families/snakefamily.h b/src/genecraft/core/entities/families/snakefamily.h similarity index 100% rename from src/genelab/core/entities/families/snakefamily.h rename to src/genecraft/core/entities/families/snakefamily.h diff --git a/src/genelab/core/entities/families/spiderfamily.cpp b/src/genecraft/core/entities/families/spiderfamily.cpp similarity index 100% rename from src/genelab/core/entities/families/spiderfamily.cpp rename to src/genecraft/core/entities/families/spiderfamily.cpp diff --git a/src/genelab/core/entities/families/spiderfamily.h b/src/genecraft/core/entities/families/spiderfamily.h similarity index 100% rename from src/genelab/core/entities/families/spiderfamily.h rename to src/genecraft/core/entities/families/spiderfamily.h diff --git a/src/genelab/core/entities/mutation/bonelimitsmutation.cpp b/src/genecraft/core/entities/mutation/bonelimitsmutation.cpp similarity index 100% rename from src/genelab/core/entities/mutation/bonelimitsmutation.cpp rename to src/genecraft/core/entities/mutation/bonelimitsmutation.cpp diff --git a/src/genelab/core/entities/mutation/bonelimitsmutation.h b/src/genecraft/core/entities/mutation/bonelimitsmutation.h similarity index 100% rename from src/genelab/core/entities/mutation/bonelimitsmutation.h rename to src/genecraft/core/entities/mutation/bonelimitsmutation.h diff --git a/src/genelab/core/entities/mutation/brainnodemutation.cpp b/src/genecraft/core/entities/mutation/brainnodemutation.cpp similarity index 100% rename from src/genelab/core/entities/mutation/brainnodemutation.cpp rename to src/genecraft/core/entities/mutation/brainnodemutation.cpp diff --git a/src/genelab/core/entities/mutation/brainnodemutation.h b/src/genecraft/core/entities/mutation/brainnodemutation.h similarity index 100% rename from src/genelab/core/entities/mutation/brainnodemutation.h rename to src/genecraft/core/entities/mutation/brainnodemutation.h diff --git a/src/genelab/core/entities/mutation/crossovermanager.cpp b/src/genecraft/core/entities/mutation/crossovermanager.cpp similarity index 100% rename from src/genelab/core/entities/mutation/crossovermanager.cpp rename to src/genecraft/core/entities/mutation/crossovermanager.cpp diff --git a/src/genelab/core/entities/mutation/crossovermanager.h b/src/genecraft/core/entities/mutation/crossovermanager.h similarity index 100% rename from src/genelab/core/entities/mutation/crossovermanager.h rename to src/genecraft/core/entities/mutation/crossovermanager.h diff --git a/src/genelab/core/entities/mutation/floatmutation.cpp b/src/genecraft/core/entities/mutation/floatmutation.cpp similarity index 100% rename from src/genelab/core/entities/mutation/floatmutation.cpp rename to src/genecraft/core/entities/mutation/floatmutation.cpp diff --git a/src/genelab/core/entities/mutation/floatmutation.h b/src/genecraft/core/entities/mutation/floatmutation.h similarity index 100% rename from src/genelab/core/entities/mutation/floatmutation.h rename to src/genecraft/core/entities/mutation/floatmutation.h diff --git a/src/genelab/core/entities/mutation/integermutation.cpp b/src/genecraft/core/entities/mutation/integermutation.cpp similarity index 100% rename from src/genelab/core/entities/mutation/integermutation.cpp rename to src/genecraft/core/entities/mutation/integermutation.cpp diff --git a/src/genelab/core/entities/mutation/integermutation.h b/src/genecraft/core/entities/mutation/integermutation.h similarity index 100% rename from src/genelab/core/entities/mutation/integermutation.h rename to src/genecraft/core/entities/mutation/integermutation.h diff --git a/src/genelab/core/entities/mutation/mutation.cpp b/src/genecraft/core/entities/mutation/mutation.cpp similarity index 100% rename from src/genelab/core/entities/mutation/mutation.cpp rename to src/genecraft/core/entities/mutation/mutation.cpp diff --git a/src/genelab/core/entities/mutation/mutation.h b/src/genecraft/core/entities/mutation/mutation.h similarity index 100% rename from src/genelab/core/entities/mutation/mutation.h rename to src/genecraft/core/entities/mutation/mutation.h diff --git a/src/genelab/core/entities/mutation/mutationsmanager.cpp b/src/genecraft/core/entities/mutation/mutationsmanager.cpp similarity index 100% rename from src/genelab/core/entities/mutation/mutationsmanager.cpp rename to src/genecraft/core/entities/mutation/mutationsmanager.cpp diff --git a/src/genelab/core/entities/mutation/mutationsmanager.h b/src/genecraft/core/entities/mutation/mutationsmanager.h similarity index 100% rename from src/genelab/core/entities/mutation/mutationsmanager.h rename to src/genecraft/core/entities/mutation/mutationsmanager.h diff --git a/src/genelab/core/entities/mutation/simpleprobabilitymutation.cpp b/src/genecraft/core/entities/mutation/simpleprobabilitymutation.cpp similarity index 100% rename from src/genelab/core/entities/mutation/simpleprobabilitymutation.cpp rename to src/genecraft/core/entities/mutation/simpleprobabilitymutation.cpp diff --git a/src/genelab/core/entities/mutation/simpleprobabilitymutation.h b/src/genecraft/core/entities/mutation/simpleprobabilitymutation.h similarity index 100% rename from src/genelab/core/entities/mutation/simpleprobabilitymutation.h rename to src/genecraft/core/entities/mutation/simpleprobabilitymutation.h diff --git a/src/genelab/core/entities/mutation/structurallist.cpp b/src/genecraft/core/entities/mutation/structurallist.cpp similarity index 100% rename from src/genelab/core/entities/mutation/structurallist.cpp rename to src/genecraft/core/entities/mutation/structurallist.cpp diff --git a/src/genelab/core/entities/mutation/structurallist.h b/src/genecraft/core/entities/mutation/structurallist.h similarity index 100% rename from src/genelab/core/entities/mutation/structurallist.h rename to src/genecraft/core/entities/mutation/structurallist.h diff --git a/src/genelab/core/entities/mutation/structuralmutation.cpp b/src/genecraft/core/entities/mutation/structuralmutation.cpp similarity index 100% rename from src/genelab/core/entities/mutation/structuralmutation.cpp rename to src/genecraft/core/entities/mutation/structuralmutation.cpp diff --git a/src/genelab/core/entities/mutation/structuralmutation.h b/src/genecraft/core/entities/mutation/structuralmutation.h similarity index 100% rename from src/genelab/core/entities/mutation/structuralmutation.h rename to src/genecraft/core/entities/mutation/structuralmutation.h diff --git a/src/genelab/core/entities/ogrebulletentity.cpp b/src/genecraft/core/entities/ogrebulletentity.cpp similarity index 100% rename from src/genelab/core/entities/ogrebulletentity.cpp rename to src/genecraft/core/entities/ogrebulletentity.cpp diff --git a/src/genelab/core/entities/ogrebulletentityfamily.cpp b/src/genecraft/core/entities/ogrebulletentityfamily.cpp similarity index 100% rename from src/genelab/core/entities/ogrebulletentityfamily.cpp rename to src/genecraft/core/entities/ogrebulletentityfamily.cpp diff --git a/src/genelab/core/entities/sensors/accelerometersensor.cpp b/src/genecraft/core/entities/sensors/accelerometersensor.cpp similarity index 100% rename from src/genelab/core/entities/sensors/accelerometersensor.cpp rename to src/genecraft/core/entities/sensors/accelerometersensor.cpp diff --git a/src/genelab/core/entities/sensors/accelerometersensor.h b/src/genecraft/core/entities/sensors/accelerometersensor.h similarity index 100% rename from src/genelab/core/entities/sensors/accelerometersensor.h rename to src/genecraft/core/entities/sensors/accelerometersensor.h diff --git a/src/genelab/core/entities/sensors/boxsmellsensor.cpp b/src/genecraft/core/entities/sensors/boxsmellsensor.cpp similarity index 100% rename from src/genelab/core/entities/sensors/boxsmellsensor.cpp rename to src/genecraft/core/entities/sensors/boxsmellsensor.cpp diff --git a/src/genelab/core/entities/sensors/boxsmellsensor.h b/src/genecraft/core/entities/sensors/boxsmellsensor.h similarity index 100% rename from src/genelab/core/entities/sensors/boxsmellsensor.h rename to src/genecraft/core/entities/sensors/boxsmellsensor.h diff --git a/src/genelab/core/entities/sensors/contactsensor.cpp b/src/genecraft/core/entities/sensors/contactsensor.cpp similarity index 100% rename from src/genelab/core/entities/sensors/contactsensor.cpp rename to src/genecraft/core/entities/sensors/contactsensor.cpp diff --git a/src/genelab/core/entities/sensors/contactsensor.h b/src/genecraft/core/entities/sensors/contactsensor.h similarity index 100% rename from src/genelab/core/entities/sensors/contactsensor.h rename to src/genecraft/core/entities/sensors/contactsensor.h diff --git a/src/genelab/core/entities/sensors/distancesensor.cpp b/src/genecraft/core/entities/sensors/distancesensor.cpp similarity index 100% rename from src/genelab/core/entities/sensors/distancesensor.cpp rename to src/genecraft/core/entities/sensors/distancesensor.cpp diff --git a/src/genelab/core/entities/sensors/distancesensor.h b/src/genecraft/core/entities/sensors/distancesensor.h similarity index 100% rename from src/genelab/core/entities/sensors/distancesensor.h rename to src/genecraft/core/entities/sensors/distancesensor.h diff --git a/src/genelab/core/entities/sensors/gyroscopicsensor.cpp b/src/genecraft/core/entities/sensors/gyroscopicsensor.cpp similarity index 100% rename from src/genelab/core/entities/sensors/gyroscopicsensor.cpp rename to src/genecraft/core/entities/sensors/gyroscopicsensor.cpp diff --git a/src/genelab/core/entities/sensors/gyroscopicsensor.h b/src/genecraft/core/entities/sensors/gyroscopicsensor.h similarity index 100% rename from src/genelab/core/entities/sensors/gyroscopicsensor.h rename to src/genecraft/core/entities/sensors/gyroscopicsensor.h diff --git a/src/genelab/core/entities/sensors/positionsensor.cpp b/src/genecraft/core/entities/sensors/positionsensor.cpp similarity index 100% rename from src/genelab/core/entities/sensors/positionsensor.cpp rename to src/genecraft/core/entities/sensors/positionsensor.cpp diff --git a/src/genelab/core/entities/sensors/positionsensor.h b/src/genecraft/core/entities/sensors/positionsensor.h similarity index 100% rename from src/genelab/core/entities/sensors/positionsensor.h rename to src/genecraft/core/entities/sensors/positionsensor.h diff --git a/src/genelab/core/entities/sensors/sensor.cpp b/src/genecraft/core/entities/sensors/sensor.cpp similarity index 100% rename from src/genelab/core/entities/sensors/sensor.cpp rename to src/genecraft/core/entities/sensors/sensor.cpp diff --git a/src/genelab/core/entities/sensors/sensor.h b/src/genecraft/core/entities/sensors/sensor.h similarity index 100% rename from src/genelab/core/entities/sensors/sensor.h rename to src/genecraft/core/entities/sensors/sensor.h diff --git a/src/genelab/core/entities/sensors/smellsensor.cpp b/src/genecraft/core/entities/sensors/smellsensor.cpp similarity index 100% rename from src/genelab/core/entities/sensors/smellsensor.cpp rename to src/genecraft/core/entities/sensors/smellsensor.cpp diff --git a/src/genelab/core/entities/sensors/smellsensor.h b/src/genecraft/core/entities/sensors/smellsensor.h similarity index 100% rename from src/genelab/core/entities/sensors/smellsensor.h rename to src/genecraft/core/entities/sensors/smellsensor.h diff --git a/src/genelab/core/entities/statistics/fixationstats.cpp b/src/genecraft/core/entities/statistics/fixationstats.cpp similarity index 100% rename from src/genelab/core/entities/statistics/fixationstats.cpp rename to src/genecraft/core/entities/statistics/fixationstats.cpp diff --git a/src/genelab/core/entities/statistics/fixationstats.h b/src/genecraft/core/entities/statistics/fixationstats.h similarity index 100% rename from src/genelab/core/entities/statistics/fixationstats.h rename to src/genecraft/core/entities/statistics/fixationstats.h diff --git a/src/genelab/core/entities/statistics/statisticsprovider.cpp b/src/genecraft/core/entities/statistics/statisticsprovider.cpp similarity index 100% rename from src/genelab/core/entities/statistics/statisticsprovider.cpp rename to src/genecraft/core/entities/statistics/statisticsprovider.cpp diff --git a/src/genelab/core/entities/statistics/statisticsprovider.h b/src/genecraft/core/entities/statistics/statisticsprovider.h similarity index 100% rename from src/genelab/core/entities/statistics/statisticsprovider.h rename to src/genecraft/core/entities/statistics/statisticsprovider.h diff --git a/src/genelab/core/entities/statistics/statisticsstorage.cpp b/src/genecraft/core/entities/statistics/statisticsstorage.cpp similarity index 100% rename from src/genelab/core/entities/statistics/statisticsstorage.cpp rename to src/genecraft/core/entities/statistics/statisticsstorage.cpp diff --git a/src/genelab/core/entities/statistics/statisticsstorage.h b/src/genecraft/core/entities/statistics/statisticsstorage.h similarity index 100% rename from src/genelab/core/entities/statistics/statisticsstorage.h rename to src/genecraft/core/entities/statistics/statisticsstorage.h diff --git a/src/genelab/core/entities/statistics/treeshapestats.cpp b/src/genecraft/core/entities/statistics/treeshapestats.cpp similarity index 100% rename from src/genelab/core/entities/statistics/treeshapestats.cpp rename to src/genecraft/core/entities/statistics/treeshapestats.cpp diff --git a/src/genelab/core/entities/statistics/treeshapestats.h b/src/genecraft/core/entities/statistics/treeshapestats.h similarity index 100% rename from src/genelab/core/entities/statistics/treeshapestats.h rename to src/genecraft/core/entities/statistics/treeshapestats.h diff --git a/src/genelab/core/experiment/experiment.cpp b/src/genecraft/core/experiment/experiment.cpp similarity index 100% rename from src/genelab/core/experiment/experiment.cpp rename to src/genecraft/core/experiment/experiment.cpp diff --git a/src/genelab/core/experiment/experiment.h b/src/genecraft/core/experiment/experiment.h similarity index 100% rename from src/genelab/core/experiment/experiment.h rename to src/genecraft/core/experiment/experiment.h diff --git a/src/genelab/core/experiment/experimentmanager.cpp b/src/genecraft/core/experiment/experimentmanager.cpp similarity index 100% rename from src/genelab/core/experiment/experimentmanager.cpp rename to src/genecraft/core/experiment/experimentmanager.cpp diff --git a/src/genelab/core/experiment/experimentmanager.h b/src/genecraft/core/experiment/experimentmanager.h similarity index 100% rename from src/genelab/core/experiment/experimentmanager.h rename to src/genecraft/core/experiment/experimentmanager.h diff --git a/src/genelab/core/experiment/result.cpp b/src/genecraft/core/experiment/result.cpp similarity index 100% rename from src/genelab/core/experiment/result.cpp rename to src/genecraft/core/experiment/result.cpp diff --git a/src/genelab/core/experiment/result.h b/src/genecraft/core/experiment/result.h similarity index 100% rename from src/genelab/core/experiment/result.h rename to src/genecraft/core/experiment/result.h diff --git a/src/genelab/core/experiment/resultsmanager.cpp b/src/genecraft/core/experiment/resultsmanager.cpp similarity index 100% rename from src/genelab/core/experiment/resultsmanager.cpp rename to src/genecraft/core/experiment/resultsmanager.cpp diff --git a/src/genelab/core/experiment/resultsmanager.h b/src/genecraft/core/experiment/resultsmanager.h similarity index 100% rename from src/genelab/core/experiment/resultsmanager.h rename to src/genecraft/core/experiment/resultsmanager.h diff --git a/src/genelab/core/factories/btfactory.cpp b/src/genecraft/core/factories/btfactory.cpp similarity index 100% rename from src/genelab/core/factories/btfactory.cpp rename to src/genecraft/core/factories/btfactory.cpp diff --git a/src/genelab/core/factories/btfactory.h b/src/genecraft/core/factories/btfactory.h similarity index 100% rename from src/genelab/core/factories/btfactory.h rename to src/genecraft/core/factories/btfactory.h diff --git a/src/genelab/core/factories/btofactory.cpp b/src/genecraft/core/factories/btofactory.cpp similarity index 100% rename from src/genelab/core/factories/btofactory.cpp rename to src/genecraft/core/factories/btofactory.cpp diff --git a/src/genelab/core/factories/btofactory.h b/src/genecraft/core/factories/btofactory.h similarity index 100% rename from src/genelab/core/factories/btofactory.h rename to src/genecraft/core/factories/btofactory.h diff --git a/src/genelab/core/factories/btoshapesfactory.cpp b/src/genecraft/core/factories/btoshapesfactory.cpp similarity index 100% rename from src/genelab/core/factories/btoshapesfactory.cpp rename to src/genecraft/core/factories/btoshapesfactory.cpp diff --git a/src/genelab/core/factories/btoshapesfactory.h b/src/genecraft/core/factories/btoshapesfactory.h similarity index 100% rename from src/genelab/core/factories/btoshapesfactory.h rename to src/genecraft/core/factories/btoshapesfactory.h diff --git a/src/genelab/core/factories/btoworldfactory.cpp b/src/genecraft/core/factories/btoworldfactory.cpp similarity index 100% rename from src/genelab/core/factories/btoworldfactory.cpp rename to src/genecraft/core/factories/btoworldfactory.cpp diff --git a/src/genelab/core/factories/btoworldfactory.h b/src/genecraft/core/factories/btoworldfactory.h similarity index 100% rename from src/genelab/core/factories/btoworldfactory.h rename to src/genecraft/core/factories/btoworldfactory.h diff --git a/src/genelab/core/factories/btshapesfactory.cpp b/src/genecraft/core/factories/btshapesfactory.cpp similarity index 100% rename from src/genelab/core/factories/btshapesfactory.cpp rename to src/genecraft/core/factories/btshapesfactory.cpp diff --git a/src/genelab/core/factories/btshapesfactory.h b/src/genecraft/core/factories/btshapesfactory.h similarity index 100% rename from src/genelab/core/factories/btshapesfactory.h rename to src/genecraft/core/factories/btshapesfactory.h diff --git a/src/genelab/core/factories/btworldfactory.cpp b/src/genecraft/core/factories/btworldfactory.cpp similarity index 100% rename from src/genelab/core/factories/btworldfactory.cpp rename to src/genecraft/core/factories/btworldfactory.cpp diff --git a/src/genelab/core/factories/btworldfactory.h b/src/genecraft/core/factories/btworldfactory.h similarity index 100% rename from src/genelab/core/factories/btworldfactory.h rename to src/genecraft/core/factories/btworldfactory.h diff --git a/src/genelab/core/factories/creaturefactory.cpp b/src/genecraft/core/factories/creaturefactory.cpp similarity index 100% rename from src/genelab/core/factories/creaturefactory.cpp rename to src/genecraft/core/factories/creaturefactory.cpp diff --git a/src/genelab/core/factories/creaturefactory.h b/src/genecraft/core/factories/creaturefactory.h similarity index 100% rename from src/genelab/core/factories/creaturefactory.h rename to src/genecraft/core/factories/creaturefactory.h diff --git a/src/genelab/core/factories/genome/genomebuilder.cpp b/src/genecraft/core/factories/genome/genomebuilder.cpp similarity index 100% rename from src/genelab/core/factories/genome/genomebuilder.cpp rename to src/genecraft/core/factories/genome/genomebuilder.cpp diff --git a/src/genelab/core/factories/genome/genomebuilder.h b/src/genecraft/core/factories/genome/genomebuilder.h similarity index 100% rename from src/genelab/core/factories/genome/genomebuilder.h rename to src/genecraft/core/factories/genome/genomebuilder.h diff --git a/src/genelab/core/factories/genome/genomemodifier.cpp b/src/genecraft/core/factories/genome/genomemodifier.cpp similarity index 100% rename from src/genelab/core/factories/genome/genomemodifier.cpp rename to src/genecraft/core/factories/genome/genomemodifier.cpp diff --git a/src/genelab/core/factories/genome/genomemodifier.h b/src/genecraft/core/factories/genome/genomemodifier.h similarity index 100% rename from src/genelab/core/factories/genome/genomemodifier.h rename to src/genecraft/core/factories/genome/genomemodifier.h diff --git a/src/genelab/core/factories/ressources/dbrecord.cpp b/src/genecraft/core/factories/ressources/dbrecord.cpp similarity index 100% rename from src/genelab/core/factories/ressources/dbrecord.cpp rename to src/genecraft/core/factories/ressources/dbrecord.cpp diff --git a/src/genelab/core/factories/ressources/dbrecord.h b/src/genecraft/core/factories/ressources/dbrecord.h similarity index 100% rename from src/genelab/core/factories/ressources/dbrecord.h rename to src/genecraft/core/factories/ressources/dbrecord.h diff --git a/src/genelab/core/factories/ressources/jsonfile.cpp b/src/genecraft/core/factories/ressources/jsonfile.cpp similarity index 100% rename from src/genelab/core/factories/ressources/jsonfile.cpp rename to src/genecraft/core/factories/ressources/jsonfile.cpp diff --git a/src/genelab/core/factories/ressources/jsonfile.h b/src/genecraft/core/factories/ressources/jsonfile.h similarity index 100% rename from src/genelab/core/factories/ressources/jsonfile.h rename to src/genecraft/core/factories/ressources/jsonfile.h diff --git a/src/genelab/core/factories/ressources/ressource.cpp b/src/genecraft/core/factories/ressources/ressource.cpp similarity index 100% rename from src/genelab/core/factories/ressources/ressource.cpp rename to src/genecraft/core/factories/ressources/ressource.cpp diff --git a/src/genelab/core/factories/ressources/ressource.h b/src/genecraft/core/factories/ressources/ressource.h similarity index 100% rename from src/genelab/core/factories/ressources/ressource.h rename to src/genecraft/core/factories/ressources/ressource.h diff --git a/src/genelab/core/factories/ressources/ressourcesmanager.cpp b/src/genecraft/core/factories/ressources/ressourcesmanager.cpp similarity index 100% rename from src/genelab/core/factories/ressources/ressourcesmanager.cpp rename to src/genecraft/core/factories/ressources/ressourcesmanager.cpp diff --git a/src/genelab/core/factories/ressources/ressourcesmanager.h b/src/genecraft/core/factories/ressources/ressourcesmanager.h similarity index 100% rename from src/genelab/core/factories/ressources/ressourcesmanager.h rename to src/genecraft/core/factories/ressources/ressourcesmanager.h diff --git a/src/genelab/core/factories/worldfactory.cpp b/src/genecraft/core/factories/worldfactory.cpp similarity index 100% rename from src/genelab/core/factories/worldfactory.cpp rename to src/genecraft/core/factories/worldfactory.cpp diff --git a/src/genelab/core/factories/worldfactory.h b/src/genecraft/core/factories/worldfactory.h similarity index 100% rename from src/genelab/core/factories/worldfactory.h rename to src/genecraft/core/factories/worldfactory.h diff --git a/src/genelab/core/genecraftcoreclasses.h b/src/genecraft/core/genecraftcoreclasses.h similarity index 100% rename from src/genelab/core/genecraftcoreclasses.h rename to src/genecraft/core/genecraftcoreclasses.h diff --git a/src/genelab/core/genelabcoreclasses.h b/src/genecraft/core/genelabcoreclasses.h similarity index 100% rename from src/genelab/core/genelabcoreclasses.h rename to src/genecraft/core/genelabcoreclasses.h diff --git a/src/genelab/core/ressources/help/welcome.html b/src/genecraft/core/ressources/help/welcome.html similarity index 100% rename from src/genelab/core/ressources/help/welcome.html rename to src/genecraft/core/ressources/help/welcome.html diff --git a/src/genelab/core/ressources/img/icons/add.png b/src/genecraft/core/ressources/img/icons/add.png similarity index 100% rename from src/genelab/core/ressources/img/icons/add.png rename to src/genecraft/core/ressources/img/icons/add.png diff --git a/src/genelab/core/ressources/img/icons/anchor.png b/src/genecraft/core/ressources/img/icons/anchor.png similarity index 100% rename from src/genelab/core/ressources/img/icons/anchor.png rename to src/genecraft/core/ressources/img/icons/anchor.png diff --git a/src/genelab/core/ressources/img/icons/arrow_down.png b/src/genecraft/core/ressources/img/icons/arrow_down.png similarity index 100% rename from src/genelab/core/ressources/img/icons/arrow_down.png rename to src/genecraft/core/ressources/img/icons/arrow_down.png diff --git a/src/genelab/core/ressources/img/icons/arrow_merge.png b/src/genecraft/core/ressources/img/icons/arrow_merge.png similarity index 100% rename from src/genelab/core/ressources/img/icons/arrow_merge.png rename to src/genecraft/core/ressources/img/icons/arrow_merge.png diff --git a/src/genelab/core/ressources/img/icons/arrow_refresh.png b/src/genecraft/core/ressources/img/icons/arrow_refresh.png similarity index 100% rename from src/genelab/core/ressources/img/icons/arrow_refresh.png rename to src/genecraft/core/ressources/img/icons/arrow_refresh.png diff --git a/src/genelab/core/ressources/img/icons/arrow_switch.png b/src/genecraft/core/ressources/img/icons/arrow_switch.png similarity index 100% rename from src/genelab/core/ressources/img/icons/arrow_switch.png rename to src/genecraft/core/ressources/img/icons/arrow_switch.png diff --git a/src/genelab/core/ressources/img/icons/arrow_up.png b/src/genecraft/core/ressources/img/icons/arrow_up.png similarity index 100% rename from src/genelab/core/ressources/img/icons/arrow_up.png rename to src/genecraft/core/ressources/img/icons/arrow_up.png diff --git a/src/genelab/core/ressources/img/icons/bone.png b/src/genecraft/core/ressources/img/icons/bone.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bone.png rename to src/genecraft/core/ressources/img/icons/bone.png diff --git a/src/genelab/core/ressources/img/icons/bone_2.png b/src/genecraft/core/ressources/img/icons/bone_2.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bone_2.png rename to src/genecraft/core/ressources/img/icons/bone_2.png diff --git a/src/genelab/core/ressources/img/icons/bone_add.png b/src/genecraft/core/ressources/img/icons/bone_add.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bone_add.png rename to src/genecraft/core/ressources/img/icons/bone_add.png diff --git a/src/genelab/core/ressources/img/icons/bone_and_fixation.png b/src/genecraft/core/ressources/img/icons/bone_and_fixation.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bone_and_fixation.png rename to src/genecraft/core/ressources/img/icons/bone_and_fixation.png diff --git a/src/genelab/core/ressources/img/icons/bone_delete.png b/src/genecraft/core/ressources/img/icons/bone_delete.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bone_delete.png rename to src/genecraft/core/ressources/img/icons/bone_delete.png diff --git a/src/genelab/core/ressources/img/icons/brain.png b/src/genecraft/core/ressources/img/icons/brain.png similarity index 100% rename from src/genelab/core/ressources/img/icons/brain.png rename to src/genecraft/core/ressources/img/icons/brain.png diff --git a/src/genelab/core/ressources/img/icons/brain_activity.png b/src/genecraft/core/ressources/img/icons/brain_activity.png similarity index 100% rename from src/genelab/core/ressources/img/icons/brain_activity.png rename to src/genecraft/core/ressources/img/icons/brain_activity.png diff --git a/src/genelab/core/ressources/img/icons/brain_connections.png b/src/genecraft/core/ressources/img/icons/brain_connections.png similarity index 100% rename from src/genelab/core/ressources/img/icons/brain_connections.png rename to src/genecraft/core/ressources/img/icons/brain_connections.png diff --git a/src/genelab/core/ressources/img/icons/bug.png b/src/genecraft/core/ressources/img/icons/bug.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bug.png rename to src/genecraft/core/ressources/img/icons/bug.png diff --git a/src/genelab/core/ressources/img/icons/bug_add.png b/src/genecraft/core/ressources/img/icons/bug_add.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bug_add.png rename to src/genecraft/core/ressources/img/icons/bug_add.png diff --git a/src/genelab/core/ressources/img/icons/bug_add_from_bdd.png b/src/genecraft/core/ressources/img/icons/bug_add_from_bdd.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bug_add_from_bdd.png rename to src/genecraft/core/ressources/img/icons/bug_add_from_bdd.png diff --git a/src/genelab/core/ressources/img/icons/bug_add_random.png b/src/genecraft/core/ressources/img/icons/bug_add_random.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bug_add_random.png rename to src/genecraft/core/ressources/img/icons/bug_add_random.png diff --git a/src/genelab/core/ressources/img/icons/bug_camera.png b/src/genecraft/core/ressources/img/icons/bug_camera.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bug_camera.png rename to src/genecraft/core/ressources/img/icons/bug_camera.png diff --git a/src/genelab/core/ressources/img/icons/bug_delete.png b/src/genecraft/core/ressources/img/icons/bug_delete.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bug_delete.png rename to src/genecraft/core/ressources/img/icons/bug_delete.png diff --git a/src/genelab/core/ressources/img/icons/bug_delete_all.png b/src/genecraft/core/ressources/img/icons/bug_delete_all.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bug_delete_all.png rename to src/genecraft/core/ressources/img/icons/bug_delete_all.png diff --git a/src/genelab/core/ressources/img/icons/bug_delete_all_except_one.png b/src/genecraft/core/ressources/img/icons/bug_delete_all_except_one.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bug_delete_all_except_one.png rename to src/genecraft/core/ressources/img/icons/bug_delete_all_except_one.png diff --git a/src/genelab/core/ressources/img/icons/bug_error.png b/src/genecraft/core/ressources/img/icons/bug_error.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bug_error.png rename to src/genecraft/core/ressources/img/icons/bug_error.png diff --git a/src/genelab/core/ressources/img/icons/bug_mutation.png b/src/genecraft/core/ressources/img/icons/bug_mutation.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bug_mutation.png rename to src/genecraft/core/ressources/img/icons/bug_mutation.png diff --git a/src/genelab/core/ressources/img/icons/bug_save.png b/src/genecraft/core/ressources/img/icons/bug_save.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bug_save.png rename to src/genecraft/core/ressources/img/icons/bug_save.png diff --git a/src/genelab/core/ressources/img/icons/bug_shadow.png b/src/genecraft/core/ressources/img/icons/bug_shadow.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bug_shadow.png rename to src/genecraft/core/ressources/img/icons/bug_shadow.png diff --git a/src/genelab/core/ressources/img/icons/bugs.png b/src/genecraft/core/ressources/img/icons/bugs.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bugs.png rename to src/genecraft/core/ressources/img/icons/bugs.png diff --git a/src/genelab/core/ressources/img/icons/bugs_go.png b/src/genecraft/core/ressources/img/icons/bugs_go.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bugs_go.png rename to src/genecraft/core/ressources/img/icons/bugs_go.png diff --git a/src/genelab/core/ressources/img/icons/bullet_add.png b/src/genecraft/core/ressources/img/icons/bullet_add.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bullet_add.png rename to src/genecraft/core/ressources/img/icons/bullet_add.png diff --git a/src/genelab/core/ressources/img/icons/bullet_edit.png b/src/genecraft/core/ressources/img/icons/bullet_edit.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bullet_edit.png rename to src/genecraft/core/ressources/img/icons/bullet_edit.png diff --git a/src/genelab/core/ressources/img/icons/bullet_feed.png b/src/genecraft/core/ressources/img/icons/bullet_feed.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bullet_feed.png rename to src/genecraft/core/ressources/img/icons/bullet_feed.png diff --git a/src/genelab/core/ressources/img/icons/bullet_physics_library.png b/src/genecraft/core/ressources/img/icons/bullet_physics_library.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bullet_physics_library.png rename to src/genecraft/core/ressources/img/icons/bullet_physics_library.png diff --git a/src/genelab/core/ressources/img/icons/bullet_physics_library_play.png b/src/genecraft/core/ressources/img/icons/bullet_physics_library_play.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bullet_physics_library_play.png rename to src/genecraft/core/ressources/img/icons/bullet_physics_library_play.png diff --git a/src/genelab/core/ressources/img/icons/bullet_physics_library_stop.png b/src/genecraft/core/ressources/img/icons/bullet_physics_library_stop.png similarity index 100% rename from src/genelab/core/ressources/img/icons/bullet_physics_library_stop.png rename to src/genecraft/core/ressources/img/icons/bullet_physics_library_stop.png diff --git a/src/genelab/core/ressources/img/icons/camera.png b/src/genecraft/core/ressources/img/icons/camera.png similarity index 100% rename from src/genelab/core/ressources/img/icons/camera.png rename to src/genecraft/core/ressources/img/icons/camera.png diff --git a/src/genelab/core/ressources/img/icons/chart_curve.png b/src/genecraft/core/ressources/img/icons/chart_curve.png similarity index 100% rename from src/genelab/core/ressources/img/icons/chart_curve.png rename to src/genecraft/core/ressources/img/icons/chart_curve.png diff --git a/src/genelab/core/ressources/img/icons/chart_line.png b/src/genecraft/core/ressources/img/icons/chart_line.png similarity index 100% rename from src/genelab/core/ressources/img/icons/chart_line.png rename to src/genecraft/core/ressources/img/icons/chart_line.png diff --git a/src/genelab/core/ressources/img/icons/cog.png b/src/genecraft/core/ressources/img/icons/cog.png similarity index 100% rename from src/genelab/core/ressources/img/icons/cog.png rename to src/genecraft/core/ressources/img/icons/cog.png diff --git a/src/genelab/core/ressources/img/icons/cog_add.png b/src/genecraft/core/ressources/img/icons/cog_add.png similarity index 100% rename from src/genelab/core/ressources/img/icons/cog_add.png rename to src/genecraft/core/ressources/img/icons/cog_add.png diff --git a/src/genelab/core/ressources/img/icons/cog_delete.png b/src/genecraft/core/ressources/img/icons/cog_delete.png similarity index 100% rename from src/genelab/core/ressources/img/icons/cog_delete.png rename to src/genecraft/core/ressources/img/icons/cog_delete.png diff --git a/src/genelab/core/ressources/img/icons/cog_feed.png b/src/genecraft/core/ressources/img/icons/cog_feed.png similarity index 100% rename from src/genelab/core/ressources/img/icons/cog_feed.png rename to src/genecraft/core/ressources/img/icons/cog_feed.png diff --git a/src/genelab/core/ressources/img/icons/cog_go.png b/src/genecraft/core/ressources/img/icons/cog_go.png similarity index 100% rename from src/genelab/core/ressources/img/icons/cog_go.png rename to src/genecraft/core/ressources/img/icons/cog_go.png diff --git a/src/genelab/core/ressources/img/icons/control_play_blue.png b/src/genecraft/core/ressources/img/icons/control_play_blue.png similarity index 100% rename from src/genelab/core/ressources/img/icons/control_play_blue.png rename to src/genecraft/core/ressources/img/icons/control_play_blue.png diff --git a/src/genelab/core/ressources/img/icons/database.png b/src/genecraft/core/ressources/img/icons/database.png similarity index 100% rename from src/genelab/core/ressources/img/icons/database.png rename to src/genecraft/core/ressources/img/icons/database.png diff --git a/src/genelab/core/ressources/img/icons/delete.png b/src/genecraft/core/ressources/img/icons/delete.png similarity index 100% rename from src/genelab/core/ressources/img/icons/delete.png rename to src/genecraft/core/ressources/img/icons/delete.png diff --git a/src/genelab/core/ressources/img/icons/dna.png b/src/genecraft/core/ressources/img/icons/dna.png similarity index 100% rename from src/genelab/core/ressources/img/icons/dna.png rename to src/genecraft/core/ressources/img/icons/dna.png diff --git a/src/genelab/core/ressources/img/icons/dna_32.png b/src/genecraft/core/ressources/img/icons/dna_32.png similarity index 100% rename from src/genelab/core/ressources/img/icons/dna_32.png rename to src/genecraft/core/ressources/img/icons/dna_32.png diff --git a/src/genelab/core/ressources/img/icons/dna_64.png b/src/genecraft/core/ressources/img/icons/dna_64.png similarity index 100% rename from src/genelab/core/ressources/img/icons/dna_64.png rename to src/genecraft/core/ressources/img/icons/dna_64.png diff --git a/src/genelab/core/ressources/img/icons/door_out.png b/src/genecraft/core/ressources/img/icons/door_out.png similarity index 100% rename from src/genelab/core/ressources/img/icons/door_out.png rename to src/genecraft/core/ressources/img/icons/door_out.png diff --git a/src/genelab/core/ressources/img/icons/entity_new.png b/src/genecraft/core/ressources/img/icons/entity_new.png similarity index 100% rename from src/genelab/core/ressources/img/icons/entity_new.png rename to src/genecraft/core/ressources/img/icons/entity_new.png diff --git a/src/genelab/core/ressources/img/icons/entity_vcard.png b/src/genecraft/core/ressources/img/icons/entity_vcard.png similarity index 100% rename from src/genelab/core/ressources/img/icons/entity_vcard.png rename to src/genecraft/core/ressources/img/icons/entity_vcard.png diff --git a/src/genelab/core/ressources/img/icons/feed.png b/src/genecraft/core/ressources/img/icons/feed.png similarity index 100% rename from src/genelab/core/ressources/img/icons/feed.png rename to src/genecraft/core/ressources/img/icons/feed.png diff --git a/src/genelab/core/ressources/img/icons/feed_add.png b/src/genecraft/core/ressources/img/icons/feed_add.png similarity index 100% rename from src/genelab/core/ressources/img/icons/feed_add.png rename to src/genecraft/core/ressources/img/icons/feed_add.png diff --git a/src/genelab/core/ressources/img/icons/feed_delete.png b/src/genecraft/core/ressources/img/icons/feed_delete.png similarity index 100% rename from src/genelab/core/ressources/img/icons/feed_delete.png rename to src/genecraft/core/ressources/img/icons/feed_delete.png diff --git a/src/genelab/core/ressources/img/icons/fixation.png b/src/genecraft/core/ressources/img/icons/fixation.png similarity index 100% rename from src/genelab/core/ressources/img/icons/fixation.png rename to src/genecraft/core/ressources/img/icons/fixation.png diff --git a/src/genelab/core/ressources/img/icons/folder_report.png b/src/genecraft/core/ressources/img/icons/folder_report.png similarity index 100% rename from src/genelab/core/ressources/img/icons/folder_report.png rename to src/genecraft/core/ressources/img/icons/folder_report.png diff --git a/src/genelab/core/ressources/img/icons/folder_world.png b/src/genecraft/core/ressources/img/icons/folder_world.png similarity index 100% rename from src/genelab/core/ressources/img/icons/folder_world.png rename to src/genecraft/core/ressources/img/icons/folder_world.png diff --git a/src/genelab/core/ressources/img/icons/help.png b/src/genecraft/core/ressources/img/icons/help.png similarity index 100% rename from src/genelab/core/ressources/img/icons/help.png rename to src/genecraft/core/ressources/img/icons/help.png diff --git a/src/genelab/core/ressources/img/icons/information.png b/src/genecraft/core/ressources/img/icons/information.png similarity index 100% rename from src/genelab/core/ressources/img/icons/information.png rename to src/genecraft/core/ressources/img/icons/information.png diff --git a/src/genelab/core/ressources/img/icons/magnifier.png b/src/genecraft/core/ressources/img/icons/magnifier.png similarity index 100% rename from src/genelab/core/ressources/img/icons/magnifier.png rename to src/genecraft/core/ressources/img/icons/magnifier.png diff --git a/src/genelab/core/ressources/img/icons/new.png b/src/genecraft/core/ressources/img/icons/new.png similarity index 100% rename from src/genelab/core/ressources/img/icons/new.png rename to src/genecraft/core/ressources/img/icons/new.png diff --git a/src/genelab/core/ressources/img/icons/page_green.png b/src/genecraft/core/ressources/img/icons/page_green.png similarity index 100% rename from src/genelab/core/ressources/img/icons/page_green.png rename to src/genecraft/core/ressources/img/icons/page_green.png diff --git a/src/genelab/core/ressources/img/icons/page_white_magnify.png b/src/genecraft/core/ressources/img/icons/page_white_magnify.png similarity index 100% rename from src/genelab/core/ressources/img/icons/page_white_magnify.png rename to src/genecraft/core/ressources/img/icons/page_white_magnify.png diff --git a/src/genelab/core/ressources/img/icons/report.png b/src/genecraft/core/ressources/img/icons/report.png similarity index 100% rename from src/genelab/core/ressources/img/icons/report.png rename to src/genecraft/core/ressources/img/icons/report.png diff --git a/src/genelab/core/ressources/img/icons/report_disk.png b/src/genecraft/core/ressources/img/icons/report_disk.png similarity index 100% rename from src/genelab/core/ressources/img/icons/report_disk.png rename to src/genecraft/core/ressources/img/icons/report_disk.png diff --git a/src/genelab/core/ressources/img/icons/report_go.png b/src/genecraft/core/ressources/img/icons/report_go.png similarity index 100% rename from src/genelab/core/ressources/img/icons/report_go.png rename to src/genecraft/core/ressources/img/icons/report_go.png diff --git a/src/genelab/core/ressources/img/icons/ruler_pencil_32.png b/src/genecraft/core/ressources/img/icons/ruler_pencil_32.png similarity index 100% rename from src/genelab/core/ressources/img/icons/ruler_pencil_32.png rename to src/genecraft/core/ressources/img/icons/ruler_pencil_32.png diff --git a/src/genelab/core/ressources/img/icons/theater_32.png b/src/genecraft/core/ressources/img/icons/theater_32.png similarity index 100% rename from src/genelab/core/ressources/img/icons/theater_32.png rename to src/genecraft/core/ressources/img/icons/theater_32.png diff --git a/src/genelab/core/ressources/img/icons/thumbtack.png b/src/genecraft/core/ressources/img/icons/thumbtack.png similarity index 100% rename from src/genelab/core/ressources/img/icons/thumbtack.png rename to src/genecraft/core/ressources/img/icons/thumbtack.png diff --git a/src/genelab/core/ressources/img/icons/world.png b/src/genecraft/core/ressources/img/icons/world.png similarity index 100% rename from src/genelab/core/ressources/img/icons/world.png rename to src/genecraft/core/ressources/img/icons/world.png diff --git a/src/genelab/core/ressources/img/icons/world_save.png b/src/genecraft/core/ressources/img/icons/world_save.png similarity index 100% rename from src/genelab/core/ressources/img/icons/world_save.png rename to src/genecraft/core/ressources/img/icons/world_save.png diff --git a/src/genelab/core/ressources/img/icons/wrench.png b/src/genecraft/core/ressources/img/icons/wrench.png similarity index 100% rename from src/genelab/core/ressources/img/icons/wrench.png rename to src/genecraft/core/ressources/img/icons/wrench.png diff --git a/src/genelab/core/ressources/img/logos/GeneCraft.png b/src/genecraft/core/ressources/img/logos/GeneCraft.png similarity index 100% rename from src/genelab/core/ressources/img/logos/GeneCraft.png rename to src/genecraft/core/ressources/img/logos/GeneCraft.png diff --git a/src/genelab/core/ressources/img/logos/splash.png b/src/genecraft/core/ressources/img/logos/splash.png similarity index 100% rename from src/genelab/core/ressources/img/logos/splash.png rename to src/genecraft/core/ressources/img/logos/splash.png diff --git a/src/genelab/core/ressources/img/logos/splash.xcf b/src/genecraft/core/ressources/img/logos/splash.xcf similarity index 100% rename from src/genelab/core/ressources/img/logos/splash.xcf rename to src/genecraft/core/ressources/img/logos/splash.xcf diff --git a/src/genelab/core/ressources/js/js-beautifull.js b/src/genecraft/core/ressources/js/js-beautifull.js similarity index 100% rename from src/genelab/core/ressources/js/js-beautifull.js rename to src/genecraft/core/ressources/js/js-beautifull.js diff --git a/src/genelab/core/ressources/ressources.qrc b/src/genecraft/core/ressources/ressources.qrc similarity index 100% rename from src/genelab/core/ressources/ressources.qrc rename to src/genecraft/core/ressources/ressources.qrc diff --git a/src/genelab/core/ui/widgets/entities/bodyitems.h b/src/genecraft/core/ui/widgets/entities/bodyitems.h similarity index 100% rename from src/genelab/core/ui/widgets/entities/bodyitems.h rename to src/genecraft/core/ui/widgets/entities/bodyitems.h diff --git a/src/genelab/core/ui/widgets/entities/bonepropertiescontroller.cpp b/src/genecraft/core/ui/widgets/entities/bonepropertiescontroller.cpp similarity index 100% rename from src/genelab/core/ui/widgets/entities/bonepropertiescontroller.cpp rename to src/genecraft/core/ui/widgets/entities/bonepropertiescontroller.cpp diff --git a/src/genelab/core/ui/widgets/entities/bonepropertiescontroller.h b/src/genecraft/core/ui/widgets/entities/bonepropertiescontroller.h similarity index 100% rename from src/genelab/core/ui/widgets/entities/bonepropertiescontroller.h rename to src/genecraft/core/ui/widgets/entities/bonepropertiescontroller.h diff --git a/src/genelab/core/ui/widgets/entities/bonepropertiescontroller.ui b/src/genecraft/core/ui/widgets/entities/bonepropertiescontroller.ui similarity index 100% rename from src/genelab/core/ui/widgets/entities/bonepropertiescontroller.ui rename to src/genecraft/core/ui/widgets/entities/bonepropertiescontroller.ui diff --git a/src/genelab/core/ui/widgets/entities/brainpropertiescontroller.cpp b/src/genecraft/core/ui/widgets/entities/brainpropertiescontroller.cpp similarity index 100% rename from src/genelab/core/ui/widgets/entities/brainpropertiescontroller.cpp rename to src/genecraft/core/ui/widgets/entities/brainpropertiescontroller.cpp diff --git a/src/genelab/core/ui/widgets/entities/brainpropertiescontroller.h b/src/genecraft/core/ui/widgets/entities/brainpropertiescontroller.h similarity index 100% rename from src/genelab/core/ui/widgets/entities/brainpropertiescontroller.h rename to src/genecraft/core/ui/widgets/entities/brainpropertiescontroller.h diff --git a/src/genelab/core/ui/widgets/entities/brainpropertiescontroller.ui b/src/genecraft/core/ui/widgets/entities/brainpropertiescontroller.ui similarity index 100% rename from src/genelab/core/ui/widgets/entities/brainpropertiescontroller.ui rename to src/genecraft/core/ui/widgets/entities/brainpropertiescontroller.ui diff --git a/src/genelab/core/ui/widgets/entities/entitypropertiescontroller.cpp b/src/genecraft/core/ui/widgets/entities/entitypropertiescontroller.cpp similarity index 100% rename from src/genelab/core/ui/widgets/entities/entitypropertiescontroller.cpp rename to src/genecraft/core/ui/widgets/entities/entitypropertiescontroller.cpp diff --git a/src/genelab/core/ui/widgets/entities/entitypropertiescontroller.h b/src/genecraft/core/ui/widgets/entities/entitypropertiescontroller.h similarity index 100% rename from src/genelab/core/ui/widgets/entities/entitypropertiescontroller.h rename to src/genecraft/core/ui/widgets/entities/entitypropertiescontroller.h diff --git a/src/genelab/core/ui/widgets/entities/entitypropertiescontroller.ui b/src/genecraft/core/ui/widgets/entities/entitypropertiescontroller.ui similarity index 100% rename from src/genelab/core/ui/widgets/entities/entitypropertiescontroller.ui rename to src/genecraft/core/ui/widgets/entities/entitypropertiescontroller.ui diff --git a/src/genelab/core/ui/widgets/entities/fixationpropertiescontroller.cpp b/src/genecraft/core/ui/widgets/entities/fixationpropertiescontroller.cpp similarity index 100% rename from src/genelab/core/ui/widgets/entities/fixationpropertiescontroller.cpp rename to src/genecraft/core/ui/widgets/entities/fixationpropertiescontroller.cpp diff --git a/src/genelab/core/ui/widgets/entities/fixationpropertiescontroller.h b/src/genecraft/core/ui/widgets/entities/fixationpropertiescontroller.h similarity index 100% rename from src/genelab/core/ui/widgets/entities/fixationpropertiescontroller.h rename to src/genecraft/core/ui/widgets/entities/fixationpropertiescontroller.h diff --git a/src/genelab/core/ui/widgets/entities/fixationpropertiescontroller.ui b/src/genecraft/core/ui/widgets/entities/fixationpropertiescontroller.ui similarity index 100% rename from src/genelab/core/ui/widgets/entities/fixationpropertiescontroller.ui rename to src/genecraft/core/ui/widgets/entities/fixationpropertiescontroller.ui diff --git a/src/genelab/core/ui/widgets/entities/generic6dofconstraintcontroller.cpp b/src/genecraft/core/ui/widgets/entities/generic6dofconstraintcontroller.cpp similarity index 100% rename from src/genelab/core/ui/widgets/entities/generic6dofconstraintcontroller.cpp rename to src/genecraft/core/ui/widgets/entities/generic6dofconstraintcontroller.cpp diff --git a/src/genelab/core/ui/widgets/entities/generic6dofconstraintcontroller.h b/src/genecraft/core/ui/widgets/entities/generic6dofconstraintcontroller.h similarity index 100% rename from src/genelab/core/ui/widgets/entities/generic6dofconstraintcontroller.h rename to src/genecraft/core/ui/widgets/entities/generic6dofconstraintcontroller.h diff --git a/src/genelab/core/ui/widgets/entities/generic6dofconstraintcontroller.ui b/src/genecraft/core/ui/widgets/entities/generic6dofconstraintcontroller.ui similarity index 100% rename from src/genelab/core/ui/widgets/entities/generic6dofconstraintcontroller.ui rename to src/genecraft/core/ui/widgets/entities/generic6dofconstraintcontroller.ui diff --git a/src/genelab/core/ui/widgets/entities/pluggriddesignvisualizer.cpp b/src/genecraft/core/ui/widgets/entities/pluggriddesignvisualizer.cpp similarity index 100% rename from src/genelab/core/ui/widgets/entities/pluggriddesignvisualizer.cpp rename to src/genecraft/core/ui/widgets/entities/pluggriddesignvisualizer.cpp diff --git a/src/genelab/core/ui/widgets/entities/pluggriddesignvisualizer.h b/src/genecraft/core/ui/widgets/entities/pluggriddesignvisualizer.h similarity index 100% rename from src/genelab/core/ui/widgets/entities/pluggriddesignvisualizer.h rename to src/genecraft/core/ui/widgets/entities/pluggriddesignvisualizer.h diff --git a/src/genelab/core/ui/widgets/entities/pluggridvisualizer.cpp b/src/genecraft/core/ui/widgets/entities/pluggridvisualizer.cpp similarity index 100% rename from src/genelab/core/ui/widgets/entities/pluggridvisualizer.cpp rename to src/genecraft/core/ui/widgets/entities/pluggridvisualizer.cpp diff --git a/src/genelab/core/ui/widgets/entities/pluggridvisualizer.h b/src/genecraft/core/ui/widgets/entities/pluggridvisualizer.h similarity index 100% rename from src/genelab/core/ui/widgets/entities/pluggridvisualizer.h rename to src/genecraft/core/ui/widgets/entities/pluggridvisualizer.h diff --git a/src/genelab/core/ui/widgets/entities/statisticspropertiescontroller.cpp b/src/genecraft/core/ui/widgets/entities/statisticspropertiescontroller.cpp similarity index 100% rename from src/genelab/core/ui/widgets/entities/statisticspropertiescontroller.cpp rename to src/genecraft/core/ui/widgets/entities/statisticspropertiescontroller.cpp diff --git a/src/genelab/core/ui/widgets/entities/statisticspropertiescontroller.h b/src/genecraft/core/ui/widgets/entities/statisticspropertiescontroller.h similarity index 100% rename from src/genelab/core/ui/widgets/entities/statisticspropertiescontroller.h rename to src/genecraft/core/ui/widgets/entities/statisticspropertiescontroller.h diff --git a/src/genelab/core/ui/widgets/entities/statisticspropertiescontroller.ui b/src/genecraft/core/ui/widgets/entities/statisticspropertiescontroller.ui similarity index 100% rename from src/genelab/core/ui/widgets/entities/statisticspropertiescontroller.ui rename to src/genecraft/core/ui/widgets/entities/statisticspropertiescontroller.ui diff --git a/src/genelab/core/ui/widgets/experiments/conversionctrl.cpp b/src/genecraft/core/ui/widgets/experiments/conversionctrl.cpp similarity index 100% rename from src/genelab/core/ui/widgets/experiments/conversionctrl.cpp rename to src/genecraft/core/ui/widgets/experiments/conversionctrl.cpp diff --git a/src/genelab/core/ui/widgets/experiments/conversionctrl.h b/src/genecraft/core/ui/widgets/experiments/conversionctrl.h similarity index 100% rename from src/genelab/core/ui/widgets/experiments/conversionctrl.h rename to src/genecraft/core/ui/widgets/experiments/conversionctrl.h diff --git a/src/genelab/core/ui/widgets/experiments/conversionctrl.ui b/src/genecraft/core/ui/widgets/experiments/conversionctrl.ui similarity index 100% rename from src/genelab/core/ui/widgets/experiments/conversionctrl.ui rename to src/genecraft/core/ui/widgets/experiments/conversionctrl.ui diff --git a/src/genelab/core/ui/widgets/experiments/experimentctrl.cpp b/src/genecraft/core/ui/widgets/experiments/experimentctrl.cpp similarity index 100% rename from src/genelab/core/ui/widgets/experiments/experimentctrl.cpp rename to src/genecraft/core/ui/widgets/experiments/experimentctrl.cpp diff --git a/src/genelab/core/ui/widgets/experiments/experimentctrl.h b/src/genecraft/core/ui/widgets/experiments/experimentctrl.h similarity index 100% rename from src/genelab/core/ui/widgets/experiments/experimentctrl.h rename to src/genecraft/core/ui/widgets/experiments/experimentctrl.h diff --git a/src/genelab/core/ui/widgets/experiments/experimentctrl.ui b/src/genecraft/core/ui/widgets/experiments/experimentctrl.ui similarity index 100% rename from src/genelab/core/ui/widgets/experiments/experimentctrl.ui rename to src/genecraft/core/ui/widgets/experiments/experimentctrl.ui diff --git a/src/genelab/core/ui/widgets/experiments/experimentspropertiescontroller.cpp b/src/genecraft/core/ui/widgets/experiments/experimentspropertiescontroller.cpp similarity index 100% rename from src/genelab/core/ui/widgets/experiments/experimentspropertiescontroller.cpp rename to src/genecraft/core/ui/widgets/experiments/experimentspropertiescontroller.cpp diff --git a/src/genelab/core/ui/widgets/experiments/experimentspropertiescontroller.h b/src/genecraft/core/ui/widgets/experiments/experimentspropertiescontroller.h similarity index 100% rename from src/genelab/core/ui/widgets/experiments/experimentspropertiescontroller.h rename to src/genecraft/core/ui/widgets/experiments/experimentspropertiescontroller.h diff --git a/src/genelab/core/ui/widgets/experiments/experimentspropertiescontroller.ui b/src/genecraft/core/ui/widgets/experiments/experimentspropertiescontroller.ui similarity index 100% rename from src/genelab/core/ui/widgets/experiments/experimentspropertiescontroller.ui rename to src/genecraft/core/ui/widgets/experiments/experimentspropertiescontroller.ui diff --git a/src/genelab/core/ui/widgets/experiments/floatmutationcontroller.cpp b/src/genecraft/core/ui/widgets/experiments/floatmutationcontroller.cpp similarity index 100% rename from src/genelab/core/ui/widgets/experiments/floatmutationcontroller.cpp rename to src/genecraft/core/ui/widgets/experiments/floatmutationcontroller.cpp diff --git a/src/genelab/core/ui/widgets/experiments/floatmutationcontroller.h b/src/genecraft/core/ui/widgets/experiments/floatmutationcontroller.h similarity index 100% rename from src/genelab/core/ui/widgets/experiments/floatmutationcontroller.h rename to src/genecraft/core/ui/widgets/experiments/floatmutationcontroller.h diff --git a/src/genelab/core/ui/widgets/experiments/floatmutationcontroller.ui b/src/genecraft/core/ui/widgets/experiments/floatmutationcontroller.ui similarity index 100% rename from src/genelab/core/ui/widgets/experiments/floatmutationcontroller.ui rename to src/genecraft/core/ui/widgets/experiments/floatmutationcontroller.ui diff --git a/src/genelab/core/ui/widgets/experiments/floordialog.cpp b/src/genecraft/core/ui/widgets/experiments/floordialog.cpp similarity index 100% rename from src/genelab/core/ui/widgets/experiments/floordialog.cpp rename to src/genecraft/core/ui/widgets/experiments/floordialog.cpp diff --git a/src/genelab/core/ui/widgets/experiments/floordialog.h b/src/genecraft/core/ui/widgets/experiments/floordialog.h similarity index 100% rename from src/genelab/core/ui/widgets/experiments/floordialog.h rename to src/genecraft/core/ui/widgets/experiments/floordialog.h diff --git a/src/genelab/core/ui/widgets/experiments/floordialog.ui b/src/genecraft/core/ui/widgets/experiments/floordialog.ui similarity index 100% rename from src/genelab/core/ui/widgets/experiments/floordialog.ui rename to src/genecraft/core/ui/widgets/experiments/floordialog.ui diff --git a/src/genelab/core/ui/widgets/experiments/integermutationcontroller.cpp b/src/genecraft/core/ui/widgets/experiments/integermutationcontroller.cpp similarity index 100% rename from src/genelab/core/ui/widgets/experiments/integermutationcontroller.cpp rename to src/genecraft/core/ui/widgets/experiments/integermutationcontroller.cpp diff --git a/src/genelab/core/ui/widgets/experiments/integermutationcontroller.h b/src/genecraft/core/ui/widgets/experiments/integermutationcontroller.h similarity index 100% rename from src/genelab/core/ui/widgets/experiments/integermutationcontroller.h rename to src/genecraft/core/ui/widgets/experiments/integermutationcontroller.h diff --git a/src/genelab/core/ui/widgets/experiments/integermutationcontroller.ui b/src/genecraft/core/ui/widgets/experiments/integermutationcontroller.ui similarity index 100% rename from src/genelab/core/ui/widgets/experiments/integermutationcontroller.ui rename to src/genecraft/core/ui/widgets/experiments/integermutationcontroller.ui diff --git a/src/genelab/core/ui/widgets/experiments/mutationelementcontroller.cpp b/src/genecraft/core/ui/widgets/experiments/mutationelementcontroller.cpp similarity index 100% rename from src/genelab/core/ui/widgets/experiments/mutationelementcontroller.cpp rename to src/genecraft/core/ui/widgets/experiments/mutationelementcontroller.cpp diff --git a/src/genelab/core/ui/widgets/experiments/mutationelementcontroller.h b/src/genecraft/core/ui/widgets/experiments/mutationelementcontroller.h similarity index 100% rename from src/genelab/core/ui/widgets/experiments/mutationelementcontroller.h rename to src/genecraft/core/ui/widgets/experiments/mutationelementcontroller.h diff --git a/src/genelab/core/ui/widgets/experiments/mutationelementcontroller.ui b/src/genecraft/core/ui/widgets/experiments/mutationelementcontroller.ui similarity index 100% rename from src/genelab/core/ui/widgets/experiments/mutationelementcontroller.ui rename to src/genecraft/core/ui/widgets/experiments/mutationelementcontroller.ui diff --git a/src/genelab/core/ui/widgets/experiments/ressourcesItems.h b/src/genecraft/core/ui/widgets/experiments/ressourcesItems.h similarity index 100% rename from src/genelab/core/ui/widgets/experiments/ressourcesItems.h rename to src/genecraft/core/ui/widgets/experiments/ressourcesItems.h diff --git a/src/genelab/core/ui/widgets/experiments/ressourcesbrowser.cpp b/src/genecraft/core/ui/widgets/experiments/ressourcesbrowser.cpp similarity index 100% rename from src/genelab/core/ui/widgets/experiments/ressourcesbrowser.cpp rename to src/genecraft/core/ui/widgets/experiments/ressourcesbrowser.cpp diff --git a/src/genelab/core/ui/widgets/experiments/ressourcesbrowser.h b/src/genecraft/core/ui/widgets/experiments/ressourcesbrowser.h similarity index 100% rename from src/genelab/core/ui/widgets/experiments/ressourcesbrowser.h rename to src/genecraft/core/ui/widgets/experiments/ressourcesbrowser.h diff --git a/src/genelab/core/ui/widgets/experiments/ressourcesbrowser.ui b/src/genecraft/core/ui/widgets/experiments/ressourcesbrowser.ui similarity index 100% rename from src/genelab/core/ui/widgets/experiments/ressourcesbrowser.ui rename to src/genecraft/core/ui/widgets/experiments/ressourcesbrowser.ui diff --git a/src/genelab/core/ui/widgets/experiments/simpleprobabilitycontroller.cpp b/src/genecraft/core/ui/widgets/experiments/simpleprobabilitycontroller.cpp similarity index 100% rename from src/genelab/core/ui/widgets/experiments/simpleprobabilitycontroller.cpp rename to src/genecraft/core/ui/widgets/experiments/simpleprobabilitycontroller.cpp diff --git a/src/genelab/core/ui/widgets/experiments/simpleprobabilitycontroller.h b/src/genecraft/core/ui/widgets/experiments/simpleprobabilitycontroller.h similarity index 100% rename from src/genelab/core/ui/widgets/experiments/simpleprobabilitycontroller.h rename to src/genecraft/core/ui/widgets/experiments/simpleprobabilitycontroller.h diff --git a/src/genelab/core/ui/widgets/experiments/simpleprobabilitycontroller.ui b/src/genecraft/core/ui/widgets/experiments/simpleprobabilitycontroller.ui similarity index 100% rename from src/genelab/core/ui/widgets/experiments/simpleprobabilitycontroller.ui rename to src/genecraft/core/ui/widgets/experiments/simpleprobabilitycontroller.ui diff --git a/src/genelab/core/ui/widgets/experiments/structuralmutationcontroller.cpp b/src/genecraft/core/ui/widgets/experiments/structuralmutationcontroller.cpp similarity index 100% rename from src/genelab/core/ui/widgets/experiments/structuralmutationcontroller.cpp rename to src/genecraft/core/ui/widgets/experiments/structuralmutationcontroller.cpp diff --git a/src/genelab/core/ui/widgets/experiments/structuralmutationcontroller.h b/src/genecraft/core/ui/widgets/experiments/structuralmutationcontroller.h similarity index 100% rename from src/genelab/core/ui/widgets/experiments/structuralmutationcontroller.h rename to src/genecraft/core/ui/widgets/experiments/structuralmutationcontroller.h diff --git a/src/genelab/core/ui/widgets/experiments/structuralmutationcontroller.ui b/src/genecraft/core/ui/widgets/experiments/structuralmutationcontroller.ui similarity index 100% rename from src/genelab/core/ui/widgets/experiments/structuralmutationcontroller.ui rename to src/genecraft/core/ui/widgets/experiments/structuralmutationcontroller.ui diff --git a/src/genelab/core/ui/widgets/experiments/workerconfiguration.cpp b/src/genecraft/core/ui/widgets/experiments/workerconfiguration.cpp similarity index 100% rename from src/genelab/core/ui/widgets/experiments/workerconfiguration.cpp rename to src/genecraft/core/ui/widgets/experiments/workerconfiguration.cpp diff --git a/src/genelab/core/ui/widgets/experiments/workerconfiguration.h b/src/genecraft/core/ui/widgets/experiments/workerconfiguration.h similarity index 100% rename from src/genelab/core/ui/widgets/experiments/workerconfiguration.h rename to src/genecraft/core/ui/widgets/experiments/workerconfiguration.h diff --git a/src/genelab/core/ui/widgets/experiments/workerconfiguration.ui b/src/genecraft/core/ui/widgets/experiments/workerconfiguration.ui similarity index 100% rename from src/genelab/core/ui/widgets/experiments/workerconfiguration.ui rename to src/genecraft/core/ui/widgets/experiments/workerconfiguration.ui diff --git a/src/genelab/core/ui/widgets/experiments/workerctrl.cpp b/src/genecraft/core/ui/widgets/experiments/workerctrl.cpp similarity index 100% rename from src/genelab/core/ui/widgets/experiments/workerctrl.cpp rename to src/genecraft/core/ui/widgets/experiments/workerctrl.cpp diff --git a/src/genelab/core/ui/widgets/experiments/workerctrl.h b/src/genecraft/core/ui/widgets/experiments/workerctrl.h similarity index 100% rename from src/genelab/core/ui/widgets/experiments/workerctrl.h rename to src/genecraft/core/ui/widgets/experiments/workerctrl.h diff --git a/src/genelab/core/ui/widgets/experiments/workerctrl.ui b/src/genecraft/core/ui/widgets/experiments/workerctrl.ui similarity index 100% rename from src/genelab/core/ui/widgets/experiments/workerctrl.ui rename to src/genecraft/core/ui/widgets/experiments/workerctrl.ui diff --git a/src/genelab/core/ui/widgets/graphicalwidget.cpp b/src/genecraft/core/ui/widgets/graphicalwidget.cpp similarity index 100% rename from src/genelab/core/ui/widgets/graphicalwidget.cpp rename to src/genecraft/core/ui/widgets/graphicalwidget.cpp diff --git a/src/genelab/core/ui/widgets/graphicalwidget.h b/src/genecraft/core/ui/widgets/graphicalwidget.h similarity index 100% rename from src/genelab/core/ui/widgets/graphicalwidget.h rename to src/genecraft/core/ui/widgets/graphicalwidget.h diff --git a/src/genelab/core/ui/widgets/ogrebulletwindows.cpp b/src/genecraft/core/ui/widgets/ogrebulletwindows.cpp similarity index 100% rename from src/genelab/core/ui/widgets/ogrebulletwindows.cpp rename to src/genecraft/core/ui/widgets/ogrebulletwindows.cpp diff --git a/src/genelab/core/ui/widgets/ogrebulletwindows.h b/src/genecraft/core/ui/widgets/ogrebulletwindows.h similarity index 100% rename from src/genelab/core/ui/widgets/ogrebulletwindows.h rename to src/genecraft/core/ui/widgets/ogrebulletwindows.h diff --git a/src/genelab/core/ui/widgets/ogrebulletwindows.ui b/src/genecraft/core/ui/widgets/ogrebulletwindows.ui similarity index 100% rename from src/genelab/core/ui/widgets/ogrebulletwindows.ui rename to src/genecraft/core/ui/widgets/ogrebulletwindows.ui diff --git a/src/genelab/core/ui/widgets/plot/fitnessplot.cpp b/src/genecraft/core/ui/widgets/plot/fitnessplot.cpp similarity index 100% rename from src/genelab/core/ui/widgets/plot/fitnessplot.cpp rename to src/genecraft/core/ui/widgets/plot/fitnessplot.cpp diff --git a/src/genelab/core/ui/widgets/plot/fitnessplot.h b/src/genecraft/core/ui/widgets/plot/fitnessplot.h similarity index 100% rename from src/genelab/core/ui/widgets/plot/fitnessplot.h rename to src/genecraft/core/ui/widgets/plot/fitnessplot.h diff --git a/src/genelab/core/utils/js-beautifull.js b/src/genecraft/core/utils/js-beautifull.js similarity index 100% rename from src/genelab/core/utils/js-beautifull.js rename to src/genecraft/core/utils/js-beautifull.js diff --git a/src/genelab/core/utils/sandboxtools.cpp b/src/genecraft/core/utils/sandboxtools.cpp similarity index 100% rename from src/genelab/core/utils/sandboxtools.cpp rename to src/genecraft/core/utils/sandboxtools.cpp diff --git a/src/genelab/core/utils/sandboxtools.h b/src/genecraft/core/utils/sandboxtools.h similarity index 100% rename from src/genelab/core/utils/sandboxtools.h rename to src/genecraft/core/utils/sandboxtools.h diff --git a/src/genelab/core/utils/tools.cpp b/src/genecraft/core/utils/tools.cpp similarity index 100% rename from src/genelab/core/utils/tools.cpp rename to src/genecraft/core/utils/tools.cpp diff --git a/src/genelab/core/utils/tools.h b/src/genecraft/core/utils/tools.h similarity index 100% rename from src/genelab/core/utils/tools.h rename to src/genecraft/core/utils/tools.h diff --git a/src/genelab/core/world/btbiome.cpp b/src/genecraft/core/world/btbiome.cpp similarity index 100% rename from src/genelab/core/world/btbiome.cpp rename to src/genecraft/core/world/btbiome.cpp diff --git a/src/genelab/core/world/btbiome.h b/src/genecraft/core/world/btbiome.h similarity index 100% rename from src/genelab/core/world/btbiome.h rename to src/genecraft/core/world/btbiome.h diff --git a/src/genelab/core/world/btobiome.cpp b/src/genecraft/core/world/btobiome.cpp similarity index 100% rename from src/genelab/core/world/btobiome.cpp rename to src/genecraft/core/world/btobiome.cpp diff --git a/src/genelab/core/world/btobiome.h b/src/genecraft/core/world/btobiome.h similarity index 100% rename from src/genelab/core/world/btobiome.h rename to src/genecraft/core/world/btobiome.h diff --git a/src/genelab/core/world/btoscene.cpp b/src/genecraft/core/world/btoscene.cpp similarity index 100% rename from src/genelab/core/world/btoscene.cpp rename to src/genecraft/core/world/btoscene.cpp diff --git a/src/genelab/core/world/btoscene.h b/src/genecraft/core/world/btoscene.h similarity index 100% rename from src/genelab/core/world/btoscene.h rename to src/genecraft/core/world/btoscene.h diff --git a/src/genelab/core/world/btoworld.cpp b/src/genecraft/core/world/btoworld.cpp similarity index 100% rename from src/genelab/core/world/btoworld.cpp rename to src/genecraft/core/world/btoworld.cpp diff --git a/src/genelab/core/world/btoworld.h b/src/genecraft/core/world/btoworld.h similarity index 100% rename from src/genelab/core/world/btoworld.h rename to src/genecraft/core/world/btoworld.h diff --git a/src/genelab/core/world/btscene.cpp b/src/genecraft/core/world/btscene.cpp similarity index 100% rename from src/genelab/core/world/btscene.cpp rename to src/genecraft/core/world/btscene.cpp diff --git a/src/genelab/core/world/btscene.h b/src/genecraft/core/world/btscene.h similarity index 100% rename from src/genelab/core/world/btscene.h rename to src/genecraft/core/world/btscene.h diff --git a/src/genelab/core/world/btworld.cpp b/src/genecraft/core/world/btworld.cpp similarity index 100% rename from src/genelab/core/world/btworld.cpp rename to src/genecraft/core/world/btworld.cpp diff --git a/src/genelab/core/world/btworld.h b/src/genecraft/core/world/btworld.h similarity index 100% rename from src/genelab/core/world/btworld.h rename to src/genecraft/core/world/btworld.h diff --git a/src/genelab/core/world/spawn.cpp b/src/genecraft/core/world/spawn.cpp similarity index 100% rename from src/genelab/core/world/spawn.cpp rename to src/genecraft/core/world/spawn.cpp diff --git a/src/genelab/core/world/spawn.h b/src/genecraft/core/world/spawn.h similarity index 100% rename from src/genelab/core/world/spawn.h rename to src/genecraft/core/world/spawn.h diff --git a/src/genelab_global/genelab_global.pro b/src/genecraft_global/genelab_global.pro similarity index 100% rename from src/genelab_global/genelab_global.pro rename to src/genecraft_global/genelab_global.pro diff --git a/src/genelab_global/genelab_global.pro.user.2.2pre5 b/src/genecraft_global/genelab_global.pro.user.2.2pre5 similarity index 100% rename from src/genelab_global/genelab_global.pro.user.2.2pre5 rename to src/genecraft_global/genelab_global.pro.user.2.2pre5 diff --git a/src/genelab_global/genelabmainwindow.cpp b/src/genecraft_global/genelabmainwindow.cpp similarity index 100% rename from src/genelab_global/genelabmainwindow.cpp rename to src/genecraft_global/genelabmainwindow.cpp diff --git a/src/genelab_global/genelabmainwindow.h b/src/genecraft_global/genelabmainwindow.h similarity index 100% rename from src/genelab_global/genelabmainwindow.h rename to src/genecraft_global/genelabmainwindow.h diff --git a/src/genelab_global/genelabmainwindow.ui b/src/genecraft_global/genelabmainwindow.ui similarity index 100% rename from src/genelab_global/genelabmainwindow.ui rename to src/genecraft_global/genelabmainwindow.ui diff --git a/src/genelab_global/main.cpp b/src/genecraft_global/main.cpp similarity index 100% rename from src/genelab_global/main.cpp rename to src/genecraft_global/main.cpp diff --git a/src/genelab_worker/genelab_worker.pro b/src/genecraft_worker/genelab_worker.pro similarity index 100% rename from src/genelab_worker/genelab_worker.pro rename to src/genecraft_worker/genelab_worker.pro diff --git a/src/genelab_worker/main.cpp b/src/genecraft_worker/main.cpp similarity index 100% rename from src/genelab_worker/main.cpp rename to src/genecraft_worker/main.cpp diff --git a/src/genelab_worker/spider.exp b/src/genecraft_worker/spider.exp similarity index 100% rename from src/genelab_worker/spider.exp rename to src/genecraft_worker/spider.exp From afb0d50552a6556edb269b9dcbf10e0d8adace58 Mon Sep 17 00:00:00 2001 From: Cyprien Huissoud Date: Wed, 19 Oct 2011 15:06:29 +0200 Subject: [PATCH 4/7] missing files... --- .../core/entities/brain/brainout.cpp | 57 +++++++++++ .../effectors/rotationalmotorseffector.h | 97 +++++++++++++++++++ 2 files changed, 154 insertions(+) create mode 100644 src/genecraft/core/entities/brain/brainout.cpp create mode 100644 src/genecraft/core/entities/effectors/rotationalmotorseffector.h diff --git a/src/genecraft/core/entities/brain/brainout.cpp b/src/genecraft/core/entities/brain/brainout.cpp new file mode 100644 index 0000000..2a91888 --- /dev/null +++ b/src/genecraft/core/entities/brain/brainout.cpp @@ -0,0 +1,57 @@ +#include "brainout.h" + +namespace GeneCraftCore { + + BrainOut::BrainOut(btScalar min, btScalar max, QObject *) : + min(min), max(max), value((min + max) / 2.0) + { + connexionInfo = ""; + } + + BrainOut::BrainOut(QVariant data) { + min = data.toMap()["min"].toFloat(); + max = data.toMap()["max"].toFloat(); + connexionInfo = data.toMap()["connexionInfo"].toString(); + value = (min + max) / 2.0; + } + + QVariant BrainOut::serialize() { + QVariantMap data; + + data.insert("min", (double)min); + data.insert("max", (double)max); + data.insert("connexionInfo", connexionInfo); + + return data; + } + + /** + * Get the value, will be "unormalized" with min and max + */ + btScalar BrainOut::getValue() { + return value; + } + + /** + * Set the normalized value [-1, 1] + */ + void BrainOut::setValue(btScalar value) { + // Un noramlization + this->value = (value + 1.0f) / 2.0f * (max - min) + min; + if(this->value > max) { + this->value = max; + } + if(this->value < min) { + this->value = min; + } + emit newValue(this->value); + } + + void BrainOut::setConnexionInfo(QVariant info) { + this->connexionInfo = info; + } + + QVariant BrainOut::getConnexionInfo() { + return this->connexionInfo; + } +} diff --git a/src/genecraft/core/entities/effectors/rotationalmotorseffector.h b/src/genecraft/core/entities/effectors/rotationalmotorseffector.h new file mode 100644 index 0000000..e5fd040 --- /dev/null +++ b/src/genecraft/core/entities/effectors/rotationalmotorseffector.h @@ -0,0 +1,97 @@ +#ifndef ROTATIONALMOTORS_H +#define ROTATIONALMOTORS_H + +#include +#include "genecraftcoreclasses.h" +#include "effector.h" +#include "brainoutmotor.h" + +namespace GeneCraftCore { + + +/** + * (c) COPYRIGHT GeneCraft 2011, Aurelien Da Campo & Cyprien Huissoud + * + * A rotational motors is an effector to allows entities to move. + * + * This effector contains 3 motors (one for each axis). This element is connected to + * a bone. + * + * @version 1.0 | May 2011 + * @author Aurelien Da Campo + * @author Cyprien Huissoud + */ +class RotationalMotorsEffector : public Effector +{ +public: + + RotationalMotorsEffector(Bone * bone, btGeneric6DofConstraint * constraint); + RotationalMotorsEffector(QVariant data, Bone * bone, btGeneric6DofConstraint* ct); + ~RotationalMotorsEffector(); + + // To connect to brain + void connectMotor(int i); + + // To disconnect from brain + void disconnectMotor(int i); + + // To know if the motor is disabled + bool isDisable() { return m_isDisable; } + + // To know the origins of motors actions + int getOutPutsFrom() { return outputsFrom; } + + // To get bone + Bone *getBone() { return bone; } + + BrainOutMotor *getBrainOutputs(int i) { return brainMotorOutputs[i]; } + + // To get a seralised representation of effector + virtual QVariant serialize(); + +// static const int OUTPUTS_FROM_NORMAL_POSITION; +// static const int OUTPUTS_FROM_BRAIN; +// static const int OUTPUTS_FROM_RANDOM; + + + // used to set the origins of motors actions + void setOutputsFrom(int outputsFrom); + + // used to disable effector + void disable(); + + // used to update motors + void step(); + +private: + + // bone + Bone *bone; + + // origin of motor + btGeneric6DofConstraint * constraint; + + // effector is active + bool m_isDisable; + + // motor action define by : random, brain or normal position + int outputsFrom; + + // used for random outputs + SinusIn* sinusIn[2]; + + // Three motors by muscle (X,Y,Z) + BrainOutMotor * brainMotorOutputs[3]; + + // Stabilisation properties + btScalar normalPositionMaxError; + btScalar normalPositionFactor; +}; + +//const int RotationalMotorsModifier::OUTPUTS_FROM_NORMAL_POSITION = 0; +//const int RotationalMotorsModifier::OUTPUTS_FROM_BRAIN = 1; +//const int RotationalMotorsModifier::OUTPUTS_FROM_RANDOM = 2; + +} + +#endif // ROTATIONALMOTORS_H From 139564380d9face4ebddc673eee6e6d96cfa1bc0 Mon Sep 17 00:00:00 2001 From: Cyprien Huissoud Date: Wed, 19 Oct 2011 15:23:01 +0200 Subject: [PATCH 5/7] fix build after merge genecraft_global --- .../core/entities/families/genericfamily.cpp | 146 ------------------ src/genecraft_global/genecraft_global.pro | 20 ++- 2 files changed, 18 insertions(+), 148 deletions(-) diff --git a/src/genecraft/core/entities/families/genericfamily.cpp b/src/genecraft/core/entities/families/genericfamily.cpp index 23e91c1..c53c1ab 100644 --- a/src/genecraft/core/entities/families/genericfamily.cpp +++ b/src/genecraft/core/entities/families/genericfamily.cpp @@ -26,42 +26,6 @@ GenericFamily::GenericFamily() { } -Entity *GenericFamily::createEntity(QVariant genotype, - btShapesFactory *shapesFactory, - const btVector3 &initialPosition) -{ - QVariantMap entityMap = genotype.toMap(); - - // Entity & origins - QVariantMap origins = entityMap.value("origins").toMap(); - Entity * entity = new Entity(origins.value("name").toString(), - origins.value("family").toString(), - "generic", - origins.value("generation").toInt()); - // Brain - entity->setBrain(new BrainFunctional(entityMap.value("brain"))); - - // Body - QVariantMap body = entityMap.value("body").toMap(); - if(body.value("shapeType").toString().compare(QString("TreeShape")) == 0) - { - TreeShape* treeShape = new TreeShape(shapesFactory); - - btTransform initTransform; - initTransform.setIdentity(); - initTransform.setOrigin(initialPosition); - - Fixation* root = GenericFamily::createRootFromGenotype(shapesFactory, body.value("shape"), initTransform); - treeShape->setRoot(root); - entity->setShape(treeShape); - GenericFamily::buildFixFromGenotype(shapesFactory, root, root,body.value("shape").toMap().value("rootFix")); - } - - - return entity; -} - - Entity *GenericFamily::createVirginEntity(btShapesFactory *shapesFactory, btScalar rootFixRadius, const btVector3 &initialPosition) @@ -80,114 +44,4 @@ Entity *GenericFamily::createVirginEntity(btShapesFactory *shapesFactory, return entity; } - -Fixation* GenericFamily::createRootFromGenotype(btShapesFactory *shapesFactory, QVariant genotype, btTransform initTransform) { - QVariantMap treeShapeMap = genotype.toMap(); - - // Root fix - QVariantMap rootFixMap = treeShapeMap.value("rootFix").toMap(); - - return new Fixation(shapesFactory, rootFixMap.value("radius").toDouble(), initTransform); - -} - -void GenericFamily::buildFixFromGenotype(btShapesFactory *shapesFactory, Fixation *fix, Fixation* root, QVariant fixGenotype) -{ - - // ------------- - // -- sensors -- - // ------------- - foreach(QVariant sensorData, fixGenotype.toMap()["sensors"].toList()) { - QVariantMap sensorMap = sensorData.toMap(); - switch((SensorType)sensorMap["type"].toInt()) { - case accelerometerSensor: { - fix->addSensor(new AccelerometerSensor(sensorData, fix)); - } - break; - case gyroscopicSensor: { - - fix->addSensor(new GyroscopicSensor(sensorData, fix)); - } - break; - case positionSensor:{ - - fix->addSensor(new PositionSensor(sensorData, root, fix)); - } - break; - case contactSensor:{ - - fix->addSensor(new ContactSensor(sensorData, fix)); - } - break; - case boxSmellSensor:{ - - fix->addSensor(new BoxSmellSensor(sensorData, fix)); - - break; - } - case distanceSensor:{ - - fix->addSensor(new DistanceSensor(sensorData, fix)); - } - break; - } - } - - // -------------- - // -- effector -- - // -------------- - foreach(QVariant effector, fixGenotype.toMap()["effectors"].toList()) { - QVariantMap effectorMap = effector.toMap(); - switch((EffectorType)effectorMap["type"].toInt()) { - - case rotationalMotorEffector: break; - case gripperEffector: { - fix->addEffector(new GripperEffector(effectorMap, fix)); - } - break; - case flyingEffector:{ - fix->addEffector(new FlyingEffector(effectorMap, fix)); - } - break; - } - } - - // ----------- - // -- bones -- - // ----------- - QVariantList bonesVariantList = fixGenotype.toMap().value("bones").toList(); - - foreach(QVariant bone, bonesVariantList) - { - QVariantMap boneMap = bone.toMap(); - - // Radius & lenght - btScalar boneRadius = boneMap.value("radius").toDouble(); - btScalar boneLength = boneMap.value("length").toDouble(); - - btScalar endFixRadius = boneMap.value("endFix").toMap().value("radius").toDouble(); - - // Yaw & Roll (local) - QVariantMap localRotationMap = boneMap.value("localRotation").toMap(); - btScalar yAxisRot = localRotationMap.value("y").toDouble(); - btScalar zAxisRot = localRotationMap.value("z").toDouble(); - - // Limits - btVector3 lowerLimits, upperLimits; - QVariantMap lowerLimitsMap = boneMap.value("lowerLimits").toMap(); - QVariantMap upperLimitsMap = boneMap.value("upperLimits").toMap(); - - lowerLimits.setValue(lowerLimitsMap.value("x").toDouble(), - lowerLimitsMap.value("y").toDouble(), - lowerLimitsMap.value("z").toDouble()); - upperLimits.setValue(upperLimitsMap.value("x").toDouble(), - upperLimitsMap.value("y").toDouble(), - upperLimitsMap.value("z").toDouble()); - - Bone *bone = fix->addBone(yAxisRot,zAxisRot,boneRadius,boneLength,endFixRadius,lowerLimits,upperLimits); - bone->setMotorModifierData(boneMap["muscle"]); - // Add bone recurcively - GenericFamily::buildFixFromGenotype(shapesFactory, bone->getEndFixation(), root, boneMap.value("endFix")); - } -} } diff --git a/src/genecraft_global/genecraft_global.pro b/src/genecraft_global/genecraft_global.pro index d452761..01c09a5 100644 --- a/src/genecraft_global/genecraft_global.pro +++ b/src/genecraft_global/genecraft_global.pro @@ -198,7 +198,12 @@ SOURCES += \ ../genecraft/core/ui/widgets/plot/fitnessplot.cpp \ ../genecraft/core/ui/widgets/experiments/floordialog.cpp \ ../genecraft/core/engines/terrain/terrain.cpp \ - ../genecraft/core/entities/effectors/brainoutmotor.cpp + ../genecraft/core/entities/effectors/brainoutmotor.cpp \ + ../genecraft/core/factories/genome/genomemodifier.cpp \ + ../genecraft/core/factories/genome/genomebuilder.cpp \ + ../genecraft/core/ui/widgets/graphicalwidget.cpp \ + ../genecraft/core/entities/body/symmetry.cpp \ + ../genecraft/core/entities/body/recursion.cpp HEADERS += \ @@ -319,7 +324,12 @@ HEADERS += \ ../genecraft/core/ui/widgets/plot/fitnessplot.h \ ../genecraft/core/ui/widgets/experiments/floordialog.h \ ../genecraft/core/engines/terrain/terrain.h \ - ../genecraft/core/entities/effectors/brainoutmotor.h + ../genecraft/core/entities/effectors/brainoutmotor.h \ + ../genecraft/core/factories/genome/genomemodifier.h \ + ../genecraft/core/factories/genome/genomebuilder.h \ + ../genecraft/core/ui/widgets/graphicalwidget.h \ + ../genecraft/core/entities/body/symmetry.h \ + ../genecraft/core/entities/body/recursion.h FORMS += \ ../genecraft/core/ui/widgets/ogrebulletwindows.ui \ @@ -348,3 +358,9 @@ RESOURCES += \ ../genecraft/core/ressources/ressources.qrc + + + + + + From 8a00d593068b30a068ac4689c131a18f598e621e Mon Sep 17 00:00:00 2001 From: Cyprien Huissoud Date: Wed, 19 Oct 2011 15:26:16 +0200 Subject: [PATCH 6/7] fix build after merge genecraft_worker --- src/genecraft_worker/genecraft_worker.pro | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/genecraft_worker/genecraft_worker.pro b/src/genecraft_worker/genecraft_worker.pro index 1555e5d..76b4185 100644 --- a/src/genecraft_worker/genecraft_worker.pro +++ b/src/genecraft_worker/genecraft_worker.pro @@ -118,7 +118,12 @@ SOURCES += \ main.cpp \ ../genecraft/core/ui/widgets/experiments/workerconfiguration.cpp \ ../genecraft/core/factories/ressources/ressourcesmanager.cpp \ - ../genecraft/core/engines/terrain/terrain.cpp + ../genecraft/core/engines/terrain/terrain.cpp \ + ../genecraft/core/factories/genome/genomemodifier.cpp \ + ../genecraft/core/factories/genome/genomebuilder.cpp \ + ../genecraft/core/entities/body/symmetry.cpp \ + ../genecraft/core/entities/body/recursion.cpp \ + ../genecraft/core/entities/effectors/brainoutmotor.cpp HEADERS += \ ../genecraft/core/engines/engine.h \ @@ -194,7 +199,12 @@ HEADERS += \ ../genecraft/core/genecraftcoreclasses.h \ ../genecraft/core/ui/widgets/experiments/workerconfiguration.h \ ../genecraft/core/factories/ressources/ressourcesmanager.h \ - ../genecraft/core/engines/terrain/terrain.h + ../genecraft/core/engines/terrain/terrain.h \ + ../genecraft/core/factories/genome/genomemodifier.h \ + ../genecraft/core/factories/genome/genomebuilder.h \ + ../genecraft/core/entities/body/symmetry.h \ + ../genecraft/core/entities/body/recursion.h \ + ../genecraft/core/entities/effectors/brainoutmotor.h RESOURCES += \ @@ -202,3 +212,9 @@ RESOURCES += \ FORMS += \ ../genecraft/core/ui/widgets/experiments/workerconfiguration.ui + + + + + + From 15b90268aabd0517a905be86217d4e01143efd36 Mon Sep 17 00:00:00 2001 From: Cyprien Huissoud Date: Sun, 15 Jan 2012 18:54:36 +0100 Subject: [PATCH 7/7] incorporate refactoring from master --- src/genecraft/core/entities/body/bone.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/genecraft/core/entities/body/bone.h b/src/genecraft/core/entities/body/bone.h index 0b3a6b2..947a4d3 100644 --- a/src/genecraft/core/entities/body/bone.h +++ b/src/genecraft/core/entities/body/bone.h @@ -39,14 +39,11 @@ class Bone : public QObject * @param initTransform the initial position of the muscle */ Bone(btShapesFactory *shapesFactory, btScalar yAxis, btScalar zAxis, btScalar radius, btScalar lenght, btScalar endFixRadius, const btTransform &initTransform); -<<<<<<< HEAD -======= /** * @brief destruct and free used ressources * */ ->>>>>>> master ~Bone(); /**