Changed images

.clang-format

@@ -1,13 +1,12 @@
 BasedOnStyle: Google
 
 # Language:        Cpp
-Standard:        Cpp11
+Standard: Cpp11
 
 AlignAfterOpenBracket: DontAlign
 AlignConsecutiveAssignments: true
 AlignConsecutiveDeclarations: true
 
-AllowShortCaseLabelsOnASingleLine: true
 AllowShortCaseLabelsOnASingleLine: true
 
 BreakConstructorInitializersBeforeComma: true

apps/CMakeLists.txt

@@ -1,7 +1,7 @@
 function(add_yapp name)
-  add_executable(${name}  ${name}.cpp)
-  set_target_properties(${name}  PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED YES)
-  target_include_directories(${name}  PRIVATE ${CMAKE_SOURCE_DIR}/libs)
+  add_executable(${name} ${name}.cpp)
+  set_target_properties(${name} PROPERTIES CXX_STANDARD 20 CXX_STANDARD_REQUIRED YES)
+  target_include_directories(${name} PRIVATE ${CMAKE_SOURCE_DIR}/libs)
   target_link_libraries(${name} PRIVATE yocto)
 endfunction()
 
@@ -16,6 +16,5 @@ add_yapp(yconverts)
 add_yapp(ysamples)
 
 if(YOCTO_CUDA)
-add_yapp(ycutrace)
+  add_yapp(ycutrace)
 endif()
-

apps/ycolorgrade.cpp

