diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-17 07:33:00 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-17 07:36:24 +0100 |
commit | cb282c6ef0bb91957f8a6f422705813bd47c788c (patch) | |
tree | 7eba92b08fc89f46f1b7402b86372cfcc82486db /servers | |
parent | c5d76139dc9c5721e09e0e782bed5ccf1789554b (diff) |
Style: Set clang-format Standard to Cpp11
For us, it practically only changes the fact that `A<A<int>>` is now
used instead of the C++03 compatible `A<A<int> >`.
Note: clang-format 10+ changed the `Standard` arguments to fully
specified `c++11`, `c++14`, etc. versions, but we can't use `c++17`
now if we want to preserve compatibility with clang-format 8 and 9.
`Cpp11` is still supported as deprecated alias for `Latest`.
Diffstat (limited to 'servers')
-rw-r--r-- | servers/arvr_server.h | 2 | ||||
-rw-r--r-- | servers/audio/effects/audio_effect_spectrum_analyzer.h | 2 | ||||
-rw-r--r-- | servers/audio_server.h | 4 | ||||
-rw-r--r-- | servers/camera_server.h | 2 | ||||
-rw-r--r-- | servers/visual/rasterizer.h | 6 | ||||
-rw-r--r-- | servers/visual/rasterizer_rd/rasterizer_storage_rd.cpp | 22 | ||||
-rw-r--r-- | servers/visual/rasterizer_rd/rasterizer_storage_rd.h | 4 | ||||
-rw-r--r-- | servers/visual/rasterizer_rd/shader_compiler_rd.h | 2 | ||||
-rw-r--r-- | servers/visual/rendering_device.h | 2 | ||||
-rw-r--r-- | servers/visual/shader_language.cpp | 4 | ||||
-rw-r--r-- | servers/visual/shader_language.h | 2 | ||||
-rw-r--r-- | servers/visual/visual_server_raster.h | 4 | ||||
-rw-r--r-- | servers/visual/visual_server_viewport.cpp | 4 | ||||
-rw-r--r-- | servers/visual/visual_server_wrap_mt.h | 4 | ||||
-rw-r--r-- | servers/visual_server.cpp | 4 | ||||
-rw-r--r-- | servers/visual_server.h | 6 |
16 files changed, 37 insertions, 37 deletions
diff --git a/servers/arvr_server.h b/servers/arvr_server.h index af1d2ba39f..ab2f0d721b 100644 --- a/servers/arvr_server.h +++ b/servers/arvr_server.h @@ -76,7 +76,7 @@ public: }; private: - Vector<Ref<ARVRInterface> > interfaces; + Vector<Ref<ARVRInterface>> interfaces; Vector<ARVRPositionalTracker *> trackers; Ref<ARVRInterface> primary_interface; /* we'll identify one interface as primary, this will be used by our viewports */ diff --git a/servers/audio/effects/audio_effect_spectrum_analyzer.h b/servers/audio/effects/audio_effect_spectrum_analyzer.h index 8e735b8b50..a110f7a8e5 100644 --- a/servers/audio/effects/audio_effect_spectrum_analyzer.h +++ b/servers/audio/effects/audio_effect_spectrum_analyzer.h @@ -48,7 +48,7 @@ private: friend class AudioEffectSpectrumAnalyzer; Ref<AudioEffectSpectrumAnalyzer> base; - Vector<Vector<AudioFrame> > fft_history; + Vector<Vector<AudioFrame>> fft_history; Vector<float> temporal_fft; int temporal_fft_pos; int fft_size; diff --git a/servers/audio_server.h b/servers/audio_server.h index cc0c9d1112..8df0172750 100644 --- a/servers/audio_server.h +++ b/servers/audio_server.h @@ -198,7 +198,7 @@ private: bool active; AudioFrame peak_volume; Vector<AudioFrame> buffer; - Vector<Ref<AudioEffectInstance> > effect_instances; + Vector<Ref<AudioEffectInstance>> effect_instances; uint64_t last_mix_with_audio; Channel() { last_mix_with_audio = 0; @@ -224,7 +224,7 @@ private: int index_cache; }; - Vector<Vector<AudioFrame> > temp_buffer; //temp_buffer for each level + Vector<Vector<AudioFrame>> temp_buffer; //temp_buffer for each level Vector<Bus *> buses; Map<StringName, Bus *> bus_map; diff --git a/servers/camera_server.h b/servers/camera_server.h index c4b3d9f5c9..b268553fe5 100644 --- a/servers/camera_server.h +++ b/servers/camera_server.h @@ -65,7 +65,7 @@ private: protected: static CreateFunc create_func; - Vector<Ref<CameraFeed> > feeds; + Vector<Ref<CameraFeed>> feeds; static CameraServer *singleton; diff --git a/servers/visual/rasterizer.h b/servers/visual/rasterizer.h index 0a55c78133..2670a750d7 100644 --- a/servers/visual/rasterizer.h +++ b/servers/visual/rasterizer.h @@ -178,7 +178,7 @@ public: } void clean_up_dependencies() { - List<Pair<InstanceDependency *, Map<InstanceBase *, uint32_t>::Element *> > to_clean_up; + List<Pair<InstanceDependency *, Map<InstanceBase *, uint32_t>::Element *>> to_clean_up; for (Set<InstanceDependency *>::Element *E = dependencies.front(); E; E = E->next()) { InstanceDependency *dep = E->get(); Map<InstanceBase *, uint32_t>::Element *F = dep->instances.find(this); @@ -277,8 +277,8 @@ public: /* TEXTURE API */ virtual RID texture_2d_create(const Ref<Image> &p_image) = 0; - virtual RID texture_2d_layered_create(const Vector<Ref<Image> > &p_layers, VS::TextureLayeredType p_layered_type) = 0; - virtual RID texture_3d_create(const Vector<Ref<Image> > &p_slices) = 0; //all slices, then all the mipmaps, must be coherent + virtual RID texture_2d_layered_create(const Vector<Ref<Image>> &p_layers, VS::TextureLayeredType p_layered_type) = 0; + virtual RID texture_3d_create(const Vector<Ref<Image>> &p_slices) = 0; //all slices, then all the mipmaps, must be coherent virtual RID texture_proxy_create(RID p_base) = 0; //all slices, then all the mipmaps, must be coherent virtual void texture_2d_update_immediate(RID p_texture, const Ref<Image> &p_image, int p_layer = 0) = 0; //mostly used for video and streaming diff --git a/servers/visual/rasterizer_rd/rasterizer_storage_rd.cpp b/servers/visual/rasterizer_rd/rasterizer_storage_rd.cpp index 850acbf554..b8d7a9dcf4 100644 --- a/servers/visual/rasterizer_rd/rasterizer_storage_rd.cpp +++ b/servers/visual/rasterizer_rd/rasterizer_storage_rd.cpp @@ -585,7 +585,7 @@ RID RasterizerStorageRD::texture_2d_create(const Ref<Image> &p_image) { rd_view.swizzle_a = ret_format.swizzle_a; } Vector<uint8_t> data = image->get_data(); //use image data - Vector<Vector<uint8_t> > data_slices; + Vector<Vector<uint8_t>> data_slices; data_slices.push_back(data); texture.rd_texture = RD::get_singleton()->texture_create(rd_format, rd_view, data_slices); ERR_FAIL_COND_V(texture.rd_texture.is_null(), RID()); @@ -608,11 +608,11 @@ RID RasterizerStorageRD::texture_2d_create(const Ref<Image> &p_image) { return texture_owner.make_rid(texture); } -RID RasterizerStorageRD::texture_2d_layered_create(const Vector<Ref<Image> > &p_layers, VS::TextureLayeredType p_layered_type) { +RID RasterizerStorageRD::texture_2d_layered_create(const Vector<Ref<Image>> &p_layers, VS::TextureLayeredType p_layered_type) { return RID(); } -RID RasterizerStorageRD::texture_3d_create(const Vector<Ref<Image> > &p_slices) { +RID RasterizerStorageRD::texture_3d_create(const Vector<Ref<Image>> &p_slices) { return RID(); } @@ -3597,7 +3597,7 @@ void RasterizerStorageRD::gi_probe_allocate(RID p_gi_probe, const Transform &p_t tf.depth = gi_probe->octree_size.z; tf.type = RD::TEXTURE_TYPE_3D; tf.usage_bits = RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_CAN_UPDATE_BIT | RD::TEXTURE_USAGE_CAN_COPY_FROM_BIT; - Vector<Vector<uint8_t> > s; + Vector<Vector<uint8_t>> s; s.push_back(p_distance_field); gi_probe->sdf_texture = RD::get_singleton()->texture_create(tf, RD::TextureView(), s); } @@ -4473,7 +4473,7 @@ RasterizerStorageRD::RasterizerStorageRD() { } { - Vector<Vector<uint8_t> > vpv; + Vector<Vector<uint8_t>> vpv; vpv.push_back(pv); default_rd_textures[DEFAULT_RD_TEXTURE_WHITE] = RD::get_singleton()->texture_create(tformat, RD::TextureView(), vpv); } @@ -4486,7 +4486,7 @@ RasterizerStorageRD::RasterizerStorageRD() { } { - Vector<Vector<uint8_t> > vpv; + Vector<Vector<uint8_t>> vpv; vpv.push_back(pv); default_rd_textures[DEFAULT_RD_TEXTURE_BLACK] = RD::get_singleton()->texture_create(tformat, RD::TextureView(), vpv); } @@ -4499,7 +4499,7 @@ RasterizerStorageRD::RasterizerStorageRD() { } { - Vector<Vector<uint8_t> > vpv; + Vector<Vector<uint8_t>> vpv; vpv.push_back(pv); default_rd_textures[DEFAULT_RD_TEXTURE_NORMAL] = RD::get_singleton()->texture_create(tformat, RD::TextureView(), vpv); } @@ -4512,7 +4512,7 @@ RasterizerStorageRD::RasterizerStorageRD() { } { - Vector<Vector<uint8_t> > vpv; + Vector<Vector<uint8_t>> vpv; vpv.push_back(pv); default_rd_textures[DEFAULT_RD_TEXTURE_ANISO] = RD::get_singleton()->texture_create(tformat, RD::TextureView(), vpv); } @@ -4547,7 +4547,7 @@ RasterizerStorageRD::RasterizerStorageRD() { } { - Vector<Vector<uint8_t> > vpv; + Vector<Vector<uint8_t>> vpv; for (int i = 0; i < 6; i++) { vpv.push_back(pv); } @@ -4575,7 +4575,7 @@ RasterizerStorageRD::RasterizerStorageRD() { } { - Vector<Vector<uint8_t> > vpv; + Vector<Vector<uint8_t>> vpv; for (int i = 0; i < 6; i++) { vpv.push_back(pv); } @@ -4603,7 +4603,7 @@ RasterizerStorageRD::RasterizerStorageRD() { } { - Vector<Vector<uint8_t> > vpv; + Vector<Vector<uint8_t>> vpv; vpv.push_back(pv); default_rd_textures[DEFAULT_RD_TEXTURE_3D_WHITE] = RD::get_singleton()->texture_create(tformat, RD::TextureView(), vpv); } diff --git a/servers/visual/rasterizer_rd/rasterizer_storage_rd.h b/servers/visual/rasterizer_rd/rasterizer_storage_rd.h index 48097ffaac..9bc4beab6e 100644 --- a/servers/visual/rasterizer_rd/rasterizer_storage_rd.h +++ b/servers/visual/rasterizer_rd/rasterizer_storage_rd.h @@ -497,8 +497,8 @@ public: /* TEXTURE API */ virtual RID texture_2d_create(const Ref<Image> &p_image); - virtual RID texture_2d_layered_create(const Vector<Ref<Image> > &p_layers, VS::TextureLayeredType p_layered_type); - virtual RID texture_3d_create(const Vector<Ref<Image> > &p_slices); //all slices, then all the mipmaps, must be coherent + virtual RID texture_2d_layered_create(const Vector<Ref<Image>> &p_layers, VS::TextureLayeredType p_layered_type); + virtual RID texture_3d_create(const Vector<Ref<Image>> &p_slices); //all slices, then all the mipmaps, must be coherent virtual RID texture_proxy_create(RID p_base); virtual void _texture_2d_update(RID p_texture, const Ref<Image> &p_image, int p_layer, bool p_immediate); diff --git a/servers/visual/rasterizer_rd/shader_compiler_rd.h b/servers/visual/rasterizer_rd/shader_compiler_rd.h index c267c2b6d8..95e1f0aa23 100644 --- a/servers/visual/rasterizer_rd/shader_compiler_rd.h +++ b/servers/visual/rasterizer_rd/shader_compiler_rd.h @@ -40,7 +40,7 @@ class ShaderCompilerRD { public: struct IdentifierActions { - Map<StringName, Pair<int *, int> > render_mode_values; + Map<StringName, Pair<int *, int>> render_mode_values; Map<StringName, bool *> render_mode_flags; Map<StringName, bool *> usage_flag_pointers; Map<StringName, bool *> write_flag_pointers; diff --git a/servers/visual/rendering_device.h b/servers/visual/rendering_device.h index 1ff169f102..ed55afd961 100644 --- a/servers/visual/rendering_device.h +++ b/servers/visual/rendering_device.h @@ -407,7 +407,7 @@ public: } }; - virtual RID texture_create(const TextureFormat &p_format, const TextureView &p_view, const Vector<Vector<uint8_t> > &p_data = Vector<Vector<uint8_t> >()) = 0; + virtual RID texture_create(const TextureFormat &p_format, const TextureView &p_view, const Vector<Vector<uint8_t>> &p_data = Vector<Vector<uint8_t>>()) = 0; virtual RID texture_create_shared(const TextureView &p_view, RID p_with_texture) = 0; enum TextureSliceType { diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index e32e7c093a..98f1b2e460 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -3038,7 +3038,7 @@ bool ShaderLanguage::_propagate_function_call_sampler_uniform_settings(StringNam arg->tex_argument_check = true; arg->tex_argument_filter = p_filter; arg->tex_argument_repeat = p_repeat; - for (Map<StringName, Set<int> >::Element *E = arg->tex_argument_connect.front(); E; E = E->next()) { + for (Map<StringName, Set<int>>::Element *E = arg->tex_argument_connect.front(); E; E = E->next()) { for (Set<int>::Element *F = E->get().front(); F; F = F->next()) { if (!_propagate_function_call_sampler_uniform_settings(E->key(), F->get(), p_filter, p_repeat)) { return false; @@ -3073,7 +3073,7 @@ bool ShaderLanguage::_propagate_function_call_sampler_builtin_reference(StringNa arg->tex_builtin_check = true; arg->tex_builtin = p_builtin; - for (Map<StringName, Set<int> >::Element *E = arg->tex_argument_connect.front(); E; E = E->next()) { + for (Map<StringName, Set<int>>::Element *E = arg->tex_argument_connect.front(); E; E = E->next()) { for (Set<int>::Element *F = E->get().front(); F; F = F->next()) { if (!_propagate_function_call_sampler_builtin_reference(E->key(), F->get(), p_builtin)) { return false; diff --git a/servers/visual/shader_language.h b/servers/visual/shader_language.h index 5a69a84650..f8391dc273 100644 --- a/servers/visual/shader_language.h +++ b/servers/visual/shader_language.h @@ -576,7 +576,7 @@ public: bool tex_builtin_check; StringName tex_builtin; - Map<StringName, Set<int> > tex_argument_connect; + Map<StringName, Set<int>> tex_argument_connect; }; StringName name; diff --git a/servers/visual/visual_server_raster.h b/servers/visual/visual_server_raster.h index 4fea6082f4..09b34ce25c 100644 --- a/servers/visual/visual_server_raster.h +++ b/servers/visual/visual_server_raster.h @@ -151,8 +151,8 @@ public: //these go pass-through, as they can be called from any thread BIND1R(RID, texture_2d_create, const Ref<Image> &) - BIND2R(RID, texture_2d_layered_create, const Vector<Ref<Image> > &, TextureLayeredType) - BIND1R(RID, texture_3d_create, const Vector<Ref<Image> > &) + BIND2R(RID, texture_2d_layered_create, const Vector<Ref<Image>> &, TextureLayeredType) + BIND1R(RID, texture_3d_create, const Vector<Ref<Image>> &) BIND1R(RID, texture_proxy_create, RID) //goes pass-through diff --git a/servers/visual/visual_server_viewport.cpp b/servers/visual/visual_server_viewport.cpp index 30fdef9325..43262042cc 100644 --- a/servers/visual/visual_server_viewport.cpp +++ b/servers/visual/visual_server_viewport.cpp @@ -312,7 +312,7 @@ void VisualServerViewport::draw_viewports() { //sort viewports active_viewports.sort_custom<ViewportSort>(); - Map<int, Vector<Rasterizer::BlitToScreen> > blit_to_screen_list; + Map<int, Vector<Rasterizer::BlitToScreen>> blit_to_screen_list; //draw viewports RENDER_TIMESTAMP(">Render Viewports"); @@ -415,7 +415,7 @@ void VisualServerViewport::draw_viewports() { //this needs to be called to make screen swapping more efficient VSG::rasterizer->prepare_for_blitting_render_targets(); - for (Map<int, Vector<Rasterizer::BlitToScreen> >::Element *E = blit_to_screen_list.front(); E; E = E->next()) { + for (Map<int, Vector<Rasterizer::BlitToScreen>>::Element *E = blit_to_screen_list.front(); E; E = E->next()) { VSG::rasterizer->blit_render_targets_to_screen(E->key(), E->get().ptr(), E->get().size()); } } diff --git a/servers/visual/visual_server_wrap_mt.h b/servers/visual/visual_server_wrap_mt.h index 2eaafe220b..8f4df6a0e2 100644 --- a/servers/visual/visual_server_wrap_mt.h +++ b/servers/visual/visual_server_wrap_mt.h @@ -79,8 +79,8 @@ public: //these go pass-through, as they can be called from any thread virtual RID texture_2d_create(const Ref<Image> &p_image) { return visual_server->texture_2d_create(p_image); } - virtual RID texture_2d_layered_create(const Vector<Ref<Image> > &p_layers, TextureLayeredType p_layered_type) { return visual_server->texture_2d_layered_create(p_layers, p_layered_type); } - virtual RID texture_3d_create(const Vector<Ref<Image> > &p_slices) { return visual_server->texture_3d_create(p_slices); } + virtual RID texture_2d_layered_create(const Vector<Ref<Image>> &p_layers, TextureLayeredType p_layered_type) { return visual_server->texture_2d_layered_create(p_layers, p_layered_type); } + virtual RID texture_3d_create(const Vector<Ref<Image>> &p_slices) { return visual_server->texture_3d_create(p_slices); } virtual RID texture_proxy_create(RID p_base) { return visual_server->texture_proxy_create(p_base); } //goes pass-through diff --git a/servers/visual_server.cpp b/servers/visual_server.cpp index b30d5e1dd1..1506561952 100644 --- a/servers/visual_server.cpp +++ b/servers/visual_server.cpp @@ -1020,7 +1020,7 @@ Error VisualServer::mesh_create_surface_data_from_arrays(SurfaceData *r_surface_ Error err = _surface_set_data(p_arrays, format, offsets, total_elem_size, vertex_array, array_len, index_array, index_array_len, aabb, bone_aabb); ERR_FAIL_COND_V_MSG(err != OK, ERR_INVALID_DATA, "Invalid array format for surface."); - Vector<Vector<uint8_t> > blend_shape_data; + Vector<Vector<uint8_t>> blend_shape_data; for (int i = 0; i < p_blend_shapes.size(); i++) { @@ -1517,7 +1517,7 @@ Array VisualServer::mesh_surface_get_blend_shape_arrays(RID p_mesh, int p_surfac SurfaceData sd = mesh_get_surface(p_mesh, p_surface); ERR_FAIL_COND_V(sd.vertex_count == 0, Array()); - Vector<Vector<uint8_t> > blend_shape_data = sd.blend_shapes; + Vector<Vector<uint8_t>> blend_shape_data = sd.blend_shapes; if (blend_shape_data.size() > 0) { int vertex_len = sd.vertex_count; diff --git a/servers/visual_server.h b/servers/visual_server.h index 9129f940ee..4bb1c1a080 100644 --- a/servers/visual_server.h +++ b/servers/visual_server.h @@ -94,8 +94,8 @@ public: }; virtual RID texture_2d_create(const Ref<Image> &p_image) = 0; - virtual RID texture_2d_layered_create(const Vector<Ref<Image> > &p_layers, TextureLayeredType p_layered_type) = 0; - virtual RID texture_3d_create(const Vector<Ref<Image> > &p_slices) = 0; //all slices, then all the mipmaps, must be coherent + virtual RID texture_2d_layered_create(const Vector<Ref<Image>> &p_layers, TextureLayeredType p_layered_type) = 0; + virtual RID texture_3d_create(const Vector<Ref<Image>> &p_slices) = 0; //all slices, then all the mipmaps, must be coherent virtual RID texture_proxy_create(RID p_base) = 0; virtual void texture_2d_update_immediate(RID p_texture, const Ref<Image> &p_image, int p_layer = 0) = 0; //mostly used for video and streaming @@ -262,7 +262,7 @@ public: Vector<LOD> lods; Vector<AABB> bone_aabbs; - Vector<Vector<uint8_t> > blend_shapes; + Vector<Vector<uint8_t>> blend_shapes; RID material; }; |