godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3728 from nunodonato/refixparticles 

refix particles3d issue, bringing down the amount limit to 1024
This commit is contained in:
Rémi Verschelde 2016-02-16 10:03:34 +01:00
parent 7496fd4788 2d1de83434
commit 4df8b7b02f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scene/3d/particles.cpp
View File

@ -95,7 +95,7 @@ DVector<Face3> Particles::get_faces(uint32_t p_usage_flags) const {
void Particles::set_amount(int p_amount) {
ERR_FAIL_INDEX(p_amount,4096);
ERR_FAIL_INDEX(p_amount,1024);
amount=p_amount;
VisualServer::get_singleton()->particles_set_amount(particles,p_amount);
}
@ -441,7 +441,7 @@ void Particles::_bind_methods() {
ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "Material" ), _SCS("set_material"), _SCS("get_material") );
ADD_PROPERTY( PropertyInfo( Variant::INT, "amount", PROPERTY_HINT_RANGE, "1,4096,1" ), _SCS("set_amount"), _SCS("get_amount") );
ADD_PROPERTY( PropertyInfo( Variant::INT, "amount", PROPERTY_HINT_RANGE, "1,1024,1" ), _SCS("set_amount"), _SCS("get_amount") );
ADD_PROPERTY( PropertyInfo( Variant::BOOL, "emitting" ), _SCS("set_emitting"), _SCS("is_emitting") );
ADD_PROPERTY( PropertyInfo( Variant::_AABB, "visibility" ), _SCS("set_visibility_aabb"), _SCS("get_visibility_aabb") );
ADD_PROPERTY( PropertyInfo( Variant::VECTOR3, "emission_extents" ), _SCS("set_emission_half_extents"), _SCS("get_emission_half_extents") );

2
servers/visual/particle_system_sw.h
View File

@ -38,7 +38,7 @@
struct ParticleSystemSW {
enum {
MAX_PARTICLES=4096
MAX_PARTICLES=1024
};
float particle_vars[VS::PARTICLE_VAR_MAX];