Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2028


Ignore:
Timestamp:
Oct 28, 2008, 8:02:32 PM (16 years ago)
Author:
scheusso
Message:

updated updateMedia script
updated TODO file
we are able to synchronise the creatorID of an object now

Location:
code/branches/objecthierarchy
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • code/branches/objecthierarchy/TODO

    r2011 r2028  
    22
    33        bidirectional
     4
     5        minimize synchronisableHeader
    46
    57

  • code/branches/objecthierarchy/src/network/Synchronisable.cc

    r2019 r2028  
    134134    orxonox::Identifier* id = ClassByID(header->classID);
    135135    assert(id);
    136     orxonox::BaseObject *bo = id->fabricate(0); // TODO: get creator
     136    orxonox::BaseObject *bo = id->fabricate(0); //TODO: get BaseObject* from header->creatorID here
    137137    Synchronisable *no = dynamic_cast<Synchronisable *>(bo);
    138138    assert(no);
    … …  
    264264    header->size = size;
    265265    header->objectID = this->objectID;
     266    header->creatorID = this->creatorID;
    266267    header->classID = this->classID;
    267268    header->dataAvailable = true;
    … …  
    325326    synchronisableHeader *syncHeader = (synchronisableHeader *)mem;
    326327    assert(syncHeader->objectID==this->objectID);
     328    assert(syncHeader->creatorID==this->creatorID);
    327329    if(syncHeader->dataAvailable==false){
    328330      mem+=syncHeader->size;

  • code/branches/objecthierarchy/src/network/Synchronisable.h

    r2011 r2028  
    7676    bool dataAvailable:1;
    7777    uint32_t objectID;
     78    uint32_t creatorID;
    7879    uint32_t classID;
    7980  };
    … …  
    129130
    130131    unsigned int objectID;
     132    unsigned int creatorID;
    131133    unsigned int classID;
    132134

  • code/branches/objecthierarchy/updateMedia.sh

    r1506 r2028  
    11#!/bin/bash
    22dir=${pwd}
    3 cd ../Media
     3cd ../media
    44svn up
    55cd $dir
Note: See TracChangeset for help on using the changeset viewer.