Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Actor XML loading #91

Closed
wants to merge 16 commits into from
+165,003 −239
Closed

Actor XML loading #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ff4b987
Finds the right texture model
spassvogel Dec 20, 2013
36c7c7a
Improved look of disabled icon state
spassvogel Dec 20, 2013
da2444a
Tree and helleneic blacksmith loaded from xml
spassvogel Dec 20, 2013
0a4b4fc
Added collada meshes and actor xml
spassvogel Dec 21, 2013
6379db6
Suppressed that super annoying message about DDS files
spassvogel Dec 21, 2013
0d5bd5f
Prop loading is working! Apparently you have to explicitly scale chil…
spassvogel Dec 21, 2013
c099099
I did a very bad thing ..... (but it should solve #18)
spassvogel Dec 21, 2013
b7c0706
Hellenic buildings are loaded through the actorloading mechanism. HOW…
spassvogel Dec 21, 2013
2b858b8
Romans are now loaded through XML. Also, the ROME CIVIC CENTER is the…
spassvogel Dec 21, 2013
cc630c9
Added missing Hellenic buildings, barracks, temple, corral
spassvogel Dec 21, 2013
9e4d4ae
Carthagenians now load their props
spassvogel Dec 22, 2013
f0181b9
Carthagenians now have farms. Yay
spassvogel Dec 22, 2013
0bd1ff9
Iberians with props
spassvogel Dec 23, 2013
573f045
Persian Props
spassvogel Dec 23, 2013
26b33a2
Fixed a bug with hellenic farm
spassvogel Dec 23, 2013
da92d9d
Fixed roman temple
spassvogel Dec 23, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
27 changes: 27 additions & 0 deletions client/art/actors/geology/decal_stone_medit_a.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">

<group>
<variant name="decal_stone_medit_a">
<decal width="12" depth="12" angle="0" offsetx="0" offsetz="0"/>
</variant>
</group>

<group>
<variant frequency="1" name="decal_01">
<textures><texture file="gaia/decal_stone_medit_01.dds" name="baseTex"/>
<texture file="gaia/decal_stone_medit_01_spec.png" name="specTex"/>
<texture file="gaia/decal_stone_medit_01_norm.png" name="normTex"/>

</textures>
</variant>
<variant frequency="1" name="decal_02">
<textures> <texture file="gaia/decal_stone_medit_02.dds" name="baseTex"/>
<texture file="gaia/decal_stone_medit_02_spec.png" name="specTex"/>
<texture file="gaia/decal_stone_medit_02_norm.png" name="normTex"/></textures>
</variant>
</group>

<material>terrain_norm_spec.xml</material>

</actor>
15 changes: 15 additions & 0 deletions client/art/actors/props/structures/carthaginians/barracks.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Kart_Barracks_Props_a">
<mesh>props/kart_barracks_props_a.dae</mesh>
</variant>
</group>
<group>
<variant>
<textures><texture file="structural/kart_struct.dds" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
14 changes: 14 additions & 0 deletions client/art/actors/props/structures/carthaginians/barracks_weap.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Kart_Barracks_Props_Weapons">
<mesh>props/kart_barracks_props_weap.dae</mesh>
</variant>
</group>
<group>
<variant>
<textures><texture file="props/prop_weap.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
34 changes: 34 additions & 0 deletions client/art/actors/props/structures/carthaginians/bireme_sail.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant frequency="100" name="Base">
<mesh>props/kart_bireme_sail.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="Tree">
<textures>
<texture file="props/kart_sail_1.dds" name="baseTex"/>
<texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/>
</textures>
</variant>
<variant frequency="1" name="tanit">
<textures>
<texture file="props/kart_sail_2.dds" name="baseTex"/>
<texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/>
</textures>
</variant>
<variant frequency="1" name="other">
<textures>
<texture file="props/kart_sail_3.dds" name="baseTex"/>
<texture file="props/sail_norm_1.png" name="normTex"/>
<texture file="props/sail_spec_1.png" name="specTex"/>
</textures>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>
</actor>
21 changes: 21 additions & 0 deletions client/art/actors/props/structures/carthaginians/bireme_shields.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="Texture">
<textures><texture file="structural/kart_struct.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
<variant frequency="1" name="Shields Var 1">
<mesh>props/kart_bireme_shields.dae</mesh>
</variant>
<variant frequency="1" name="Shields Var 2">
<mesh>props/kart_bireme_shields_2.dae</mesh>
</variant>
<variant frequency="1" name="Shields Var 3">
<mesh>props/kart_bireme_shields_3.dae</mesh>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
12 changes: 12 additions & 0 deletions client/art/actors/props/structures/carthaginians/bireme_shroud.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant frequency="100" name="Base">
<mesh>props/kart_bireme_shrouds.dae</mesh>
<textures><texture file="props/ship_shrouds.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
15 changes: 15 additions & 0 deletions client/art/actors/props/structures/carthaginians/blacksmith.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Props_a">
<mesh>structural/kart_blacksmith_props.dae</mesh>
</variant>
</group>
<group>
<variant>
<textures><texture file="props/palisade_main.png" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
18 changes: 18 additions & 0 deletions client/art/actors/props/structures/carthaginians/civil_centre_palms.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Civ centre palms">
<mesh>props/kart_civiccentre_palms.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="Palm skin a">
<textures><texture file="gaia/tree_palm_senegal_a.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="Palm skin b">
<textures><texture file="gaia/tree_palm_senegal_b.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
10 changes: 10 additions & 0 deletions client/art/actors/props/structures/carthaginians/corral.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Corral Fences">
<mesh>props/kart_corral_fence.dae</mesh>
<textures><texture file="structural/celt_struct.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
11 changes: 11 additions & 0 deletions client/art/actors/props/structures/carthaginians/corral_mud.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Corral Mud">
<mesh>props/kart_corral_mud.dae</mesh>
<textures><texture file="props/decal_struct_mud_long.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
10 changes: 10 additions & 0 deletions client/art/actors/props/structures/carthaginians/dock.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Base">
<mesh>props/kart_dock_a.dae</mesh>
<textures><texture file="structural/celt_struct.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
11 changes: 11 additions & 0 deletions client/art/actors/props/structures/carthaginians/embassy_celtic_props.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="celtic embassy props">
<mesh>props/kart_embassy_celtic_props.dae</mesh>
<textures><texture file="structural/kart_struct.dds" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
11 changes: 11 additions & 0 deletions client/art/actors/props/structures/carthaginians/embassy_iberian_props.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="shields">
<mesh>props/kart_embassy_iber_props.dae</mesh>
<textures><texture file="props/iber_prop_shields.dds" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
10 changes: 10 additions & 0 deletions client/art/actors/props/structures/carthaginians/farmstead.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="props_a1">
<mesh>props/kart_farmstead_a_1.dae</mesh>
<textures><texture file="structural/kart_struct.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
10 changes: 10 additions & 0 deletions client/art/actors/props/structures/carthaginians/farmstead_cart.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="farmstead_prop_cart">
<mesh>props/kart_farmstead_c_1.dae</mesh>
<textures><texture file="props/wrld_wood_1.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
15 changes: 15 additions & 0 deletions client/art/actors/props/structures/carthaginians/farmstead_hay.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">

<castshadow/>

<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>props/kart_fc_hay.dae</mesh>
<props/>
<textures><texture file="props/celt_prop_1.dds" name="baseTex"/></textures>
</variant>
</group>

</actor>
10 changes: 10 additions & 0 deletions client/art/actors/props/structures/carthaginians/farmstead_horse.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="props_horse">
<mesh>props/kart_farmstead_b.dae</mesh>
<textures><texture file="skeletal/horse.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
15 changes: 15 additions & 0 deletions client/art/actors/props/structures/carthaginians/fortress.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">

<castshadow/>

<group>
<variant frequency="100" name="Base">
<mesh>props/kart_ff.dae</mesh>
<textures><texture file="props/kart_prop_a.dds" name="baseTex"/></textures>
</variant>
</group>

<material>player_trans.xml</material>

</actor>
21 changes: 21 additions & 0 deletions client/art/actors/props/structures/carthaginians/fortress_doors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">

<castshadow/>

<group>
<variant frequency="1" name="kart_fortress_doors_closed">
<mesh>props/kart_fortress_doors_closed.dae</mesh>
</variant>
<variant frequency="1" name="kart_fortress_doors_open">
<mesh>props/kart_fortress_doors_open.dae</mesh>
</variant>
</group>

<group>
<variant>
<textures><texture file="structural/kart_struct.dds" name="baseTex"/></textures>
</variant>
</group>

</actor>
23 changes: 23 additions & 0 deletions client/art/actors/props/structures/carthaginians/fortress_shields.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">

<castshadow/>

<group>
<variant frequency="1" name="kart_fortress_shields_a">
<mesh>props/kart_fortress_shields.dae</mesh>
</variant>
<variant frequency="1" name="kart_fortress_shields_b">
<mesh>props/kart_fortress_shields_b.dae</mesh>
</variant>
</group>

<group>
<variant>
<textures><texture file="structural/kart_struct.dds" name="baseTex"/></textures>
</variant>
</group>

<material>player_trans.xml</material>

</actor>
23 changes: 23 additions & 0 deletions client/art/actors/props/structures/carthaginians/fortress_weapons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">

<castshadow/>

<group>
<variant frequency="1" name="kart_fortress_weapons_a">
<mesh>props/kart_fortress_weapons.dae</mesh>
</variant>
<variant frequency="1" name="kart_fortress_weapons_b">
<mesh>props/kart_fortress_weapons_b.dae</mesh>
</variant>
</group>

<group>
<variant>
<textures><texture file="props/prop_weap.dds" name="baseTex"/></textures>
</variant>
</group>

<material>player_trans.xml</material>

</actor>
13 changes: 13 additions & 0 deletions client/art/actors/props/structures/carthaginians/fortress_windows.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">

<castshadow/>

<group>
<variant frequency="1" name="kart_fortress_windows">
<mesh>props/kart_fortress_windows.dae</mesh>
<textures><texture file="structural/kart_struct.dds" name="baseTex"/></textures>
</variant>
</group>

</actor>
18 changes: 18 additions & 0 deletions client/art/actors/props/structures/carthaginians/government_centre.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="government_centre_props_a">
<mesh>props/kart_governmentcentre_a.dae</mesh>
</variant>
<variant frequency="1" name="government_centre_props_b">
<mesh>props/kart_governmentcentre_b.dae</mesh>
</variant>
</group>
<group>
<variant>
<textures><texture file="structural/kart_struct.dds" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
Loading