|
From: <and...@us...> - 2008-02-15 10:55:50
|
Revision: 565
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=565&view=rev
Author: andy_miller
Date: 2008-02-15 02:55:55 -0800 (Fri, 15 Feb 2008)
Log Message:
-----------
Particle Universe Media update
Modified Paths:
--------------
trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/gui/puviewer.layout
trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_11_20.pu
trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_1_10.pu
trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_21_30.pu
trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_explosion.pu
trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_flame.pu
trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_lightning.pu
trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_rain.pu
trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_tornado.pu
Modified: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/gui/puviewer.layout
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/gui/puviewer.layout 2008-02-13 09:29:59 UTC (rev 564)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/gui/puviewer.layout 2008-02-15 10:55:55 UTC (rev 565)
@@ -51,15 +51,22 @@
<Property Name="Text" Value="Stop" />
</Window>
+ <Window Type="TaharezLook/Button" Name="ParticleUniverseViewer/ButtonQuit">
+ <Property Name="UnifiedPosition" Value="{{0.1,0},{0.82,0}}" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedSize" Value="{{0.8,0},{0.05,0}}" />
+ <Property Name="Text" Value="Quit" />
+ </Window>
+
<Window Type="TaharezLook/Checkbox" Name="ParticleUniverseViewer/CheckResetCamera" >
- <Property Name="UnifiedPosition" Value="{{0.1,0},{0.82,0}}" />
+ <Property Name="UnifiedPosition" Value="{{0.1,0},{0.88,0}}" />
<Property Name="Text" Value="Reset Camera" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="UnifiedSize" Value="{{0.8,0},{0.05,0}}" />
</Window>
<Window Type="TaharezLook/Checkbox" Name="ParticleUniverseViewer/CheckSkybox" >
- <Property Name="UnifiedPosition" Value="{{0.1,0},{0.88,0}}" />
+ <Property Name="UnifiedPosition" Value="{{0.1,0},{0.94,0}}" />
<Property Name="Text" Value="Skybox" />
<Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
<Property Name="UnifiedSize" Value="{{0.8,0},{0.05,0}}" />
Modified: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_11_20.pu
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_11_20.pu 2008-02-13 09:29:59 UTC (rev 564)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_11_20.pu 2008-02-15 10:55:55 UTC (rev 565)
@@ -101,7 +101,7 @@
// Change the scale of the particle
affector Scale
{
- scale 10
+ xyz_scale 10
}
// Apply a boost if the Jet affector is enabled
@@ -124,6 +124,8 @@
// ---------------------------------------------------------------------------------------------------------------
system example_013
{
+ scale 0.5 0.5 0.5
+ scale_velocity 0.5
technique
{
use_alias $defaultBillboardRenderer
@@ -218,6 +220,7 @@
// ---------------------------------------------------------------------------------------------------------------
system example_016
{
+
technique
{
renderer Billboard
Modified: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_1_10.pu
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_1_10.pu 2008-02-13 09:29:59 UTC (rev 564)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_1_10.pu 2008-02-15 10:55:55 UTC (rev 565)
@@ -89,6 +89,8 @@
// ---------------------------------------------------------------------------------------------------------------
system example_003
{
+ scale 0.5 0.5 0.5
+ scale_velocity 0.5
technique
{
position 500 0 0
@@ -159,9 +161,10 @@
// ---------------------------------------------------------------------------------------------------------------
system example_005
{
+ scale 5 5 5
+ scale_velocity 5
technique
{
- position 0 0 1000
// Use the billboard renderer defined in the *.pua script
use_alias $defaultBillboardRenderer
material ParticleUniverse/Star
@@ -175,7 +178,7 @@
vertex_em_segments 5
vertex_em_iterations 5
position 0 0 0
- emission_rate 500
+ emission_rate 400
angle 360
direction 0 1 0
velocity 2
Modified: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_21_30.pu
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_21_30.pu 2008-02-13 09:29:59 UTC (rev 564)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_example_21_30.pu 2008-02-15 10:55:55 UTC (rev 565)
@@ -58,13 +58,13 @@
{
// Set the quota low
visual_particle_quota 40
- default_particle_width 10
material ParticleUniverse/RibbonTrail
renderer RibbonTrail
{
ribbontrail_vertex_colours true
ribbontrail_max_elements 60
ribbontrail_length 600
+ ribbontrail_width 10
ribbontrail_random_initial_colour true
ribbontrail_colour_change 0.8 0.8 0.8 0.8
}
@@ -141,3 +141,115 @@
}
}
}
+
+// ---------------------------------------------------------------------------------------------------------------
+// example_024a and example_024b:
+// This is combination of Particle Systems where the emitter of Particle System 'example_024a' emits
+// Particle System 'example_024b' particles.
+// With the use of the 'keep_local' attribute, the 'star' material sticks to the emitted particle system.
+// ---------------------------------------------------------------------------------------------------------------
+system example_024a
+{
+ technique
+ {
+ emitted_system_quota 10
+ visual_particle_quota 10
+ material ParticleUniverse/RibbonTrail
+ renderer RibbonTrail
+ {
+ ribbontrail_vertex_colours true
+ ribbontrail_max_elements 40
+ ribbontrail_length 1000
+ ribbontrail_width 15
+ ribbontrail_random_initial_colour true
+ ribbontrail_colour_change 0.8 0.8 0.8 0.8
+ }
+
+ emitter Point
+ {
+ emits system_particle example_024b
+ angle 60
+ emission_rate 1
+ direction 0 1 0
+ velocity 400
+ time_to_live 7
+ }
+ affector LinearForce
+ {
+ force_aff_vector 0 -200 0
+ }
+ }
+}
+
+system example_024b
+{
+ technique
+ {
+ default_particle_width 160
+ default_particle_height 160
+ visual_particle_quota 1
+ material ParticleUniverse/Star
+ use_alias $defaultBillboardRenderer
+ keep_local true
+
+ emitter Point
+ {
+ angle 360
+ emission_rate 1
+ force_emission true
+ direction 0 0 0
+ velocity 0
+ time_to_live 7
+ }
+ }
+ technique
+ {
+ default_particle_width 10
+ default_particle_height 10
+ visual_particle_quota 100
+ use_alias $defaultBillboardRenderer
+ material Examples/Flare
+
+ emitter Point
+ {
+ angle 360
+ emission_rate 50
+ direction 0 -1 0
+ velocity 100
+ time_to_live 2
+ }
+ affector LinearForce
+ {
+ force_aff_vector 0 -200 0
+ }
+ }
+}
+
+// ---------------------------------------------------------------------------------------------------------------
+// example_025: PositionEmitter
+// ---------------------------------------------------------------------------------------------------------------
+system example_025
+{
+ technique
+ {
+ default_particle_width 100
+ default_particle_height 100
+ use_alias $defaultBillboardRenderer
+ material Examples/Flare
+ emitter Position
+ {
+ emission_rate 10
+ time_to_live 3
+ random_position true
+ add_position 200 100 300
+ add_position 0 400 0
+ add_position -200 200 -100
+ add_position 100 -200 0
+ }
+ affector LinearForce
+ {
+ force_aff_vector 0 -200 0
+ }
+ }
+}
+
Modified: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_explosion.pu
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_explosion.pu 2008-02-13 09:29:59 UTC (rev 564)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_explosion.pu 2008-02-15 10:55:55 UTC (rev 565)
@@ -33,7 +33,7 @@
// Let it grow fast, equally in all dimensions
affector Scale
{
- scale 200
+ xyz_scale 200
}
// After 0.7 seconds, the emitters stops
@@ -133,7 +133,7 @@
// Make the projectile smaller over time
affector Scale
{
- scale -5
+ xyz_scale -5
}
}
Modified: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_flame.pu
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_flame.pu 2008-02-13 09:29:59 UTC (rev 564)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_flame.pu 2008-02-15 10:55:55 UTC (rev 565)
@@ -73,7 +73,7 @@
// Affector that affects all (visual) particles in general
affector Scale
{
- scale -10
+ xyz_scale -10
}
// Affect with a random Sine force (also affects the Gravity affector particles)
@@ -109,7 +109,7 @@
renderer Billboard
{
- // Put the fire in front of the smoke (just for testing)
+ // Put the fire in front of the smoke
render_queue_group 80
}
@@ -141,7 +141,7 @@
affector Scale
{
- scale -5
+ xyz_scale -5
}
affector Colour
@@ -179,7 +179,7 @@
affector Scale
{
- scale 20
+ xyz_scale 20
}
affector Colour
Modified: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_lightning.pu
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_lightning.pu 2008-02-13 09:29:59 UTC (rev 564)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_lightning.pu 2008-02-15 10:55:55 UTC (rev 565)
@@ -31,7 +31,7 @@
affector Line
{
- line_aff_max_deviation 140
+ line_aff_max_deviation 100
line_aff_time_step 0.03
line_aff_end 1500 300 0
line_aff_drift 0.3
@@ -68,7 +68,7 @@
affector Line
{
- line_aff_max_deviation 200
+ line_aff_max_deviation 140
line_aff_time_step 0.01
line_aff_end 1500 300 0
line_aff_drift 0.1
Modified: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_rain.pu
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_rain.pu 2008-02-13 09:29:59 UTC (rev 564)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_rain.pu 2008-02-15 10:55:55 UTC (rev 565)
@@ -78,7 +78,7 @@
affector Scale
{
- scale 40
+ xyz_scale 40
}
}
@@ -214,7 +214,7 @@
affector Scale
{
- scale 40
+ xyz_scale 40
}
}
Modified: trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_tornado.pu
===================================================================
--- trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_tornado.pu 2008-02-13 09:29:59 UTC (rev 564)
+++ trunk/python-ogre/demos/particleuniverse/Media/ParticleUniverse/scripts/pu_tornado.pu 2008-02-15 10:55:55 UTC (rev 565)
@@ -8,7 +8,7 @@
{
renderer Billboard
{
- billboard_sorting true
+ sorting true
}
material ParticleUniverse/Tornado
default_particle_width 250
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
