[Bf-blender-cvs] [2abfcebb0eb] master: Cleanup: use C comments for descriptive text
Campbell Barton
noreply at git.blender.org
Sat Oct 10 13:08:07 CEST 2020
Commit: 2abfcebb0eb7989e3d1e7d03f37ecf5c088210af
Author: Campbell Barton
Date: Sat Oct 10 18:19:55 2020 +1100
Branches: master
https://developer.blender.org/rB2abfcebb0eb7989e3d1e7d03f37ecf5c088210af
Cleanup: use C comments for descriptive text
Follow our code style guide by using C-comments for text descriptions.
===================================================================
M intern/dualcon/intern/octree.h
M source/blender/blenkernel/BKE_addon.h
M source/blender/blenkernel/BKE_collision.h
M source/blender/blenkernel/BKE_scene.h
M source/blender/blenkernel/BKE_softbody.h
M source/blender/blenkernel/intern/CCGSubSurf.c
M source/blender/blenkernel/intern/CCGSubSurf_legacy.c
M source/blender/blenkernel/intern/CCGSubSurf_util.c
M source/blender/blenkernel/intern/action.c
M source/blender/blenkernel/intern/anim_data.c
M source/blender/blenkernel/intern/armature_test.cc
M source/blender/blenkernel/intern/blender_undo.c
M source/blender/blenkernel/intern/cloth.c
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/fcurve.c
M source/blender/blenkernel/intern/fcurve_test.cc
M source/blender/blenkernel/intern/fluid.c
M source/blender/blenkernel/intern/fmodifier.c
M source/blender/blenkernel/intern/icons.c
M source/blender/blenkernel/intern/idprop.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/ipo.c
M source/blender/blenkernel/intern/key.c
M source/blender/blenkernel/intern/layer.c
M source/blender/blenkernel/intern/linestyle.c
M source/blender/blenkernel/intern/material.c
M source/blender/blenkernel/intern/mesh_convert.c
M source/blender/blenkernel/intern/mesh_merge.c
M source/blender/blenkernel/intern/mesh_validate.c
M source/blender/blenkernel/intern/object_update.c
M source/blender/blenkernel/intern/outliner_treehash.c
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/particle_system.c
M source/blender/blenkernel/intern/pointcache.c
M source/blender/blenkernel/intern/rigidbody.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/shrinkwrap.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenkernel/intern/sound.c
M source/blender/blenkernel/intern/text.c
M source/blender/blenkernel/intern/texture.c
M source/blender/blenkernel/intern/world.c
M source/blender/blenkernel/intern/writeffmpeg.c
M source/blender/blenlib/intern/BLI_filelist.c
M source/blender/blenlib/intern/fileops.c
M source/blender/blenlib/intern/math_color.c
M source/blender/blenlib/intern/path_util.c
M source/blender/blenlib/intern/system_win32.c
M source/blender/blenlib/tests/BLI_path_util_test.cc
M source/blender/blenlib/tests/BLI_string_test.cc
M source/blender/blenlib/tests/BLI_string_utf8_test.cc
M source/blender/blenloader/intern/blend_validate.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_250.c
M source/blender/blenloader/intern/versioning_260.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/blenloader/intern/versioning_legacy.c
M source/blender/blenloader/intern/writefile.c
M source/blender/bmesh/operators/bmo_edgenet.c
M source/blender/bmesh/tools/bmesh_intersect.c
M source/blender/compositor/intern/COM_ExecutionGroup.cpp
M source/blender/compositor/nodes/COM_AlphaOverNode.cpp
M source/blender/compositor/nodes/COM_MixNode.cpp
M source/blender/compositor/nodes/COM_ZCombineNode.cpp
M source/blender/depsgraph/intern/debug/deg_debug_stats_gnuplot.cc
M source/blender/depsgraph/intern/depsgraph_query.cc
M source/blender/depsgraph/intern/depsgraph_type.cc
M source/blender/depsgraph/intern/node/deg_node_operation.h
M source/blender/draw/engines/overlay/shaders/edit_uv_verts_frag.glsl
M source/blender/draw/engines/overlay/shaders/edit_uv_verts_vert.glsl
M source/blender/draw/engines/workbench/shaders/workbench_effect_dof_frag.glsl
M source/blender/draw/intern/shaders/common_fxaa_lib.glsl
M source/blender/editors/animation/anim_channels_defines.c
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/animation/anim_deps.c
M source/blender/editors/animation/anim_draw.c
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/animation/anim_markers.c
M source/blender/editors/animation/drivers.c
M source/blender/editors/animation/fmodifier_ui.c
M source/blender/editors/animation/keyframes_draw.c
M source/blender/editors/animation/keyframes_edit.c
M source/blender/editors/animation/keyframes_general.c
M source/blender/editors/animation/keyframing.c
M source/blender/editors/animation/keyingsets.c
M source/blender/editors/armature/armature_add.c
M source/blender/editors/armature/armature_relations.c
M source/blender/editors/armature/meshlaplacian.c
M source/blender/editors/armature/pose_edit.c
M source/blender/editors/armature/pose_lib.c
M source/blender/editors/armature/pose_select.c
M source/blender/editors/armature/pose_slide.c
M source/blender/editors/armature/pose_transform.c
M source/blender/editors/armature/pose_utils.c
M source/blender/editors/curve/editcurve.c
M source/blender/editors/curve/editcurve_add.c
M source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c
M source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c
M source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c
M source/blender/editors/gpencil/annotate_draw.c
M source/blender/editors/gpencil/editaction_gpencil.c
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/gpencil/gpencil_fill.c
M source/blender/editors/gpencil/gpencil_sculpt_paint.c
M source/blender/editors/gpencil/gpencil_utils.c
M source/blender/editors/include/ED_anim_api.h
M source/blender/editors/include/UI_icons.h
M source/blender/editors/include/UI_resources.h
M source/blender/editors/interface/interface.c
M source/blender/editors/interface/interface_draw.c
M source/blender/editors/interface/interface_eyedropper_driver.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_icons.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/interface/view2d.c
M source/blender/editors/interface/view2d_ops.c
M source/blender/editors/io/io_collada.c
M source/blender/editors/mesh/editface.c
M source/blender/editors/mesh/editmesh_extrude.c
M source/blender/editors/mesh/editmesh_loopcut.c
M source/blender/editors/object/object_add.c
M source/blender/editors/object/object_constraint.c
M source/blender/editors/object/object_edit.c
M source/blender/editors/object/object_remesh.c
M source/blender/editors/object/object_select.c
M source/blender/editors/object/object_shapekey.c
M source/blender/editors/object/object_transform.c
M source/blender/editors/physics/particle_edit.c
M source/blender/editors/physics/physics_fluid.c
M source/blender/editors/physics/physics_ops.c
M source/blender/editors/physics/rigidbody_object.c
M source/blender/editors/physics/rigidbody_world.c
M source/blender/editors/render/render_internal.c
M source/blender/editors/render/render_opengl.c
M source/blender/editors/render/render_ops.c
M source/blender/editors/render/render_preview.c
M source/blender/editors/render/render_shading.c
M source/blender/editors/render/render_update.c
M source/blender/editors/screen/screen_geometry.c
M source/blender/editors/sculpt_paint/paint_image.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/sculpt_paint/paint_ops.c
M source/blender/editors/sculpt_paint/sculpt_undo.c
M source/blender/editors/sound/sound_ops.c
M source/blender/editors/space_action/action_buttons.c
M source/blender/editors/space_action/action_data.c
M source/blender/editors/space_action/action_edit.c
M source/blender/editors/space_action/action_select.c
M source/blender/editors/space_action/space_action.c
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/editors/space_buttons/buttons_texture.c
M source/blender/editors/space_clip/clip_dopesheet_ops.c
M source/blender/editors/space_clip/clip_draw.c
M source/blender/editors/space_clip/clip_editor.c
M source/blender/editors/space_clip/clip_graph_draw.c
M source/blender/editors/space_clip/clip_graph_ops.c
M source/blender/editors/space_clip/clip_ops.c
M source/blender/editors/space_clip/clip_utils.c
M source/blender/editors/space_clip/tracking_ops_track.c
M source/blender/editors/space_clip/tracking_ops_utils.c
M source/blender/editors/space_console/console_ops.c
M source/blender/editors/space_console/space_console.c
M source/blender/editors/space_file/file_draw.c
M source/blender/editors/space_file/file_ops.c
M source/blender/editors/space_file/filelist.c
M source/blender/editors/space_file/space_file.c
M source/blender/editors/space_graph/graph_buttons.c
M source/blender/editors/space_graph/graph_edit.c
M source/blender/editors/space_graph/graph_ops.c
M source/blender/editors/space_graph/graph_select.c
M source/blender/editors/space_graph/graph_utils.c
M source/blender/editors/space_graph/space_graph.c
M source/blender/editors/space_image/image_buttons.c
M source/blender/editors/space_image/space_image.c
M source/blender/editors/space_info/info_ops.c
M source/blender/editors/space_info/info_report.c
M source/blender/editors/space_nla/nla_buttons.c
M source/blender/editors/space_nla/nla_channels.c
M source/blender/editors/space_nla/nla_draw.c
M source/blender/editors/space_nla/nla_edit.c
M source/blender/editors/space_nla/nla_select.c
M source/blender/editors/space_nla/space_nla.c
M source/blender/editors/space_node/drawnode.c
M source/blender/editors/space_node/node_edit.c
M source/blender/editors/space_node/node_intern.h
M source/blender/editors/space_node/node_relationships.c
M source/blender/editors/space_node/node_view.c
M source/blender/editors/space_script/script_edit.c
M source/blender/editors/space_script/space_script.c
M source/blender/editors/space_sequencer/sequencer_add.c
M source/blender/editors/space_sequencer/sequencer_select.c
M source/blender/editors/space_text/text_draw.c
M source/blender/editors/space_text/text_header.c
M source/blender/editors/space_text/text_ops.c
M source/blender/editors/space_view3d/view3d_project.c
M source/blender/editors/space_view3d/view3d_select.c
M source/blender/editors/space_view3d/view3d_utils.c
M source/blender/editors/space_view3d/view3d_walk.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform_convert_action.c
M source/blender/editors/transform/transform_convert_armature.c
M source/blender/editors/transform/transform_convert_graph.c
M source/blender/editors/transform/transform_convert_mesh_edge.c
M source/blender/editors/transform/transform_convert_nla.c
M source/blender/editors/transform/transform_convert_object.c
M source/blender/editors/transform/transform_convert_sequencer.c
M source/blender/editors/transform/transform_data.h
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_gizmo_3d.c
M source/blender/editors/transform/transform_mode.c
M source/blender/editors/transform/transform_mode_bbone_resize.c
M source/blender/editors/transform/transform_mode_resize.c
M source/blender/editors/transform/transform_mode_rotate.c
M source/blender/editors/transform/transform_mode_shrink_fatten.c
M source/blender/editors/transform/transform_mode_timeslide.c
M source/blender/editors/transform/transform_mode_tosphere.c
M source/blender/editors/transform/transform_mode_trackball.c
M source/blender/editors/transform/transform_ops.c
M source/blender/editors/transform/transform_snap.c
M source/blender/editors/util/ed_util_imbuf.c
M source/blender/editors/uvedit/uvedit_parametrizer.h
M source/blender/gpu/shaders/gpu_shader_2D_edituvs_points_vert.glsl
M source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_aa_vert.glsl
M source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_outline_aa_vert.glsl
M source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_varying_color_outline_aa_vert.glsl
M source/blender/gpu/shaders/gpu_shader_3D_point_uniform_size_outline_aa_vert.glsl
M source/blender/gpu/shaders/gpu_shader_gpencil_stroke_geom.glsl
M source/blender/gpu/shaders/gpu_shader_point_uniform_color_aa_frag.glsl
M source/blender/gpu/shaders/gpu_shader_point_uniform_color_outline_aa_frag.glsl
M source/blender/gpu/shaders/gpu_shader_point_varying_color_outline_aa_frag.glsl
M source/blender/gpu/shaders/gpu_shader_point_varying_color_varying_outline_aa_frag.glsl
M source/blender/ikplugin/intern/iksolver_plugin.c
M source/blender/ikplugin/intern/itasc_plugin.cpp
M source/blender/imbuf/intern/IMB_anim.h
M source/blender/imbuf/intern/anim_movie.c
M source/blender/imbuf/intern/cineon/logImageCore.c
M source/blender/imbuf/intern/dds/BlockDXT.cpp
M source/blender/imbuf/intern/dds/BlockDXT.h
M source/blender/imbuf/intern/dds/Color.h
M source/blender/imbuf/intern/dds/ColorBlock.cpp
M source/blender/imbuf/intern/dds/ColorBlock.h
M source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
M source/blender/imbuf/intern/dds/DirectDrawSurface.h
M source/blender/imbuf/intern/dds/FlipDXT.cpp
M source/blender/imbuf/intern/dds/Image.cpp
M source/blender/imbuf/intern/dds/Image.h
M source/blender/imbuf/intern/dds/PixelFormat.h
M source/blender/imbuf/intern/dds/Stream.cpp
M source/blender/imbuf/intern/dds/Stream.h
M source/blender/imbuf/intern/dds/dds_api.cpp
M source/blender/imbuf/intern/oiio/openimageio_api.cpp
M source/blender/imbuf/intern/openexr/openexr_api.cpp
M source/blender/imbuf/intern/openexr/openexr_multi.h
M source/blender/imbuf/intern/scaling.c
M source/blender/io/alembic/exporter/abc_archive.cc
M source/blender/io/alembic/exporter/abc_export_capi.cc
M source/blender/io/alembic/exporter/abc_writer_transform.cc
M source/blender/io/alembic/intern/abc_reader_mesh.cc
M source/blender/io/alembic/tests/abc_export_test.cc
M source/blender/io/alembic/tests/abc_matrix_test.cc
M source/blender/io/collada/AnimationExporter.h
M source/blender/io/collada/AnimationImporter.h
M source/blender/io/collada/ArmatureExporter.cpp
M source/blender/io/collada/ArmatureExporter.h
M source/blender/io/collada/ArmatureImporter.cpp
M source/blender/io/collada/ArmatureImporter.h
M source/blender/io/collada/BCAnimationCurve.cpp
M source/blender/io/collada/BCAnimationCurve.h
M source/blender/io/collada/BCAnimationSampler.cpp
M source/blender/io/collada/BCAnimationSampler.h
M source/blender/io/collada/BCMath.cpp
M source/blender/io/collada/BCSampleData.h
M source/blender/io/collada/BlenderContext.cpp
M source/blender/io/collada/ControllerExporter.cpp
M source/blender/io/collada/ControllerExporter.h
M source/blender/io/collada/DocumentExporter.cpp
M source/blender/io/collada/DocumentImporter.cpp
M source/blender/io/collada/DocumentImporter.h
M source/blender/io/collada/EffectExporter.cpp
M source/blender/io/collada/ErrorHandler.h
M source/blender/io/collada/ExtraHandler.h
M source/blender/io/collada/GeometryExporter.cpp
M source/blender/io/collada/LightExporter.cpp
M source/blender/io/collada/MaterialExporter.cpp
M source/blender/io/collada/MaterialExporter.h
M source/blender/io/collada/Materials.cpp
M source/blender/io/collada/MeshImporter.cpp
M source/blender/io/collada/SkinInfo.h
M source/blender/io/collada/TransformReader.cpp
M source/blender/io/collada/TransformReader.h
M source/blender/io/collada/collada_internal.cpp
M source/blender/io/collada/collada_internal.h
M source/blender/io/common/IO_abstract_hierarchy_iterator.h
M source/blender/io/common/intern/abstract_hierarchy_iterator.cc
M source/blender/io/common/intern/abstract_hierarchy_iterator_test.cc
M source/blender/io/common/intern/object_identifier_test.cc
M source/blender/io/usd/intern/usd_capi.cc
M source/blender/io/usd/intern/usd_writer_abstract.cc
M source/blender/io/usd/intern/usd_writer_camera.cc
M source/blender/io/usd/intern/usd_writer_hair.cc
M source/blender/io/usd/intern/usd_writer_mesh.cc
M source/blender/io/usd/intern/usd_writer_transform.cc
M source/blender/makesdna/DNA_action_types.h
M source/blender/makesdna/DNA_anim_types.h
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesdna/DNA_object_types.h
M source/blender/makesdna/DNA_particle_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesdna/DNA_sequence_types.h
M source/blender/makesdna/DNA_texture_types.h
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesdna/intern/dna_genfile.c
M source/blender/makesrna/RNA_types.h
M source/blender/makesrna/intern/rna_fluid.c
M source/blender/makesrna/intern/rna_rigidbody.c
M source/blender/makesrna/intern/rna_sequencer_api.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/nodes/composite/nodes/node_composite_tonemap.c
M source/blender/python/BPY_extern.h
M source/blender/python/bmesh/bmesh_py_types_customdata.c
M source/blender/python/bmesh/bmesh_py_types_meshdata.c
M source/blender/python/generic/py_capi_utils.c
M source/blender/python/intern/bpy.c
M source/blender/python/intern/bpy_app_ffmpeg.c
M source/blender/python/intern/bpy_app_sdl.c
M source/blender/python/intern/bpy_driver.c
M source/blender/python/intern/bpy_interface.c
M source/blender/python/intern/bpy_rna.c
M source/blender/python/mathutils/mathutils.c
M source/blender/render/extern/include/RE_engine.h
M source/blender/simulation/intern/ConstrainedConjugateGradient.h
M source/blender/simulation/intern/SIM_mass_spring.cpp
M source/blender/simulation/intern/implicit_blender.c
M source/blender/simulation/intern/implicit_eigen.cpp
M source/blender/windowmanager/gizmo/intern/wm_gizmo.c
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_jobs.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blender/windowmanager/intern/wm_stereo.c
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/intern/dualcon/intern/octree.h b/intern/dualcon/intern/octree.h
index 004897950b3..f6527d27e23 100644
--- a/intern/dualcon/intern/octree.h
+++ b/intern/dualcon/intern/octree.h
@@ -38,10 +38,10 @@
*/
/* Global defines */
-// Uncomment to see debug information
+/* Uncomment to see debug information */
// #define IN_DEBUG_MODE
-// Uncomment to see more output messages during repair
+/* Uncomment to see more output messages during repair */
// #define IN_VERBOSE_MODE
/* Set scan convert params */
@@ -65,19 +65,19 @@ struct InternalNode {
/* Can have up to eight children */
Node *children[0];
- /// Test if child is leaf
+ /** Test if child is leaf */
int is_child_leaf(int index) const
{
return (child_is_leaf_bitfield >> index) & 1;
}
- /// If child index exists
+ /** If child index exists */
int has_child(int index) const
{
return (has_child_bitfield >> index) & 1;
}
- /// Get the pointer to child index
+ /** Get the pointer to child index */
Node *get_child(int count)
{
return children[count];
@@ -88,13 +88,13 @@ struct InternalNode {
return children[count];
}
- /// Get total number of children
+ /** Get total number of children */
int get_num_children() const
{
return numChildrenTable[has_child_bitfield];
}
- /// Get the count of children
+ /** Get the count of children */
int get_child_count(int index) const
{
return childrenCountTable[has_child_bitfield][index];
@@ -108,7 +108,7 @@ struct InternalNode {
return childrenCountTable[has_child_bitfield];
}
- /// Get all children
+ /** Get all children */
void fill_children(Node *children[8], int leaf[8])
{
int count = 0;
@@ -125,7 +125,7 @@ struct InternalNode {
}
}
- /// Sets the child pointer
+ /** Sets the child pointer */
void set_child(int count, Node *chd)
{
children[count] = chd;
@@ -195,22 +195,22 @@ extern const int dirEdge[3][4];
*/
struct PathElement {
- // Origin
+ /* Origin */
int pos[3];
- // link
+ /* link */
PathElement *next;
};
struct PathList {
- // Head
+ /* Head */
PathElement *head;
PathElement *tail;
- // Length of the list
+ /* Length of the list */
int length;
- // Next list
+ /* Next list */
PathList *next;
};
@@ -221,31 +221,31 @@ class Octree {
public:
/* Public members */
- /// Memory allocators
+ /** Memory allocators */
VirtualMemoryAllocator *alloc[9];
VirtualMemoryAllocator *leafalloc[4];
- /// Root node
+ /** Root node */
Node *root;
- /// Model reader
+ /** Model reader */
ModelReader *reader;
- /// Marching cubes table
+ /** Marching cubes table */
Cubes *cubes;
- /// Length of grid
+ /** Length of grid */
int dimen;
int mindimen, minshift;
- /// Maximum depth
+ /** Maximum depth */
int maxDepth;
- /// The lower corner of the bounding box and the size
+ /** The lower corner of the bounding box and the size */
float origin[3];
float range;
- /// Counting information
+ /** Counting information */
int nodeCount;
int nodeSpace;
int nodeCounts[9];
@@ -255,9 +255,9 @@ class Octree {
PathList *ringList;
int maxTrianglePerCell;
- int outType; // 0 for OFF, 1 for PLY, 2 for VOL
+ int outType; /* 0 for OFF, 1 for PLY, 2 for VOL */
- // For flood filling
+ /* For flood filling */
int use_flood_fill;
float thresh;
@@ -469,11 +469,11 @@ class Octree {
private:
/************ Operators for all nodes ************/
- /// Lookup table
+ /** Lookup table */
int numEdgeTable[8];
int edgeCountTable[8][3];
- /// Build up lookup table
+ /** Build up lookup table */
void buildTable()
{
for (int i = 0; i < 256; i++) {
@@ -550,13 +550,13 @@ class Octree {
printf("\n");
}
- /// Retrieve signs
+ /** Retrieve signs */
int getSign(const LeafNode *leaf, int index)
{
return ((leaf->signs >> index) & 1);
}
- /// Set sign
+ /** Set sign */
void setSign(LeafNode *leaf, int index)
{
leaf->signs |= (1 << index);
@@ -624,7 +624,7 @@ class Octree {
return (leaf->flood_fill >> eind) & 1;
}
- /// Generate signs at the corners from the edge parity
+ /** Generate signs at the corners from the edge parity */
void generateSigns(LeafNode *leaf, unsigned char table[], int start)
{
leaf->signs = table[leaf->edge_parity];
@@ -634,7 +634,7 @@ class Octree {
}
}
- /// Get edge parity
+ /** Get edge parity */
int getEdgeParity(const LeafNode *leaf, int index) const
{
assert(index >= 0 && index <= 11);
@@ -642,7 +642,7 @@ class Octree {
return (leaf->edge_parity >> index) & 1;
}
- /// Get edge parity on a face
+ /** Get edge parity on a face */
int getFaceParity(LeafNode *leaf, int index)
{
int a = getEdgeParity(leaf, faceMap[index][0]) + getEdgeParity(leaf, faceMap[index][1]) +
@@ -656,7 +656,7 @@ class Octree {
return a;
}
- /// Set edge parity
+ /** Set edge parity */
void flipEdge(LeafNode *leaf, int index)
{
assert(index >= 0 && index <= 11);
@@ -664,7 +664,7 @@ class Octree {
leaf->edge_parity ^= (1 << index);
}
- /// Set 1
+ /** Set 1 */
void setEdge(LeafNode *leaf, int index)
{
assert(index >= 0 && index <= 11);
@@ -672,7 +672,7 @@ class Octree {
leaf->edge_parity |= (1 << index);
}
- /// Set 0
+ /** Set 0 */
void resetEdge(LeafNode *leaf, int index)
{
assert(index >= 0 && index <= 11);
@@ -680,7 +680,7 @@ class Octree {
leaf->edge_parity &= ~(1 << index);
}
- /// Flipping with a new intersection offset
+ /** Flipping with a new intersection offset */
void createPrimalEdgesMask(LeafNode *leaf)
{
leaf->primary_edge_intersections = getPrimalEdgesMask2(leaf);
@@ -707,7 +707,7 @@ class Octree {
if ((index & 3) == 0) {
int ind = index / 4;
if (getEdgeParity(leaf, index) && !getStoredEdgesParity(leaf, ind)) {
- // Create a new node
+ /* Create a new node */
int num = getNumEdges(leaf) + 1;
setStoredEdgesParity(leaf, ind);
int count = getEdgeCount(leaf, ind);
@@ -739,14 +739,14 @@ class Octree {
return leaf;
}
- /// Update parent link
+ /** Update parent link */
void updateParent(InternalNode *node, int len, int st[3], LeafNode *leaf)
{
- // First, locate the parent
+ /* First, locate the parent */
int count;
InternalNode *parent = locateParent(node, len, st, count);
- // Update
+ /* Update */
parent->set_child(count, (Node *)leaf);
}
@@ -757,18 +757,18 @@ class Octree {
return;
}
- // First, locate the parent
+ /* First, locate the parent */
int count;
InternalNode *parent = locateParent(len, st, count);
- // UPdate
+ /* Update */
parent->set_child(count, (Node *)node);
}
- /// Find edge intersection on a given edge
+ /** Find edge intersection on a given edge */
int getEdgeIntersectionByIndex(int st[3], int index, float pt[3], int check) const
{
- // First, locat the leaf
+ /* First, locat the leaf */
const LeafNode *leaf;
if (check) {
leaf = locateLeafCheck(st);
@@ -791,7 +791,7 @@ class Octree {
}
}
- /// Retrieve number of edges intersected
+ /** Retrieve number of edges intersected */
int getPrimalEdgesMask(const LeafNode *leaf) const
{
return leaf->primary_edge_intersections;
@@ -803,7 +803,7 @@ class Octree {
((leaf->edge_parity & 0x100) >> 6));
}
- /// Get the count for a primary edge
+ /** Get the count for a primary edge */
int getEdgeCount(const LeafNode *leaf, int index) const
{
return edgeCountTable[getPrimalEdgesMask(leaf)][index];
@@ -818,7 +818,7 @@ class Octree {
return numEdgeTable[getPrimalEdgesMask2(leaf)];
}
- /// Set edge intersection
+ /** Set edge intersection */
void setEdgeOffset(LeafNode *leaf, float pt, int count)
{
float *pts = leaf->edge_intersections;
@@ -828,7 +828,7 @@ class Octree {
pts[EDGE_FLOATS * count + 3] = 0;
}
- /// Set multiple edge intersections
+ /** Set multiple edge intersections */
void setEdgeOffsets(LeafNode *leaf, float pt[3], int len)
{
float *pts = leaf->edge_intersections;
@@ -837,35 +837,35 @@ class Octree {
}
}
- /// Retrieve edge intersection
+ /** Retrieve edge intersection */
float getEdgeOffset(const LeafNode *leaf, int count) const
{
return leaf->edge_intersections[4 * count];
}
- /// Update method
+ /** Update method */
LeafNode *updateEdgeOffsets(LeafNode *leaf, int oldlen, int newlen, float offs[3])
{
- // First, create a new leaf node
+ /* First, create a new leaf node */
LeafNode *nleaf = createLeaf(newlen);
*nleaf = *leaf;
- // Next, fill in the offsets
+ /* Next, fill in the offsets */
setEdgeOffsets(nleaf, offs, newlen);
- // Finally, delete the old leaf
+ /* Finally, delete the old leaf */
removeLeaf(oldlen, leaf);
return nleaf;
}
- /// Set minimizer index
+ /** Set minimizer index */
void setMinimizerIndex(LeafNode *leaf, int index)
{
leaf->minimizer_index = index;
}
- /// Get minimizer index
+ /** Get minimizer index */
int getMinimizerIndex(LeafNode *leaf)
{
return leaf->minimizer_index;
@@ -890,7 +890,7 @@ class Octree {
}
}
- /// Set edge intersection
+ /** Set edge intersection */
void setEdgeOffsetNormal(LeafNode *leaf, float pt, float a, float b, float c, int count)
{
float *pts = leaf->edge_intersections;
@@ -909,7 +909,7 @@ class Octree {
return pts[4 * count];
}
- /// Set multiple edge intersections
+ /** Set multiple edge intersections */
void setEdgeOffsetsNormals(
LeafNode *leaf, const float pt[], const float a[], const float b[], const float c[], int len)
{
@@ -925,7 +925,7 @@ class Octree {
}
}
- /// Retrieve complete edge intersection
+ /** Retrieve complete edge intersection */
void getEdgeIntersectionByIndex(
const LeafNode *leaf, int index, int st[3], int len, float pt[3], float nm[3]) const
{
@@ -1168,25 +1168,25 @
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list