From f8db8a3faa30b71dca33ced38be16d3f93f43e8a Mon Sep 17 00:00:00 2001 From: Rémi Verschelde Date: Sun, 19 Mar 2017 00:36:26 +0100 Subject: Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261. --- scene/3d/spatial_player.cpp | 200 +++++++++++++++++++------------------------- 1 file changed, 87 insertions(+), 113 deletions(-) (limited to 'scene/3d/spatial_player.cpp') diff --git a/scene/3d/spatial_player.cpp b/scene/3d/spatial_player.cpp index 2bd94aac7..efcfc7fc4 100644 --- a/scene/3d/spatial_player.cpp +++ b/scene/3d/spatial_player.cpp @@ -28,29 +28,26 @@ /*************************************************************************/ #include "spatial_player.h" -#include "servers/audio_server.h" #include "camera.h" -#include "servers/spatial_sound_server.h" #include "scene/resources/surface_tool.h" - +#include "servers/audio_server.h" +#include "servers/spatial_sound_server.h" void SpatialPlayer::_notification(int p_what) { - - switch(p_what) { + switch (p_what) { case NOTIFICATION_ENTER_WORLD: { //find the sound space source_rid = SpatialSoundServer::get_singleton()->source_create(get_world()->get_sound_space()); - for(int i=0;isource_set_transform(source_rid,get_global_transform()); + SpatialSoundServer::get_singleton()->source_set_transform(source_rid, get_global_transform()); } break; case NOTIFICATION_EXIT_WORLD: { @@ -60,27 +57,23 @@ void SpatialPlayer::_notification(int p_what) { } break; } - } +void SpatialPlayer::set_param(Param p_param, float p_value) { -void SpatialPlayer::set_param( Param p_param, float p_value) { - - ERR_FAIL_INDEX(p_param,PARAM_MAX); - params[p_param]=p_value; - if (p_param==PARAM_EMISSION_CONE_DEGREES) { + ERR_FAIL_INDEX(p_param, PARAM_MAX); + params[p_param] = p_value; + if (p_param == PARAM_EMISSION_CONE_DEGREES) { update_gizmo(); } if (source_rid.is_valid()) - SpatialSoundServer::get_singleton()->source_set_param(source_rid,(SpatialSoundServer::SourceParam)p_param,p_value); - + SpatialSoundServer::get_singleton()->source_set_param(source_rid, (SpatialSoundServer::SourceParam)p_param, p_value); } -float SpatialPlayer::get_param( Param p_param) const { +float SpatialPlayer::get_param(Param p_param) const { - ERR_FAIL_INDEX_V(p_param,PARAM_MAX,0); + ERR_FAIL_INDEX_V(p_param, PARAM_MAX, 0); return params[p_param]; - } bool SpatialPlayer::_can_gizmo_scale() const { @@ -90,41 +83,40 @@ bool SpatialPlayer::_can_gizmo_scale() const { RES SpatialPlayer::_get_gizmo_geometry() const { - Ref surface_tool( memnew( SurfaceTool )); + Ref surface_tool(memnew(SurfaceTool)); - Ref mat( memnew( FixedMaterial )); - - mat->set_parameter( FixedMaterial::PARAM_DIFFUSE,Color(0.0,0.6,0.7,0.05) ); - mat->set_parameter( FixedMaterial::PARAM_EMISSION,Color(0.5,0.7,0.8) ); - mat->set_blend_mode( Material::BLEND_MODE_ADD ); - mat->set_flag(Material::FLAG_DOUBLE_SIDED,true); -// mat->set_hint(Material::HINT_NO_DEPTH_DRAW,true); + Ref mat(memnew(FixedMaterial)); + mat->set_parameter(FixedMaterial::PARAM_DIFFUSE, Color(0.0, 0.6, 0.7, 0.05)); + mat->set_parameter(FixedMaterial::PARAM_EMISSION, Color(0.5, 0.7, 0.8)); + mat->set_blend_mode(Material::BLEND_MODE_ADD); + mat->set_flag(Material::FLAG_DOUBLE_SIDED, true); + // mat->set_hint(Material::HINT_NO_DEPTH_DRAW,true); surface_tool->begin(Mesh::PRIMITIVE_TRIANGLES); surface_tool->set_material(mat); - int sides=16; - int sections=24; + int sides = 16; + int sections = 24; -// float len=1; - float deg=Math::deg2rad(params[PARAM_EMISSION_CONE_DEGREES]); - if (deg==180) - deg=179.5; + // float len=1; + float deg = Math::deg2rad(params[PARAM_EMISSION_CONE_DEGREES]); + if (deg == 180) + deg = 179.5; - Vector3 to=Vector3(0,0,-1); + Vector3 to = Vector3(0, 0, -1); - for(int j=0;jadd_normal(p1r.normalized()); surface_tool->add_vertex(p1r); @@ -140,25 +132,24 @@ RES SpatialPlayer::_get_gizmo_geometry() const { surface_tool->add_normal(p2r.normalized()); surface_tool->add_vertex(p2r); - if (j==sections-1) { + if (j == sections - 1) { surface_tool->add_normal(p2r.normalized()); surface_tool->add_vertex(p2r); surface_tool->add_normal(p2s.normalized()); surface_tool->add_vertex(p2s); - surface_tool->add_normal(Vector3(0,0,1)); + surface_tool->add_normal(Vector3(0, 0, 1)); surface_tool->add_vertex(Vector3()); } } } - Ref mesh = surface_tool->commit(); - Ref mat_speaker( memnew( FixedMaterial )); + Ref mat_speaker(memnew(FixedMaterial)); - mat_speaker->set_parameter( FixedMaterial::PARAM_DIFFUSE,Color(0.3,0.3,0.6) ); - mat_speaker->set_parameter( FixedMaterial::PARAM_SPECULAR,Color(0.5,0.5,0.6) ); + mat_speaker->set_parameter(FixedMaterial::PARAM_DIFFUSE, Color(0.3, 0.3, 0.6)); + mat_speaker->set_parameter(FixedMaterial::PARAM_SPECULAR, Color(0.5, 0.5, 0.6)); //mat_speaker->set_blend_mode( Material::BLEND_MODE_MIX); //mat_speaker->set_flag(Material::FLAG_DOUBLE_SIDED,false); //mat_speaker->set_flag(Material::FLAG_UNSHADED,true); @@ -166,41 +157,37 @@ RES SpatialPlayer::_get_gizmo_geometry() const { surface_tool->begin(Mesh::PRIMITIVE_TRIANGLES); surface_tool->set_material(mat_speaker); -// float radius=1; - - - const int speaker_points=8; - Vector3 speaker[speaker_points]={ - Vector3(0,0,1)*0.15, - Vector3(1,1,1)*0.15, - Vector3(1,1,0)*0.15, - Vector3(2,2,-1)*0.15, - Vector3(1,1,-1)*0.15, - Vector3(0.8,0.8,-1.2)*0.15, - Vector3(0.5,0.5,-1.4)*0.15, - Vector3(0.0,0.0,-1.6)*0.15 + // float radius=1; + + const int speaker_points = 8; + Vector3 speaker[speaker_points] = { + Vector3(0, 0, 1) * 0.15, + Vector3(1, 1, 1) * 0.15, + Vector3(1, 1, 0) * 0.15, + Vector3(2, 2, -1) * 0.15, + Vector3(1, 1, -1) * 0.15, + Vector3(0.8, 0.8, -1.2) * 0.15, + Vector3(0.5, 0.5, -1.4) * 0.15, + Vector3(0.0, 0.0, -1.6) * 0.15 }; - int speaker_sides=10; - - - for(int i = 0; i < speaker_sides ; i++) { + int speaker_sides = 10; + for (int i = 0; i < speaker_sides; i++) { - Matrix3 ma(Vector3(0,0,1),Math_PI*2*float(i)/speaker_sides); - Matrix3 mb(Vector3(0,0,1),Math_PI*2*float(i+1)/speaker_sides); + Matrix3 ma(Vector3(0, 0, 1), Math_PI * 2 * float(i) / speaker_sides); + Matrix3 mb(Vector3(0, 0, 1), Math_PI * 2 * float(i + 1) / speaker_sides); + for (int j = 0; j < speaker_points - 1; j++) { - for(int j=0;jadd_normal(n); surface_tool->add_vertex(points[0]); @@ -215,58 +202,45 @@ RES SpatialPlayer::_get_gizmo_geometry() const { surface_tool->add_vertex(points[3]); surface_tool->add_normal(n); surface_tool->add_vertex(points[2]); - - } - - } - return surface_tool->commit(mesh); - } - void SpatialPlayer::_bind_methods() { - - ObjectTypeDB::bind_method(_MD("set_param","param","value"),&SpatialPlayer::set_param); - ObjectTypeDB::bind_method(_MD("get_param","param"),&SpatialPlayer::get_param); - - BIND_CONSTANT( PARAM_VOLUME_DB ); - BIND_CONSTANT( PARAM_PITCH_SCALE ); - BIND_CONSTANT( PARAM_ATTENUATION_MIN_DISTANCE ); - BIND_CONSTANT( PARAM_ATTENUATION_MAX_DISTANCE ); - BIND_CONSTANT( PARAM_ATTENUATION_DISTANCE_EXP ); - BIND_CONSTANT( PARAM_EMISSION_CONE_DEGREES ); - BIND_CONSTANT( PARAM_EMISSION_CONE_ATTENUATION_DB ); - BIND_CONSTANT( PARAM_MAX ); - - ADD_PROPERTYI( PropertyInfo( Variant::REAL, "params/volume_db",PROPERTY_HINT_RANGE, "-80,24,0.01"),_SCS("set_param"),_SCS("get_param"),PARAM_VOLUME_DB); - ADD_PROPERTYI( PropertyInfo( Variant::REAL, "params/pitch_scale",PROPERTY_HINT_RANGE, "0.001,32,0.001"),_SCS("set_param"),_SCS("get_param"),PARAM_PITCH_SCALE); - ADD_PROPERTYI( PropertyInfo( Variant::REAL, "params/attenuation/min_distance",PROPERTY_HINT_RANGE, "0.01,4096,0.01"),_SCS("set_param"),_SCS("get_param"),PARAM_ATTENUATION_MIN_DISTANCE); - ADD_PROPERTYI( PropertyInfo( Variant::REAL, "params/attenuation/max_distance",PROPERTY_HINT_RANGE, "0.01,4096,0.01"),_SCS("set_param"),_SCS("get_param"),PARAM_ATTENUATION_MAX_DISTANCE); - ADD_PROPERTYI( PropertyInfo( Variant::REAL, "params/attenuation/distance_exp",PROPERTY_HINT_EXP_EASING, "attenuation"),_SCS("set_param"),_SCS("get_param"),PARAM_ATTENUATION_DISTANCE_EXP); - ADD_PROPERTYI( PropertyInfo( Variant::REAL, "params/emission_cone/degrees",PROPERTY_HINT_RANGE, "0,180,0.01"),_SCS("set_param"),_SCS("get_param"),PARAM_EMISSION_CONE_DEGREES); - ADD_PROPERTYI( PropertyInfo( Variant::REAL, "params/emission_cone/attenuation_db",PROPERTY_HINT_RANGE, "-80,24,0.01"),_SCS("set_param"),_SCS("get_param"),PARAM_EMISSION_CONE_ATTENUATION_DB); - + ObjectTypeDB::bind_method(_MD("set_param", "param", "value"), &SpatialPlayer::set_param); + ObjectTypeDB::bind_method(_MD("get_param", "param"), &SpatialPlayer::get_param); + + BIND_CONSTANT(PARAM_VOLUME_DB); + BIND_CONSTANT(PARAM_PITCH_SCALE); + BIND_CONSTANT(PARAM_ATTENUATION_MIN_DISTANCE); + BIND_CONSTANT(PARAM_ATTENUATION_MAX_DISTANCE); + BIND_CONSTANT(PARAM_ATTENUATION_DISTANCE_EXP); + BIND_CONSTANT(PARAM_EMISSION_CONE_DEGREES); + BIND_CONSTANT(PARAM_EMISSION_CONE_ATTENUATION_DB); + BIND_CONSTANT(PARAM_MAX); + + ADD_PROPERTYI(PropertyInfo(Variant::REAL, "params/volume_db", PROPERTY_HINT_RANGE, "-80,24,0.01"), _SCS("set_param"), _SCS("get_param"), PARAM_VOLUME_DB); + ADD_PROPERTYI(PropertyInfo(Variant::REAL, "params/pitch_scale", PROPERTY_HINT_RANGE, "0.001,32,0.001"), _SCS("set_param"), _SCS("get_param"), PARAM_PITCH_SCALE); + ADD_PROPERTYI(PropertyInfo(Variant::REAL, "params/attenuation/min_distance", PROPERTY_HINT_RANGE, "0.01,4096,0.01"), _SCS("set_param"), _SCS("get_param"), PARAM_ATTENUATION_MIN_DISTANCE); + ADD_PROPERTYI(PropertyInfo(Variant::REAL, "params/attenuation/max_distance", PROPERTY_HINT_RANGE, "0.01,4096,0.01"), _SCS("set_param"), _SCS("get_param"), PARAM_ATTENUATION_MAX_DISTANCE); + ADD_PROPERTYI(PropertyInfo(Variant::REAL, "params/attenuation/distance_exp", PROPERTY_HINT_EXP_EASING, "attenuation"), _SCS("set_param"), _SCS("get_param"), PARAM_ATTENUATION_DISTANCE_EXP); + ADD_PROPERTYI(PropertyInfo(Variant::REAL, "params/emission_cone/degrees", PROPERTY_HINT_RANGE, "0,180,0.01"), _SCS("set_param"), _SCS("get_param"), PARAM_EMISSION_CONE_DEGREES); + ADD_PROPERTYI(PropertyInfo(Variant::REAL, "params/emission_cone/attenuation_db", PROPERTY_HINT_RANGE, "-80,24,0.01"), _SCS("set_param"), _SCS("get_param"), PARAM_EMISSION_CONE_ATTENUATION_DB); } - SpatialPlayer::SpatialPlayer() { - params[PARAM_VOLUME_DB]=0.0; - params[PARAM_PITCH_SCALE]=1.0; - params[PARAM_ATTENUATION_MIN_DISTANCE]=1; - params[PARAM_ATTENUATION_MAX_DISTANCE]=100; - params[PARAM_ATTENUATION_DISTANCE_EXP]=1.0; //linear (and not really good) - params[PARAM_EMISSION_CONE_DEGREES]=180.0; //cone disabled - params[PARAM_EMISSION_CONE_ATTENUATION_DB]=-6.0; //minus 6 db attenuation - + params[PARAM_VOLUME_DB] = 0.0; + params[PARAM_PITCH_SCALE] = 1.0; + params[PARAM_ATTENUATION_MIN_DISTANCE] = 1; + params[PARAM_ATTENUATION_MAX_DISTANCE] = 100; + params[PARAM_ATTENUATION_DISTANCE_EXP] = 1.0; //linear (and not really good) + params[PARAM_EMISSION_CONE_DEGREES] = 180.0; //cone disabled + params[PARAM_EMISSION_CONE_ATTENUATION_DB] = -6.0; //minus 6 db attenuation } SpatialPlayer::~SpatialPlayer() { - - } -- cgit v1.2.3-70-g09d2