- Timestamp:
- Jan 20, 2006, 1:57:57 AM (19 years ago)
- Location:
- trunk/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/lib/particles/particle_system.cc
r6625 r6626 33 33 34 34 using namespace std; 35 36 35 /** 37 36 * standard constructor -
trunk/src/lib/particles/spark_particles.cc
r6623 r6626 28 28 29 29 30 CREATE_FACTORY(SparkParticles, CL_SPARK_PARTICLES);31 30 32 31 using namespace std; 32 33 CREATE_FACTORY(SparkParticles, CL_SPARK_PARTICLES); 33 34 34 35 /** … … 106 107 void SparkParticles::draw() const 107 108 { 109 exit(-1); 108 110 glPushAttrib(GL_ENABLE_BIT); 109 111 … … 115 117 glEnable(GL_LINE_SMOOTH); 116 118 glEnable(GL_BLEND); 119 glBlendFunc(GL_SRC_ALPHA, GL_DST_ALPHA); 117 120 118 121 glBegin(GL_LINES); -
trunk/src/lib/particles/sprite_particles.cc
r6623 r6626 86 86 this->setClassID(CL_SPRITE_PARTICLES, "SpriteParticles"); 87 87 88 this->material = NULL;88 this->material.setDiffuseMap("maps/radial-trans-noise.png"); 89 89 } 90 90 … … 101 101 } 102 102 103 // setting properties104 103 /** 105 * @brief sets the material to an external material 106 * @param material: the material to set this material to. 107 * 108 * !! important if the extern material gets deleted it MUST be unregistered here or segfault !! 109 */ 110 void SpriteParticles::setMaterial(Material* material) 111 { 112 this->material = *material; 113 } 114 104 * @brief sets the Texutre that is placed onto the particles 105 * @param textureFile the Texture to load onto these SpriteParticles 106 */ 115 107 void SpriteParticles::setMaterialTexture(const char* textureFile) 116 108 { -
trunk/src/lib/particles/sprite_particles.h
r6623 r6626 21 21 virtual void loadParams(const TiXmlElement* root); 22 22 23 void setMaterial(Material* material);24 23 void setMaterialTexture(const char* textureFile); 25 24 -
trunk/src/story_entities/game_world_data.cc
r6619 r6626 246 246 247 247 // erease everything that is left. 248 delete PNode::getNullParent();248 // delete PNode::getNullParent(); // not needed as this is also done in the next step (and also much cleaner) 249 249 250 250 //secondary cleanup of PNodes;
Note: See TracChangeset
for help on using the changeset viewer.