Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2010-02-25 19:28:14 +0000
committerStijn Buys <ingar@osirion.org>2010-02-25 19:28:14 +0000
commit90fbc4c5caf5afd54920894319448b74967399ba (patch)
treed4a8fe5ccdcbe94f4a3e5e1115f5baed26e8c2e3 /src/model/model.h
parent83757353860fa447c36d4078602efea36d7da94e (diff)
added initial support for model sound tags,
moved sound code from client/targets.cc to client/soundext.cc, added master volume cvar snd_volume
Diffstat (limited to 'src/model/model.h')
-rw-r--r--src/model/model.h36
1 files changed, 24 insertions, 12 deletions
diff --git a/src/model/model.h b/src/model/model.h
index c8f60f1..dd9cdf2 100644
--- a/src/model/model.h
+++ b/src/model/model.h
@@ -37,18 +37,21 @@ public:
/// type definition for a list of model fragments
typedef std::list<Fragment *> Fragments;
- /// type definition for a list of model lights
+ /// type definition for a list of model light tags
typedef std::list<Light *> Lights;
- /// type definition for a list of model flares
+ /// type definition for a list of model flare tags
typedef std::list<Flare *> Flares;
- /// type definition for a lost of dockable locations
+ /// type definition for a list of model dock tags
typedef std::list<Dock *> Docks;
- /// type definition for a list of model particles
+ /// type definition for a list of model particle system tags
typedef std::list<Particles *> ParticleSystems;
+ /// type definition for a list of model sound tags
+ typedef std::list<Sound *> Sounds;
+
/// type definition for a list of FragmentGroups
typedef std::list<FragmentGroup *> Groups;
@@ -73,22 +76,27 @@ public:
return model_groups;
}
- /// list of lights
+ /// list of model light tags
inline Lights & lights() {
return model_lights;
}
- /// list of dockable locations
+ /// list of model dock tags
inline Docks & docks() {
return model_docks;
}
- /// list of flares
+ /// list of model flare tags
inline Flares & flares() {
return model_flares;
}
- /// list of engines
+ /// list of model sound tags
+ inline Sounds & sounds() {
+ return model_sounds;
+ }
+
+ /// list of model particle system tags
inline ParticleSystems & particles() {
return model_particles;
}
@@ -123,18 +131,21 @@ public:
return model_origin;
}
- /// add a light to the model
+ /// add a light tag to the model
void add_light(Light *light);
- /// add a particle system to the model
+ /// add a particle system tag to the model
void add_particles(Particles *particles);
- /// add a flare to the model
+ /// add a flare tag to the model
void add_flare(Flare *flare);
- /// add a docking location to the model
+ /// add a docking location tag to the model
void add_dock(Dock *dock);
+ /// add a sound tag to the model
+ void add_sound(Sound *sound);
+
/// add a fragment group to the model
void add_group(FragmentGroup *group);
@@ -187,6 +198,7 @@ private:
Docks model_docks;
Flares model_flares;
+ Sounds model_sounds;
Lights model_lights;
ParticleSystems model_particles;
Groups model_groups;