[Orxonox-commit 363] r2127 - in media: levels materials/scripts materials/textures models
jsmely at orxonox.net
jsmely at orxonox.net
Mon May 11 16:02:35 CEST 2009
Author: jsmely
Date: 2009-05-11 16:02:34 +0200 (Mon, 11 May 2009)
New Revision: 2127
Added:
media/materials/scripts/LightningGun-s.material
media/materials/scripts/LightningGun-s.tga
media/materials/scripts/LightningGun.material
media/materials/textures/LightningBall_1.tga
media/materials/textures/LightningBall_2.tga
media/materials/textures/LightningBall_3.tga
media/materials/textures/LightningBall_4.tga
media/materials/textures/LightningBall_5.tga
media/materials/textures/LightningBall_6.tga
media/materials/textures/LightningBall_7.tga
media/materials/textures/LightningBall_8.tga
media/materials/textures/LightningGun.tga
media/models/LightningGun-s.mesh
media/models/LightningGun.mesh
Modified:
media/levels/presentation_dm.oxw
media/levels/spaceshiptemplates_presentation.oxw
media/levels/tutorial.oxw
media/levels/weaponsettings2.oxw
media/materials/scripts/Flares.material
Log:
weapon updated
Modified: media/levels/presentation_dm.oxw
===================================================================
--- media/levels/presentation_dm.oxw 2009-05-11 13:57:31 UTC (rev 2126)
+++ media/levels/presentation_dm.oxw 2009-05-11 14:02:34 UTC (rev 2127)
@@ -31,12 +31,25 @@
</visibility>
</events>
</GlobalShader>
- <Model position="0,0,0" scale=8 mesh="ast1.mesh" />
- <StaticEntity position="0,0,0" collisionType=static>
+
+<?lua
+for i = 1, 50, 1
+do
+j = math.random()
+?>
+
+ <MovableEntity position="<?lua print(math.random() * 3000-2000) ?>,<?lua print(math.random() * 3000-2000) ?>,<?lua print(math.random() * 3000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0.8 scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+ <attached>
+ <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
+ </attached>
<collisionShapes>
- <SphereCollisionShape radius="20" />
+ <SphereCollisionShape radius="<?lua print(j * 70) ?>" />
</collisionShapes>
- </StaticEntity>
+ </MovableEntity>
+<?lua
+end
+?>
+
<!--
<?lua
for i = 1, 70, 1
Modified: media/levels/spaceshiptemplates_presentation.oxw
===================================================================
--- media/levels/spaceshiptemplates_presentation.oxw 2009-05-11 13:57:31 UTC (rev 2126)
+++ media/levels/spaceshiptemplates_presentation.oxw 2009-05-11 14:02:34 UTC (rev 2127)
@@ -34,7 +34,7 @@
<BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" />
</collisionShapes>
<?lua
- include("levels/weaponsettings1.oxw")
+ include("levels/weaponsettings2.oxw")
?>
</SpaceShip>
</Template>
Modified: media/levels/tutorial.oxw
===================================================================
--- media/levels/tutorial.oxw 2009-05-11 13:57:31 UTC (rev 2126)
+++ media/levels/tutorial.oxw 2009-05-11 14:02:34 UTC (rev 2127)
@@ -25,6 +25,14 @@
<Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
+<Drone primaryThrust=100 auxiliaryThrust=100 rotationThrust=100 mass = 50 linearDamping = 0.9 angularDamping = 0.7>
+ <attached>
+ <Model scale="10" mesh="Cylinder.mesh"/>
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,0" halfExtents="10, 10, 10" />
+ </collisionShapes>
+</Drone>
<Drone primaryThrust="100" auxilaryThrust="30" rotationThrust="10"
Modified: media/levels/weaponsettings2.oxw
===================================================================
--- media/levels/weaponsettings2.oxw 2009-05-11 13:57:31 UTC (rev 2126)
+++ media/levels/weaponsettings2.oxw 2009-05-11 14:02:34 UTC (rev 2127)
@@ -15,17 +15,19 @@
</links>
<Weapon>
<attached>
- <Model mesh="hs-w01.mesh" />
+ <Model mesh="LightningGun.mesh" pitch="78" roll="90" yaw="90" position="0,-1.3,0" scale="0.5,0.5,0.5"/>
+ <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,0" scale="0.5,0.5,0.5"/>
</attached>
- <LaserFire mode=0 muzzleoffset="0,0,-25" />
+ <LightningGun mode=0 muzzleoffset="0,0,-20" />
<LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,5,0" />
<LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,-5,0" />
</Weapon>
<Weapon>
<attached>
- <Model mesh="hs-w01.mesh" />
+ <Model mesh="LightningGun.mesh" pitch="103" roll="90" yaw="90" position="0,-1.35,0" scale="0.5,0.5,0.5"/>
+ <Model mesh="LightningGun-s.mesh" pitch="103" roll="90" yaw="90" position="0.2,-1.35,0" scale="0.5,0.5,0.5"/>
</attached>
- <LaserFire mode=0 muzzleoffset="0,0,-25" />
+ <LightningGun mode=0 muzzleoffset="0,0,-20" />
<LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,5,0" />
<LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,-5,0" />
</Weapon>
Modified: media/materials/scripts/Flares.material
===================================================================
--- media/materials/scripts/Flares.material 2009-05-11 13:57:31 UTC (rev 2126)
+++ media/materials/scripts/Flares.material 2009-05-11 14:02:34 UTC (rev 2127)
@@ -127,3 +127,147 @@
}
}
}
+
+material Flares/LightningBall_1
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend add
+ depth_write off
+
+ texture_unit
+ {
+ texture LightningBall_1.tga
+ }
+ }
+ }
+}
+
+material Flares/LightningBall_2
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend add
+ depth_write off
+
+ texture_unit
+ {
+ texture LightningBall_2.tga
+ }
+ }
+ }
+}
+
+material Flares/LightningBall_3
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend add
+ depth_write off
+
+ texture_unit
+ {
+ texture LightningBall_3.tga
+ }
+ }
+ }
+}
+
+material Flares/LightningBall_4
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend add
+ depth_write off
+
+ texture_unit
+ {
+ texture LightningBall_4.tga
+ }
+ }
+ }
+}
+
+material Flares/LightningBall_5
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend add
+ depth_write off
+
+ texture_unit
+ {
+ texture LightningBall_5.tga
+ }
+ }
+ }
+}
+
+material Flares/LightningBall_6
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend add
+ depth_write off
+
+ texture_unit
+ {
+ texture LightningBall_6.tga
+ }
+ }
+ }
+}
+
+material Flares/LightningBall_7
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend add
+ depth_write off
+
+ texture_unit
+ {
+ texture LightningBall_7.tga
+ }
+ }
+ }
+}
+
+material Flares/LightningBall_8
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ scene_blend add
+ depth_write off
+
+ texture_unit
+ {
+ texture LightningBall_8.tga
+ }
+ }
+ }
+}
Added: media/materials/scripts/LightningGun-s.material
===================================================================
--- media/materials/scripts/LightningGun-s.material (rev 0)
+++ media/materials/scripts/LightningGun-s.material 2009-05-11 14:02:34 UTC (rev 2127)
@@ -0,0 +1,25 @@
+material LightningGun-s/TEXFACE/LightningGun-s.tga
+{
+ receive_shadows on
+ technique
+ {
+ pass
+ {
+ ambient 0.500000 0.500000 0.500000 1.000000
+ diffuse 0.800000 0.800000 0.800000 1.000000
+ emissive 0.000000 0.000000 0.000000 1.000000
+ texture_unit
+ {
+ texture LightningGun-s.tga
+ colour_op modulate
+ }
+ }
+ pass
+ {
+ ambient 0.0 0.0 0.0
+ diffuse 0.0 0.0 0.0
+ specular 0.500000 0.500000 0.500000 1.000000 12.500000
+ scene_blend add
+ }
+ }
+}
Added: media/materials/scripts/LightningGun-s.tga
===================================================================
(Binary files differ)
Property changes on: media/materials/scripts/LightningGun-s.tga
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: media/materials/scripts/LightningGun.material
===================================================================
--- media/materials/scripts/LightningGun.material (rev 0)
+++ media/materials/scripts/LightningGun.material 2009-05-11 14:02:34 UTC (rev 2127)
@@ -0,0 +1,25 @@
+material LightningGun/TEXFACE/LightningGun.tga
+{
+ receive_shadows on
+ technique
+ {
+ pass
+ {
+ ambient 0.500000 0.500000 0.500000 1.000000
+ diffuse 0.800000 0.800000 0.800000 1.000000
+ emissive 0.000000 0.000000 0.000000 1.000000
+ texture_unit
+ {
+ texture LightningGun.tga
+ colour_op modulate
+ }
+ }
+ pass
+ {
+ ambient 0.0 0.0 0.0
+ diffuse 0.0 0.0 0.0
+ specular 0.500000 0.500000 0.500000 1.000000 12.500000
+ scene_blend add
+ }
+ }
+}
Added: media/materials/textures/LightningBall_1.tga
===================================================================
(Binary files differ)
Property changes on: media/materials/textures/LightningBall_1.tga
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: media/materials/textures/LightningBall_2.tga
===================================================================
(Binary files differ)
Property changes on: media/materials/textures/LightningBall_2.tga
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: media/materials/textures/LightningBall_3.tga
===================================================================
(Binary files differ)
Property changes on: media/materials/textures/LightningBall_3.tga
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: media/materials/textures/LightningBall_4.tga
===================================================================
(Binary files differ)
Property changes on: media/materials/textures/LightningBall_4.tga
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: media/materials/textures/LightningBall_5.tga
===================================================================
(Binary files differ)
Property changes on: media/materials/textures/LightningBall_5.tga
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: media/materials/textures/LightningBall_6.tga
===================================================================
(Binary files differ)
Property changes on: media/materials/textures/LightningBall_6.tga
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: media/materials/textures/LightningBall_7.tga
===================================================================
(Binary files differ)
Property changes on: media/materials/textures/LightningBall_7.tga
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: media/materials/textures/LightningBall_8.tga
===================================================================
(Binary files differ)
Property changes on: media/materials/textures/LightningBall_8.tga
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: media/materials/textures/LightningGun.tga
===================================================================
(Binary files differ)
Property changes on: media/materials/textures/LightningGun.tga
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: media/models/LightningGun-s.mesh
===================================================================
(Binary files differ)
Property changes on: media/models/LightningGun-s.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: media/models/LightningGun.mesh
===================================================================
(Binary files differ)
Property changes on: media/models/LightningGun.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
More information about the Orxonox-commit
mailing list