@@ -72,7 +72,7 @@ void run(const vector<string>& args) {
   // switch between interactive and offline
   if (!interactive) {
     // apply color grade
-    image = colorgrade_image(image, params);
+    image = colorgrade_image(image, true, params);
 
     // save image
     save_image(outname, image);
@@ -83,8 +83,8 @@ void run(const vector<string>& args) {
     auto params = colorgrade_params{};
 
     // display image
-    auto display = make_image(image.width, image.height, false);
-    colorgrade_image_mt(display, image, params);
+    auto display = image;
+    colorgrade_image(display, image, true, params);
 
     // opengl image
     auto glimage  = glimage_state{};
@@ -123,7 +123,7 @@ void run(const vector<string>& args) {
             "highlights color", params.highlights_color);
         end_gui_header();
         if (edited) {
-          colorgrade_image_mt(display, image, params);
+          colorgrade_image(display, image, true, params);
           set_image(glimage, display);
         }
       }

apps/yimalpha.cpp

@@ -60,25 +60,22 @@ void run(const vector<string>& args) {
   auto alpha = load_image(alphaname);
 
   // check sizes
-  if (image.width != alpha.width || image.height != alpha.height)
+  if (image.size() != alpha.size())
     throw io_error("different image sizes");
 
-  // check types
-  if (image.linear != alpha.linear) throw io_error("different image types");
-
   // edit alpha
-  auto out = make_image(image.width, image.height, image.linear);
-  for (auto idx : range(image.pixels.size())) {
-    auto calpha = alpha.pixels[idx];
+  auto out = image_t<vec4f>{image.size()};
+  for (auto idx : range(image.size())) {
+    auto calpha = alpha[idx];
     auto alpha_ = from_color   ? mean(xyz(calpha))
                   : from_black ? (mean(xyz(calpha)) > 0.01 ? 1.0f : 0.0f)
                                : calpha.w;
     if (to_color) {
-      out.pixels[idx] = {alpha_, alpha_, alpha_, alpha_};
+      out[idx] = {alpha_, alpha_, alpha_, alpha_};
     } else {
-      auto color      = image.pixels[idx];
+      auto color      = image[idx];
       color.w         = alpha_;
-      out.pixels[idx] = color;
+      out[idx] = color;
     }
   }
 

apps/yimdiff.cpp

@@ -57,11 +57,7 @@ void run(const vector<string>& args) {
   auto image2 = load_image(filename2);
 
   // check sizes
-  if (image1.width != image2.width || image1.height != image2.height)
-    throw io_error("different image sizes");
-
-  // check types
-  if (image1.linear != image2.linear) throw io_error("different image types");
+  if (image1.size() != image2.size()) throw io_error("different image sizes");
 
   // compute diff
   auto diff = image_difference(image1, image2, true);
@@ -71,7 +67,7 @@ void run(const vector<string>& args) {
 
   // check diff
   if (signal) {
-    for (auto& c : diff.pixels) {
+    for (auto& c : diff) {
       if (max(xyz(c)) > threshold) {
         throw std::runtime_error{"image content differ"};
       }

apps/ytonemap.cpp

@@ -59,17 +59,18 @@ void run(const vector<string>& args) {
   parse_cli(cli, args);
 
   // load
-  auto image = load_image(imagename);
+  auto image  = load_image(imagename, is_ldr_filename(imagename));
+  auto linear = is_hdr_filename(imagename);
 
   // resize if needed
   if (width != 0 || height != 0) {
-    image = resize_image(image, width, height);
+    image = resize_image(image, {width, height});
   }
 
   // switch between interactive and offline
   if (!interactive) {
     // tonemap if needed
-    if (image.linear && is_ldr_filename(outname)) {
+    if (linear && is_ldr_filename(outname)) {
       image = tonemap_image(image, exposure, filmic);
     }
 
@@ -78,10 +79,11 @@ void run(const vector<string>& args) {
   } else {
 #ifdef YOCTO_OPENGL
     // display image
-    auto  display  = make_image(image.width, image.height, false);
+    if (!linear) image = srgb_to_rgb(image);
+    auto  display  = image;
     float exposure = 0;
     bool  filmic   = false;
-    tonemap_image_mt(display, image, exposure, filmic);
+    tonemap_image(display, image, exposure, filmic);
 
     // opengl image
     auto glimage  = glimage_state{};
@@ -100,7 +102,7 @@ void run(const vector<string>& args) {
     };
     callbacks.widgets = [&](const gui_input& input) {
       if (draw_tonemap_widgets(input, exposure, filmic)) {
-        tonemap_image_mt(display, image, exposure, filmic);
+        tonemap_image(display, image, exposure, filmic);
         set_image(glimage, display);
       }
       draw_image_widgets(input, image, display, glparams);

apps/ytrace.cpp

@@ -108,7 +108,7 @@ void run(const vector<string>& args) {
 
   // add environment
   if (!envname.empty()) {
-    add_environment(scene, envname);
+    add_environment(scene, "environment", envname);
   }
 
   // camera
@@ -164,7 +164,7 @@ void run(const vector<string>& args) {
     auto context = make_trace_context(params);
 
     // init image
-    auto image = make_image(state.width, state.height, true);
+    auto image = image_t<vec4f>{state.render.size()};
 
     // opengl image
     auto glimage     = glimage_state{};
@@ -190,8 +190,8 @@ void run(const vector<string>& args) {
       // make sure we can start
       trace_cancel(context);
       state = make_trace_state(scene, params);
-      if (image.width != state.width || image.height != state.height)
-        image = make_image(state.width, state.height, true);
+      if (image.size() != state.render.size())
+        image = image_t<vec4f>{state.render.size()};
 
       // render preview
       trace_preview(image, context, state, scene, bvh, lights, params);

libs/yocto/yocto_cutrace.cpp

@@ -788,7 +788,7 @@ cutrace_bvh make_cutrace_bvh(cutrace_context& context,
     // compact
     auto compacted_size = download_buffer_value(compacted_size_buffer);
     sbvh.buffer         = make_buffer(
-                context.cuda_stream, compacted_size, (byte*)nullptr);
+        context.cuda_stream, compacted_size, (byte*)nullptr);
     check_result(optixAccelCompact(context.optix_context,
         /*cuda_stream:*/ 0, sbvh.handle, sbvh.buffer.device_ptr(),
         sbvh.buffer.size_in_bytes(), &sbvh.handle));
@@ -861,7 +861,7 @@ cutrace_bvh make_cutrace_bvh(cutrace_context& context,
     // compact
     auto compacted_size = download_buffer_value(compacted_size_buffer);
     ibvh.buffer         = make_buffer(
-                context.cuda_stream, compacted_size, (byte*)nullptr);
+        context.cuda_stream, compacted_size, (byte*)nullptr);
     check_result(optixAccelCompact(context.optix_context,
         /*cuda_stream:*/ 0, ibvh.handle, ibvh.buffer.device_ptr(),
         ibvh.buffer.size_in_bytes(), &ibvh.handle));
@@ -896,7 +896,7 @@ cutrace_state make_cutrace_state(cutrace_context& context,
   }
   state.samples = 0;
   state.image   = make_buffer(
-        context.cuda_stream, state.width * state.height, (vec4f*)nullptr);
+      context.cuda_stream, state.width * state.height, (vec4f*)nullptr);
   state.albedo = make_buffer(
       context.cuda_stream, state.width * state.height, (vec3f*)nullptr);
   state.normal = make_buffer(

libs/yocto/yocto_cutrace.h

@@ -192,8 +192,8 @@ struct cuspan {
   CUdeviceptr device_ptr() const { return _data; }
   size_t      size_in_bytes() const { return _size * sizeof(T); }
   void        swap(cuspan& other) {
-           std::swap(_data, other._data);
-           std::swap(_size, other._size);
+    std::swap(_data, other._data);
+    std::swap(_size, other._size);
   }
 
   CUdeviceptr _data = 0;