Applied: D16792

Reviewed-on: super_jo_nathan/blender-PLY-project#1

@@ -0,0 +11,4 @@
+#include "ply_export.hh"
+#include "ply_import.hh"
+
+void PLY_export(bContext *C, const struct PLYExportParams *export_params)

@@ -0,0 +9,4 @@
+
+namespace blender::io::ply {
+
+void write_vertices(std::unique_ptr<FileBuffer> &buffer, std::unique_ptr<PlyData> &plyData)

@@ -0,0 +40,4 @@
+  BMeshFromMeshParams bm_convert_params{};
+  bm_convert_params.calc_face_normal = true;
+  bm_convert_params.calc_vert_normal = true;
+  bm_convert_params.add_key_index = false;

@@ -0,0 +115,4 @@
+    const float2 *uv_map = static_cast<const float2 *>(
+        CustomData_get_layer(&mesh->ldata, CD_PROP_FLOAT2));
+
+    blender::Map<UV_vertex_key, int> vertex_map = generate_vertex_map(mesh, uv_map, export_params);

@@ -0,0 +123,4 @@
+    /* Load faces into plyData. */
+    int loop_offset = 0;
+    Span<MLoop> loops = mesh->loops();
+    for (auto &&poly : mesh->polys()) {

@@ -0,0 +185,4 @@
+      const StringRef name = mesh->active_color_attribute;
+      if (!name.is_empty()) {
+        const bke::AttributeAccessor attributes = mesh->attributes();
+        const VArray<ColorGeometry4f> colorAttribute =

@@ -0,0 +70,4 @@
+    /* In binary, there is no end to a vertex. */
+  }
+
+  void write_face(char size, Vector<uint32_t> const &vertex_indices) override

@@ -0,0 +188,4 @@
+  return (int)(it - header->properties[0].begin());
+}
+
+Vector<std::string> explode(const StringRef &str, const char &ch)

@@ -0,0 +6,4 @@
+
+#pragma once
+
+#include "BKE_mesh.h"

@@ -0,0 +6,4 @@
+
+#pragma once
+
+#include "BKE_mesh.h"

@@ -0,0 +25,4 @@
+  CustomData_add_layer_named(
+      &mesh->vdata, CD_PROP_FLOAT3, CD_CONSTRUCT, nullptr, mesh->totvert, "position");
+  MutableSpan<float3> verts = mesh->vert_positions_for_write();
+  verts.copy_from(data.vertices);

@@ -0,0 +83,4 @@
+
+  /* Uvmap */
+  if (!data.UV_coordinates.is_empty()) {
+    bke::SpanAttributeWriter<float2> Uv = attributes.lookup_or_add_for_write_only_span<float2>(

@@ -0,0 +105,4 @@
+
+    /* Below code is necessary to access vertex normals within Blender.
+     * Until Blender supports custom vertex normals, this is a workaround. */
+    bke::SpanAttributeWriter<float3> normals;

@@ -0,0 +117,4 @@
+      }
+    }
+    normals.finish();
+    BKE_mesh_set_custom_normals_from_verts(mesh, vertex_normals);

@@ -0,0 +20,4 @@
+  Vector<float4> vertex_colors;
+  Vector<std::pair<int, int>> edges;
+  Vector<float3> edge_colors;
+  Vector<Vector<uint32_t>> faces;

@@ -0,0 +97,4 @@
+                     BKE_object_get_pre_modified_mesh(&export_object_eval_);
+
+    bool force_triangulation = false;
+    for (auto &&poly : mesh->polys()) {

@@ -0,0 +174,4 @@
+      const Span<float3> vert_normals = mesh->vertex_normals();
+      for (int i = 0; i < vertex_map.size(); i++) {
+        mul_m3_v3(world_and_axes_normal_transform_,
+                  (float3)vert_normals[mesh_vertex_index_LUT[i]]);

@@ -0,0 +56,4 @@
+  {
+    write_fstring("{}", int(count));
+
+    for (auto &&v : vertex_indices) {

@@ -0,0 +74,4 @@
+  {
+    write_bytes(Span<char>({size}));
+
+    Span<char> dataSpan(reinterpret_cast<const char *>(vertex_indices.data()),

@@ -0,0 +90,4 @@
+
+  PlyHeader header;
+
+  while (true) {  // We break when end_header is encountered.

@@ -0,0 +141,4 @@
+    else if ((words[0][0] >= '0' && words[0][0] <= '9') || words[0][0] == '-' || line.empty() ||
+             infile.eof()) {
+      /* A value was found before we broke out of the loop. No end_header. */
+      fprintf(stderr, "PLY Importer: failed to read file. No end_header.\n");

@@ -0,0 +12,4 @@
+namespace blender::io::ply {
+std::unique_ptr<PlyData> import_ply_binary(std::ifstream &file, const PlyHeader *header)
+{
+  std::unique_ptr<PlyData> data = std::make_unique<PlyData>();

@@ -0,0 +34,4 @@
+
+template<typename T> T swap_bytes(T input)
+{
+  /* In big endian, the most-significant byte is first.

@@ -0,0 +44,4 @@
+    mesh->totpoly = int(data.faces.size());
+    mesh->totloop = 0;
+    for (int i = 0; i < data.faces.size(); i++) {
+      /* Add number of edges to the amount of edges. */

@@ -0,0 +87,4 @@
+    int counter = 0;
+    for (int i = 0; i < data.faces.size(); i++) {
+      for (int j = 0; j < data.faces[i].size(); j++) {
+        copy_v2_v2(uv_map.span[counter], data.UV_coordinates[data.faces[i][j]]);

@@ -0,0 +13,4 @@
+
+/**
+ * Converts the PlyData datastructure to a mesh.
+ * \param data The PLY data.

@@ -0,0 +17,4 @@
+ * Reads a line in the ply file in a line-ending safe manner. All different line endings are
+ * supported. This also supports a mix of different line endings in the same file. CR (\\r), LF
+ * (\\n), CR/LF (\\r\\n), LF/CR (\\n\\r).
+ * @param file The file stream.

@@ -0,0 +1,478 @@
+#include "testing/testing.h"

@@ -0,0 +2,4 @@
+#include "tests/blendfile_loading_base_test.h"
+
+#include "BKE_blender_version.h"
+#include "BKE_curve.h"

@@ -0,0 +1,261 @@
+#include "testing/testing.h"

@@ -0,0 +2,4 @@
+#include "tests/blendfile_loading_base_test.h"
+
+#include "BKE_attribute.hh"
+#include "BKE_curve.h"

@@ -0,0 +88,4 @@
+  uiItemR(sub, imfptr, "export_selected_objects", 0, IFACE_("Selected Only"), ICON_NONE);
+  uiItemR(sub, imfptr, "global_scale", 0, NULL, ICON_NONE);
+
+  row = uiLayoutRow(box, false);

@@ -0,0 +134,4 @@
+}
+
+/* Both forward and up axes cannot be along the same direction. */
+static void forward_axis_update(struct Main *UNUSED(main),

@@ -0,0 +49,4 @@
+    buffer = std::make_unique<FileBufferBinary>(export_params.filepath);
+  }
+
+  /* Generate and write header. */

@@ -0,0 +50,4 @@
+  return temp_mesh;
+}
+
+void set_world_axes_transform(Object *object, const eIOAxis forward, const eIOAxis up)

@@ -0,0 +20,4 @@
+/* SEP macro from BLI path utils clashes with SEP symbol in fmt headers. */
+#undef SEP
+#define FMT_HEADER_ONLY
+#include <fmt/format.h>

@@ -0,0 +22,4 @@
+#undef SEP
+#define FMT_HEADER_ONLY
+#include <bitset>
+#include <fmt/format.h>

@@ -0,0 +86,4 @@
+{
+
+  std::string line;
+  std::ifstream infile(import_params.filepath, std::ios::binary);

@@ -0,0 +175,4 @@
+        normal.z = read<float>(file, isBigEndian);
+      }
+      else if (name == "red") {
+        color.x = read<uint8_t>(file, isBigEndian) / 255.0f;

@@ -0,0 +218,4 @@
+  DEG_OBJECT_ITER_END;
+}
+
+blender::Map<UV_vertex_key, int> generate_vertex_map(const Mesh *mesh,

@@ -0,0 +223,4 @@
+                                                     const PLYExportParams &export_params)
+{
+
+  blender::Map<UV_vertex_key, int> vertex_map;

@@ -0,0 +52,4 @@
+{
+  write_bytes(Span<char>({size}));
+
+  Span<char> dataSpan(reinterpret_cast<const char *>(vertex_indices.data()),