Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11889


Ignore:
Timestamp:
Apr 19, 2018, 3:20:41 PM (7 years ago)
Author:
varyo
Message:

Commented out two asserts and one registerVariable, fixing client side texture issues

Location:
code/branches/Masterserver_FS18
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • code/branches/Masterserver_FS18/data/levels/testMultiplayerLevelLTS.oxw

    r11858 r11889  
    3939
    4040<!-- ------------ middle asteroid -------------- -->
    41     <StaticEntity position="0,20,0" collisionType=static>
    42        <attached>
    43            <Model position="0,0,0" scale=140 mesh="asteroid_UV.mesh" shadow=true />
    44            <!-- ParticleEmitter position="0,0,0" source="Orxonox/Steam" / -->
    45        </attached>
    46       <collisionShapes>
    47         <SphereCollisionShape radius="145" />
    48       </collisionShapes>
    49     </StaticEntity>
    5041
    51     <PickupSpawner pickup=hugeinvisiblepickup position="-160,60,17" triggerDistance="20" respawnTime="5" maxSpawnedItems="10" /><!--EasterEgg-->
    52     <StaticEntity position="-160,60,28.4"><!--EasterEgg-Indicator-->
    53       <attached>
    54         <Model position="0,0,0" scale=1 mesh="sphere.mesh" />
    55       </attached>
    56     </StaticEntity>
    5742
    5843<!-- ---------------asteroid dome----------------- -->
    … …  
    6853    <TeamSpawnPoint team="<?lua print( math.mod(i,4)) ?>" position="<?lua print(y*1.4+z*0.2) ?>,0,<?lua print(z*1.4-y*0.2) ?>" direction="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
    6954
    70     <StaticEntity position="<?lua print(y) ?>,0,<?lua print(z) ?>" scale="<?lua print(j * 2) ?>" collisionType=static >
    71       <attached>
    72         <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh">
    73         </Model>
    74       </attached>
    75       <collisionShapes>
    76         <BoxCollisionShape    halfExtents="<?lua print(j * 2) ?>,100,<?lua print(j * 2) ?>" position = "0,0,0" />
    77       </collisionShapes>
    78     </StaticEntity>
    7955
    80     <StaticEntity position="<?lua print(y) ?>,100,<?lua print(z) ?>" scale="<?lua print(j * 2) ?>" collisionType=static >
    81       <attached>
    82         <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i+3,6) + 1) ?>.mesh">
    83         </Model>
    84       </attached>
    85       <collisionShapes>
    86         <BoxCollisionShape    halfExtents="45,100,45" position = "0,0,0" />
    87       </collisionShapes>
    88     </StaticEntity>
    89 
    90     <StaticEntity position="<?lua print(y) ?>,200,<?lua print(z) ?>" scale="<?lua print(j * 2) ?>" collisionType=static >
    91       <attached>
    92         <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i*5,6) + 1) ?>.mesh">
    93         </Model>
    94       </attached>
    95       <collisionShapes>
    96         <BoxCollisionShape    halfExtents="45,100,45" position = "0,0,0" />
    97       </collisionShapes>
    98     </StaticEntity>
    99 
    100     <StaticEntity position="<?lua print(y) ?>,-100,<?lua print(z) ?>" scale="<?lua print(j * 2) ?>" collisionType=static >
    101       <attached>
    102         <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i*13+1,6) + 1) ?>.mesh">
    103         </Model>
    104       </attached>
    105       <collisionShapes>
    106         <BoxCollisionShape    halfExtents="45,100,45" position = "0,0,0" />
    107       </collisionShapes>
    108     </StaticEntity>
    109 
    110     <StaticEntity position="<?lua print(y) ?>,-200,<?lua print(z) ?>" scale="<?lua print(j * 2) ?>" collisionType=static >
    111       <attached>
    112         <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i*17,6) + 1) ?>.mesh">
    113         </Model>
    114       </attached>
    115       <collisionShapes>
    116         <BoxCollisionShape    halfExtents="45,100,45" position = "0,0,0" />
    117       </collisionShapes>
    118     </StaticEntity>
    119 
    120 <!-- ---------Top Asteroid----------- -->
    121     <StaticEntity position="<?lua print(y) ?>,300,<?lua print(z) ?>" scale="<?lua print(j * 2.1) ?>" pitch="90" roll="180" yaw="<?lua print(-90+i*360/max) ?>" collisionType=static >
    122       <attached>
    123         <Model position="0,0,0" scale=25 mesh="ast6.mesh">
    124         </Model>
    125       </attached>
    126       <collisionShapes>
    127         <BoxCollisionShape    halfExtents="50,140,30" position="0,0,0"/>
    128       </collisionShapes>
    129     </StaticEntity>
    13056
    13157

  • code/branches/Masterserver_FS18/src/libraries/network/packet/Gamestate.cc

    r11858 r11889  
    222222          orxout(user_error, context::packets) << "Possible reason for this error: Client created a synchronized object without the Server's approval." << endl;
    223223          orxout(user_error, context::packets) << "Objects class: " << synchronisable->getIdentifier()->getName() << endl;
    224           assert(false);
     224          //assert(false);
    225225        }
    226226      }

  • code/branches/Masterserver_FS18/src/orxonox/graphics/Model.cc

    r11783 r11889  
    104104        registerVariable(this->meshSrc_,    VariableDirection::ToClient, new NetworkCallback<Model>(this, &Model::changedMesh));
    105105        registerVariable(this->renderQueueGroup_,    VariableDirection::ToClient, new NetworkCallback<Model>(this, &Model::changedRenderQueueGroup));
    106         registerVariable(this->materialName_,    VariableDirection::ToClient, new NetworkCallback<Model>(this, &Model::changedMaterial));
     106        //Commented out, since this causes texture load failures on client side
     107        //registerVariable(this->materialName_,    VariableDirection::ToClient, new NetworkCallback<Model>(this, &Model::changedMaterial));
    107108        registerVariable(this->bCastShadows_, VariableDirection::ToClient, new NetworkCallback<Model>(this, &Model::changedShadows));
    108109    }
Note: See TracChangeset for help on using the changeset viewer.