[Bf-blender-cvs] [28944549d68] soc-2019-npr: Clang format the code.
YimingWu
noreply at git.blender.org
Tue May 28 15:15:58 CEST 2019
Commit: 28944549d6827ab17fa86b99944b3f3d72b0456f
Author: YimingWu
Date: Tue May 28 21:15:20 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB28944549d6827ab17fa86b99944b3f3d72b0456f
Clang format the code.
===================================================================
M intern/opensubdiv/internal/opensubdiv_evaluator.cc
M intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc
M intern/opensubdiv/internal/opensubdiv_evaluator_internal.h
M intern/opensubdiv/opensubdiv_evaluator_capi.h
M release/datafiles/locale
M release/scripts/addons
M release/scripts/addons_contrib
M source/blender/blenkernel/intern/scene.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/blenloader/intern/writefile.c
M source/blender/draw/engines/lanpr/lanpr_all.h
M source/blender/draw/engines/lanpr/lanpr_chain.c
M source/blender/draw/engines/lanpr/lanpr_dpix.c
M source/blender/draw/engines/lanpr/lanpr_engine.c
M source/blender/draw/engines/lanpr/lanpr_ops.c
M source/blender/draw/engines/lanpr/lanpr_snake.c
M source/blender/draw/engines/lanpr/lanpr_util.c
M source/blender/draw/engines/lanpr/lanpr_util.h
M source/blender/draw/engines/lanpr/shaders/lanpr_dpix_preview_frag.glsl
M source/blender/draw/engines/lanpr/shaders/lanpr_dpix_preview_geom.glsl
M source/blender/draw/engines/lanpr/shaders/lanpr_dpix_project_clip_frag.glsl
M source/blender/draw/engines/lanpr/shaders/lanpr_dpix_project_passthrough_vert.glsl
M source/blender/draw/engines/lanpr/shaders/lanpr_snake_edge_frag.glsl
M source/blender/draw/engines/lanpr/shaders/lanpr_snake_image_peel_frag.glsl
M source/blender/draw/engines/lanpr/shaders/lanpr_snake_line_connection_frag.glsl
M source/blender/draw/engines/lanpr/shaders/lanpr_snake_line_connection_geom.glsl
M source/blender/draw/engines/lanpr/shaders/lanpr_snake_line_connection_vert.glsl
M source/blender/draw/engines/lanpr/shaders/lanpr_snake_multichannel_frag.glsl
M source/blender/draw/engines/lanpr/shaders/lanpr_software_chain_geom.glsl
M source/blender/draw/engines/lanpr/shaders/lanpr_software_line_chain_geom.glsl
M source/blender/draw/engines/lanpr/shaders/lanpr_software_passthrough_vert.glsl
M source/blender/draw/intern/DRW_render.h
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/intern/draw_manager_texture.c
M source/blender/editors/mesh/mesh_ops.c
M source/blender/editors/render/render_intern.h
M source/blender/editors/render/render_ops.c
M source/blender/makesdna/DNA_lanpr_types.h
M source/blender/makesdna/DNA_material_types.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_lanpr.c
M source/blender/makesrna/intern/rna_material.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/modifiers/intern/MOD_mybmesh.c
M source/tools
===================================================================
diff --git a/intern/opensubdiv/internal/opensubdiv_evaluator.cc b/intern/opensubdiv/internal/opensubdiv_evaluator.cc
index 0fe9c7567ea..c91408e8fd3 100644
--- a/intern/opensubdiv/internal/opensubdiv_evaluator.cc
+++ b/intern/opensubdiv/internal/opensubdiv_evaluator.cc
@@ -25,123 +25,120 @@
namespace {
-void setCoarsePositions(OpenSubdiv_Evaluator* evaluator,
- const float* positions,
- const int start_vertex_index, const int num_vertices) {
- evaluator->internal->eval_output->setCoarsePositions(positions,
- start_vertex_index,
- num_vertices);
+void setCoarsePositions(OpenSubdiv_Evaluator *evaluator,
+ const float *positions,
+ const int start_vertex_index,
+ const int num_vertices)
+{
+ evaluator->internal->eval_output->setCoarsePositions(
+ positions, start_vertex_index, num_vertices);
}
-void setVaryingData(OpenSubdiv_Evaluator* evaluator,
- const float* varying_data,
- const int start_vertex_index, const int num_vertices) {
- evaluator->internal->eval_output->setVaryingData(varying_data,
- start_vertex_index,
- num_vertices);
+void setVaryingData(OpenSubdiv_Evaluator *evaluator,
+ const float *varying_data,
+ const int start_vertex_index,
+ const int num_vertices)
+{
+ evaluator->internal->eval_output->setVaryingData(varying_data, start_vertex_index, num_vertices);
}
-void setFaceVaryingData(OpenSubdiv_Evaluator* evaluator,
+void setFaceVaryingData(OpenSubdiv_Evaluator *evaluator,
const int face_varying_channel,
- const float* face_varying_data,
- const int start_vertex_index, const int num_vertices) {
- evaluator->internal->eval_output->setFaceVaryingData(face_varying_channel,
- face_varying_data,
- start_vertex_index,
- num_vertices);
+ const float *face_varying_data,
+ const int start_vertex_index,
+ const int num_vertices)
+{
+ evaluator->internal->eval_output->setFaceVaryingData(
+ face_varying_channel, face_varying_data, start_vertex_index, num_vertices);
}
-void setCoarsePositionsFromBuffer(OpenSubdiv_Evaluator* evaluator,
- const void* buffer,
+void setCoarsePositionsFromBuffer(OpenSubdiv_Evaluator *evaluator,
+ const void *buffer,
const int start_offset,
const int stride,
const int start_vertex_index,
- const int num_vertices) {
+ const int num_vertices)
+{
evaluator->internal->eval_output->setCoarsePositionsFromBuffer(
- buffer,
- start_offset,
- stride,
- start_vertex_index,
- num_vertices);
+ buffer, start_offset, stride, start_vertex_index, num_vertices);
}
-void setVaryingDataFromBuffer(OpenSubdiv_Evaluator* evaluator,
- const void* buffer,
+void setVaryingDataFromBuffer(OpenSubdiv_Evaluator *evaluator,
+ const void *buffer,
const int start_offset,
const int stride,
const int start_vertex_index,
- const int num_vertices) {
+ const int num_vertices)
+{
evaluator->internal->eval_output->setVaryingDataFromBuffer(
- buffer,
- start_offset,
- stride,
- start_vertex_index,
- num_vertices);
+ buffer, start_offset, stride, start_vertex_index, num_vertices);
}
-void setFaceVaryingDataFromBuffer(OpenSubdiv_Evaluator* evaluator,
+void setFaceVaryingDataFromBuffer(OpenSubdiv_Evaluator *evaluator,
const int face_varying_channel,
- const void* buffer,
+ const void *buffer,
const int start_offset,
const int stride,
const int start_vertex_index,
- const int num_vertices) {
+ const int num_vertices)
+{
evaluator->internal->eval_output->setFaceVaryingDataFromBuffer(
- face_varying_channel,
- buffer,
- start_offset,
- stride,
- start_vertex_index,
- num_vertices);
+ face_varying_channel, buffer, start_offset, stride, start_vertex_index, num_vertices);
}
-void refine(OpenSubdiv_Evaluator* evaluator) {
+void refine(OpenSubdiv_Evaluator *evaluator)
+{
evaluator->internal->eval_output->refine();
}
-void evaluateLimit(OpenSubdiv_Evaluator* evaluator,
+void evaluateLimit(OpenSubdiv_Evaluator *evaluator,
const int ptex_face_index,
- const float face_u, const float face_v,
- float P[3], float dPdu[3], float dPdv[3]) {
- evaluator->internal->eval_output->evaluateLimit(ptex_face_index,
- face_u, face_v,
- P, dPdu, dPdv);
+ const float face_u,
+ const float face_v,
+ float P[3],
+ float dPdu[3],
+ float dPdv[3])
+{
+ evaluator->internal->eval_output->evaluateLimit(ptex_face_index, face_u, face_v, P, dPdu, dPdv);
}
-void evaluateLimit2(OpenSubdiv_Evaluator* evaluator,
- const int ptex_face_index,
- const float face_u, const float face_v,
- float P[3],
- float dPdu[3],
- float dPdv[3],
- float dPduu[3],
- float dPduv[3],
- float dPdvv[3]) {
- evaluator->internal->eval_output->evaluateLimit2(ptex_face_index,
- face_u, face_v,
- P, dPdu, dPdv,
- dPduu, dPduv, dPdvv);
+void evaluateLimit2(OpenSubdiv_Evaluator *evaluator,
+ const int ptex_face_index,
+ const float face_u,
+ const float face_v,
+ float P[3],
+ float dPdu[3],
+ float dPdv[3],
+ float dPduu[3],
+ float dPduv[3],
+ float dPdvv[3])
+{
+ evaluator->internal->eval_output->evaluateLimit2(
+ ptex_face_index, face_u, face_v, P, dPdu, dPdv, dPduu, dPduv, dPdvv);
}
-void evaluateVarying(OpenSubdiv_Evaluator* evaluator,
+void evaluateVarying(OpenSubdiv_Evaluator *evaluator,
const int ptex_face_index,
- float face_u, float face_v,
- float varying[3]) {
- evaluator->internal->eval_output->evaluateVarying(ptex_face_index,
- face_u, face_v,
- varying);
+ float face_u,
+ float face_v,
+ float varying[3])
+{
+ evaluator->internal->eval_output->evaluateVarying(ptex_face_index, face_u, face_v, varying);
}
-void evaluateFaceVarying(OpenSubdiv_Evaluator* evaluator,
+void evaluateFaceVarying(OpenSubdiv_Evaluator *evaluator,
const int face_varying_channel,
const int ptex_face_index,
- float face_u, float face_v,
- float face_varying[2]) {
+ float face_u,
+ float face_v,
+ float face_varying[2])
+{
evaluator->internal->eval_output->evaluateFaceVarying(
face_varying_channel, ptex_face_index, face_u, face_v, face_varying);
}
-void assignFunctionPointers(OpenSubdiv_Evaluator* evaluator) {
+void assignFunctionPointers(OpenSubdiv_Evaluator *evaluator)
+{
evaluator->setCoarsePositions = setCoarsePositions;
evaluator->setVaryingData = setVaryingData;
evaluator->setFaceVaryingData = setFaceVaryingData;
@@ -160,15 +157,17 @@ void assignFunctionPointers(OpenSubdiv_Evaluator* evaluator) {
} // namespace
-OpenSubdiv_Evaluator* openSubdiv_createEvaluatorFromTopologyRefiner(
- OpenSubdiv_TopologyRefiner* topology_refiner) {
- OpenSubdiv_Evaluator* evaluator = OBJECT_GUARDED_NEW(OpenSubdiv_Evaluator);
+OpenSubdiv_Evaluator *openSubdiv_createEvaluatorFromTopologyRefiner(
+ OpenSubdiv_TopologyRefiner *topology_refiner)
+{
+ OpenSubdiv_Evaluator *evaluator = OBJECT_GUARDED_NEW(OpenSubdiv_Evaluator);
assignFunctionPointers(evaluator);
evaluator->internal = openSubdiv_createEvaluatorInternal(topology_refiner);
return evaluator;
}
-void openSubdiv_deleteEvaluator(OpenSubdiv_Evaluator* evaluator) {
+void openSubdiv_deleteEvaluator(OpenSubdiv_Evaluator *evaluator)
+{
openSubdiv_deleteEvaluatorInternal(evaluator->internal);
OBJECT_GUARDED_DELETE(evaluator, OpenSubdiv_Evaluator);
}
diff --git a/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc b/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc
index 810ec4a8f91..8104d6a29c5 100644
--- a/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc
+++ b/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc
@@ -42,17 +42,17 @@
#include "internal/opensubdiv_util.h"
#include "opensubdiv_topology_refiner_capi.h"
-using OpenSubdiv::Osd::BufferDescriptor;
-using OpenSubdiv::Osd::CpuEvaluator;
-using OpenSubdiv::Osd::CpuPatchTable;
-using OpenSubdiv::Osd::CpuVertexBuffer;
-using OpenSubdiv::Osd::PatchCoord;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list