From eabc10c758583eb3e4d92dfc6e3bb2461f5745e8 Mon Sep 17 00:00:00 2001 From: "georgiy.m.markelov@gmail.com" Date: Fri, 21 Jul 2023 12:00:36 +0300 Subject: [PATCH 1/6] Initial. Added depth --- scripts/modules/bpy_hydra.py | 4 ++++ source/blender/render/hydra/final_engine.cc | 14 +++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/scripts/modules/bpy_hydra.py b/scripts/modules/bpy_hydra.py index 649351288d58..0bfb8315bce7 100644 --- a/scripts/modules/bpy_hydra.py +++ b/scripts/modules/bpy_hydra.py @@ -141,6 +141,10 @@ class HydraRenderEngine(bpy.types.RenderEngine): _bpy_hydra.engine_view_draw(self.engine_ptr, depsgraph.as_pointer(), context.as_pointer()) + def update_render_passes(self, scene, render_layer): + if render_layer.use_pass_z: + self.register_pass(scene, render_layer, 'Depth', 1, 'Z', 'VALUE') + def export_mtlx(material): """ Exports material to .mtlx file. It is called from Blender source code. """ diff --git a/source/blender/render/hydra/final_engine.cc b/source/blender/render/hydra/final_engine.cc index ebc6d91c9218..ea2527ddbc06 100644 --- a/source/blender/render/hydra/final_engine.cc +++ b/source/blender/render/hydra/final_engine.cc @@ -23,10 +23,12 @@ void FinalEngine::render(Depsgraph *depsgraph) { prepare_for_render(depsgraph); render_task_delegate_->set_renderer_aov(pxr::HdAovTokens->color); + render_task_delegate_->set_renderer_aov(pxr::HdAovTokens->depth); engine_->Execute(render_index_.get(), &tasks_); - std::vector &pixels = render_images_["Combined"]; + std::vector &pixels_depth = render_images_["Depth"]; + std::vector &pixels_combined = render_images_["Combined"]; char elapsed_time[32]; double time_begin = PIL_check_seconds_timer(); float percent_done = 0.0; @@ -48,11 +50,13 @@ void FinalEngine::render(Depsgraph *depsgraph) break; } - render_task_delegate_->get_renderer_aov_data(pxr::HdAovTokens->color, pixels.data()); + render_task_delegate_->get_renderer_aov_data(pxr::HdAovTokens->color, pixels_combined.data()); + render_task_delegate_->get_renderer_aov_data(pxr::HdAovTokens->depth, pixels_depth.data()); update_render_result(); } - render_task_delegate_->get_renderer_aov_data(pxr::HdAovTokens->color, pixels.data()); + render_task_delegate_->get_renderer_aov_data(pxr::HdAovTokens->color, pixels_combined.data()); + render_task_delegate_->get_renderer_aov_data(pxr::HdAovTokens->depth, pixels_depth.data()); update_render_result(); } @@ -116,6 +120,10 @@ void FinalEngine::prepare_for_render(Depsgraph *depsgraph) render_images_.emplace( "Combined", std::vector(resolution_[0] * resolution_[1] * 4)); /* 4 - number of channels. */ + + render_images_.emplace( + "Depth", + std::vector(resolution_[0] * resolution_[1] * 1)); /* 1 - number of channels. */ } void FinalEngineGPU::render(Depsgraph *depsgraph) -- 2.30.2 From 1f8c6572e5ede0a6a2ce9664d78ced23fda1b528 Mon Sep 17 00:00:00 2001 From: "georgiy.m.markelov@gmail.com" Date: Fri, 21 Jul 2023 15:08:23 +0300 Subject: [PATCH 2/6] added aovs_map_ and use_pass_normal --- scripts/modules/bpy_hydra.py | 2 ++ source/blender/render/hydra/final_engine.cc | 39 ++++++++++++--------- source/blender/render/hydra/final_engine.h | 1 + 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/scripts/modules/bpy_hydra.py b/scripts/modules/bpy_hydra.py index 0bfb8315bce7..760b1bad51b6 100644 --- a/scripts/modules/bpy_hydra.py +++ b/scripts/modules/bpy_hydra.py @@ -144,6 +144,8 @@ class HydraRenderEngine(bpy.types.RenderEngine): def update_render_passes(self, scene, render_layer): if render_layer.use_pass_z: self.register_pass(scene, render_layer, 'Depth', 1, 'Z', 'VALUE') + if render_layer.use_pass_normal: + self.register_pass(scene, render_layer, 'Normal', 3, 'XYZ', 'VECTOR') def export_mtlx(material): diff --git a/source/blender/render/hydra/final_engine.cc b/source/blender/render/hydra/final_engine.cc index ea2527ddbc06..4e71e747b0e7 100644 --- a/source/blender/render/hydra/final_engine.cc +++ b/source/blender/render/hydra/final_engine.cc @@ -11,7 +11,7 @@ #include "GPU_framebuffer.h" #include "GPU_texture.h" #include "PIL_time.h" - +#include "BLI_map.hh" #include "IMB_imbuf_types.h" #include "camera.h" @@ -22,13 +22,13 @@ namespace blender::render::hydra { void FinalEngine::render(Depsgraph *depsgraph) { prepare_for_render(depsgraph); - render_task_delegate_->set_renderer_aov(pxr::HdAovTokens->color); - render_task_delegate_->set_renderer_aov(pxr::HdAovTokens->depth); + for (auto &it : render_images_) { + render_task_delegate_->set_renderer_aov(aovs_map_.lookup(it.first)); + } + engine_->Execute(render_index_.get(), &tasks_); - std::vector &pixels_depth = render_images_["Depth"]; - std::vector &pixels_combined = render_images_["Combined"]; char elapsed_time[32]; double time_begin = PIL_check_seconds_timer(); float percent_done = 0.0; @@ -49,14 +49,14 @@ void FinalEngine::render(Depsgraph *depsgraph) if (render_task_delegate_->is_converged()) { break; } - - render_task_delegate_->get_renderer_aov_data(pxr::HdAovTokens->color, pixels_combined.data()); - render_task_delegate_->get_renderer_aov_data(pxr::HdAovTokens->depth, pixels_depth.data()); + for (auto &it : render_images_) { + render_task_delegate_->get_renderer_aov_data(aovs_map_.lookup(it.first), it.second.data()); + } update_render_result(); } - - render_task_delegate_->get_renderer_aov_data(pxr::HdAovTokens->color, pixels_combined.data()); - render_task_delegate_->get_renderer_aov_data(pxr::HdAovTokens->depth, pixels_depth.data()); + for (auto &it : render_images_) { + render_task_delegate_->get_renderer_aov_data(aovs_map_.lookup(it.first), it.second.data()); + } update_render_result(); } @@ -117,13 +117,18 @@ void FinalEngine::prepare_for_render(Depsgraph *depsgraph) } tasks_.push_back(render_task_delegate_->get_task()); - render_images_.emplace( - "Combined", - std::vector(resolution_[0] * resolution_[1] * 4)); /* 4 - number of channels. */ + aovs_map_.add_new("Combined", pxr::HdAovTokens->color); + aovs_map_.add_new("Depth", pxr::HdAovTokens->depth); + aovs_map_.add_new("Normal", pxr::HdAovTokens->normal); - render_images_.emplace( - "Depth", - std::vector(resolution_[0] * resolution_[1] * 1)); /* 1 - number of channels. */ + RenderResult *result = RE_engine_get_result(bl_engine_); + RenderLayer *layer = (RenderLayer *)result->layers.first; + for (RenderPass *pass = (RenderPass *)layer->passes.first; pass != nullptr; pass = pass->next) { + if (aovs_map_.lookup_key_ptr(pass->name)) { + render_images_.emplace(pass->name, + std::vector(pass->rectx * pass->recty * pass->channels)); + } + } } void FinalEngineGPU::render(Depsgraph *depsgraph) diff --git a/source/blender/render/hydra/final_engine.h b/source/blender/render/hydra/final_engine.h index 2ab44bbadaa5..5ef78693d2a5 100644 --- a/source/blender/render/hydra/final_engine.h +++ b/source/blender/render/hydra/final_engine.h @@ -24,6 +24,7 @@ class FinalEngine : public Engine { std::string layer_name_; std::map> render_images_; pxr::GfVec2i resolution_; + Map aovs_map_; }; class FinalEngineGPU : public FinalEngine { -- 2.30.2 From e126a467dd7bc4019c5f1889ac04187bf4930a52 Mon Sep 17 00:00:00 2001 From: "georgiy.m.markelov@gmail.com" Date: Fri, 21 Jul 2023 18:57:15 +0300 Subject: [PATCH 3/6] added Position AOV --- source/blender/render/hydra/final_engine.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/source/blender/render/hydra/final_engine.cc b/source/blender/render/hydra/final_engine.cc index 4e71e747b0e7..4b1abd0dc856 100644 --- a/source/blender/render/hydra/final_engine.cc +++ b/source/blender/render/hydra/final_engine.cc @@ -17,6 +17,10 @@ #include "camera.h" #include "final_engine.h" +PXR_NAMESPACE_OPEN_SCOPE +TF_DEFINE_PRIVATE_TOKENS(tokens_, (worldCoordinate)); +PXR_NAMESPACE_CLOSE_SCOPE + namespace blender::render::hydra { void FinalEngine::render(Depsgraph *depsgraph) @@ -120,13 +124,13 @@ void FinalEngine::prepare_for_render(Depsgraph *depsgraph) aovs_map_.add_new("Combined", pxr::HdAovTokens->color); aovs_map_.add_new("Depth", pxr::HdAovTokens->depth); aovs_map_.add_new("Normal", pxr::HdAovTokens->normal); + aovs_map_.add_new("Position", pxr::tokens_->worldCoordinate); RenderResult *result = RE_engine_get_result(bl_engine_); RenderLayer *layer = (RenderLayer *)result->layers.first; for (RenderPass *pass = (RenderPass *)layer->passes.first; pass != nullptr; pass = pass->next) { if (aovs_map_.lookup_key_ptr(pass->name)) { - render_images_.emplace(pass->name, - std::vector(pass->rectx * pass->recty * pass->channels)); + render_images_.emplace(pass->name, std::vector(pass->rectx * pass->recty * pass->channels)); } } } -- 2.30.2 From 1028a348916bf38f4932b7950ecd0bf739a7f03d Mon Sep 17 00:00:00 2001 From: "georgiy.m.markelov@gmail.com" Date: Fri, 21 Jul 2023 19:02:09 +0300 Subject: [PATCH 4/6] Added Position AOV to python code --- scripts/modules/bpy_hydra.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/modules/bpy_hydra.py b/scripts/modules/bpy_hydra.py index 760b1bad51b6..5d275329fb0d 100644 --- a/scripts/modules/bpy_hydra.py +++ b/scripts/modules/bpy_hydra.py @@ -146,6 +146,8 @@ class HydraRenderEngine(bpy.types.RenderEngine): self.register_pass(scene, render_layer, 'Depth', 1, 'Z', 'VALUE') if render_layer.use_pass_normal: self.register_pass(scene, render_layer, 'Normal', 3, 'XYZ', 'VECTOR') + if render_layer.use_pass_position: + self.register_pass(scene, render_layer, 'Position', 4, 'XYZA', 'VECTOR') def export_mtlx(material): -- 2.30.2 From 1dfe4dd90f46765759c49fab1da9cc1376222893 Mon Sep 17 00:00:00 2001 From: "georgiy.m.markelov@gmail.com" Date: Fri, 21 Jul 2023 19:14:04 +0300 Subject: [PATCH 5/6] made def update_render_passes empty for base class --- scripts/modules/bpy_hydra.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/modules/bpy_hydra.py b/scripts/modules/bpy_hydra.py index 5d275329fb0d..83684f4dd233 100644 --- a/scripts/modules/bpy_hydra.py +++ b/scripts/modules/bpy_hydra.py @@ -31,6 +31,10 @@ class CustomHydraRenderEngine(HydraRenderEngine): 'enableTinyPrimCulling': True, 'maxLights': 8, } + + def update_render_passes(self, scene, render_layer): + if render_layer.use_pass_z: + self.register_pass(scene, render_layer, 'Depth', 1, 'Z', 'VALUE') ``` """ @@ -142,12 +146,8 @@ class HydraRenderEngine(bpy.types.RenderEngine): _bpy_hydra.engine_view_draw(self.engine_ptr, depsgraph.as_pointer(), context.as_pointer()) def update_render_passes(self, scene, render_layer): - if render_layer.use_pass_z: - self.register_pass(scene, render_layer, 'Depth', 1, 'Z', 'VALUE') - if render_layer.use_pass_normal: - self.register_pass(scene, render_layer, 'Normal', 3, 'XYZ', 'VECTOR') - if render_layer.use_pass_position: - self.register_pass(scene, render_layer, 'Position', 4, 'XYZA', 'VECTOR') + """ Register supported AOVs for render. Must be overridden in child classes. """ + pass def export_mtlx(material): -- 2.30.2 From 22a8bbc185766da2ea889bf8ba187617c181c35b Mon Sep 17 00:00:00 2001 From: "georgiy.m.markelov@gmail.com" Date: Mon, 24 Jul 2023 14:43:43 +0300 Subject: [PATCH 6/6] added depth aov for HdStorm (draft) --- source/blender/render/hydra/final_engine.cc | 52 ++++++++++++++----- .../render/hydra/render_task_delegate.cc | 41 +++++++++------ .../render/hydra/render_task_delegate.h | 7 ++- .../blender/render/hydra/viewport_engine.cc | 6 ++- 4 files changed, 73 insertions(+), 33 deletions(-) diff --git a/source/blender/render/hydra/final_engine.cc b/source/blender/render/hydra/final_engine.cc index 4b1abd0dc856..6e3c11376562 100644 --- a/source/blender/render/hydra/final_engine.cc +++ b/source/blender/render/hydra/final_engine.cc @@ -119,12 +119,17 @@ void FinalEngine::prepare_for_render(Depsgraph *depsgraph) free_camera_delegate_->GetCameraId(), pxr::GfVec4d(0, 0, resolution_[0], resolution_[1])); tasks_ = light_tasks_delegate_->get_tasks(); } - tasks_.push_back(render_task_delegate_->get_task()); + for (auto &task : render_task_delegate_->get_tasks()) { + tasks_.push_back(task); + } aovs_map_.add_new("Combined", pxr::HdAovTokens->color); aovs_map_.add_new("Depth", pxr::HdAovTokens->depth); - aovs_map_.add_new("Normal", pxr::HdAovTokens->normal); - aovs_map_.add_new("Position", pxr::tokens_->worldCoordinate); + + if ((bl_engine_->type->flag & RE_USE_GPU_CONTEXT) == 0) { + aovs_map_.add_new("Normal", pxr::HdAovTokens->normal); + aovs_map_.add_new("Position", pxr::tokens_->worldCoordinate); + } RenderResult *result = RE_engine_get_result(bl_engine_); RenderLayer *layer = (RenderLayer *)result->layers.first; @@ -151,7 +156,7 @@ void FinalEngineGPU::render(Depsgraph *depsgraph) resolution_[0], resolution_[1], 1, - GPU_DEPTH32F_STENCIL8, + GPU_DEPTH_COMPONENT32F, GPU_TEXTURE_USAGE_GENERAL, nullptr); GPU_texture_filter_mode(tex_color, true); @@ -176,10 +181,10 @@ void FinalEngineGPU::render(Depsgraph *depsgraph) engine_->Execute(render_index_.get(), &tasks_); - std::vector &pixels = render_images_["Combined"]; char elapsed_time[32]; double time_begin = PIL_check_seconds_timer(); float percent_done = 0.0; + void *data; while (true) { if (RE_engine_test_break(bl_engine_)) { @@ -199,17 +204,38 @@ void FinalEngineGPU::render(Depsgraph *depsgraph) if (render_task_delegate_->is_converged()) { break; } + + for (auto &it : render_images_) { + if (it.first == "Comdined") { + data = GPU_texture_read(tex_color, GPU_DATA_FLOAT, 0); + memcpy(it.second.data(), data, it.second.size() * sizeof(float)); + MEM_freeN(data); + update_render_result(); - void *data = GPU_texture_read(tex_color, GPU_DATA_FLOAT, 0); - memcpy(pixels.data(), data, pixels.size() * sizeof(float)); - MEM_freeN(data); - update_render_result(); + } + if (it.first == "Depth") { + data = GPU_texture_read(tex_depth, GPU_DATA_FLOAT, 0); + memcpy(it.second.data(), data, it.second.size() * sizeof(float)); + MEM_freeN(data); + update_render_result(); + } + } } - void *data = GPU_texture_read(tex_color, GPU_DATA_FLOAT, 0); - memcpy(pixels.data(), data, pixels.size() * sizeof(float)); - MEM_freeN(data); - update_render_result(); + for (auto &it : render_images_) { + if (it.first == "Combined") { + data = GPU_texture_read(tex_color, GPU_DATA_FLOAT, 0); + memcpy(it.second.data(), data, it.second.size() * sizeof(float)); + MEM_freeN(data); + update_render_result(); + } + if (it.first == "Depth") { + data = GPU_texture_read(tex_depth, GPU_DATA_FLOAT, 0); + memcpy(it.second.data(), data, it.second.size() * sizeof(float)); + MEM_freeN(data); + update_render_result(); + } + } glDeleteVertexArrays(1, &VAO); GPU_framebuffer_free(framebuffer); diff --git a/source/blender/render/hydra/render_task_delegate.cc b/source/blender/render/hydra/render_task_delegate.cc index 5351be086ca2..677bdb188ed3 100644 --- a/source/blender/render/hydra/render_task_delegate.cc +++ b/source/blender/render/hydra/render_task_delegate.cc @@ -15,20 +15,28 @@ RenderTaskDelegate::RenderTaskDelegate(pxr::HdRenderIndex *parent_index, pxr::SdfPath const &delegate_id) : pxr::HdSceneDelegate(parent_index, delegate_id) { - pxr::SdfPath render_task_id = get_task_id(); - GetRenderIndex().InsertTask(this, render_task_id); - GetRenderIndex().GetChangeTracker().MarkTaskDirty(render_task_id, + render_task_id_ = GetDelegateID().AppendElementString("task"); + GetRenderIndex().InsertTask(this, render_task_id_); + GetRenderIndex().GetChangeTracker().MarkTaskDirty(render_task_id_, pxr::HdChangeTracker::DirtyCollection); - GetRenderIndex().GetChangeTracker().MarkTaskDirty(render_task_id, + GetRenderIndex().GetChangeTracker().MarkTaskDirty(render_task_id_, pxr::HdChangeTracker::DirtyRenderTags); + task_params_.enableLighting = true; task_params_.alphaThreshold = 0.1f; + + aov_task_id_ = GetDelegateID().AppendElementString("aovTask"); + GetRenderIndex().InsertTask(this, aov_task_id_); + GetRenderIndex().GetChangeTracker().MarkTaskDirty(aov_task_id_, + pxr::HdChangeTracker::DirtyCollection); + GetRenderIndex().GetChangeTracker().MarkTaskDirty(aov_task_id_, + pxr::HdChangeTracker::DirtyRenderTags); } -pxr::SdfPath RenderTaskDelegate::get_task_id() const +pxr::HdTaskSharedPtrVector RenderTaskDelegate::get_tasks() { - return GetDelegateID().AppendElementString("task"); + return {GetRenderIndex().GetTask(aov_task_id_), GetRenderIndex().GetTask(render_task_id_)}; } pxr::SdfPath RenderTaskDelegate::get_aov_id(pxr::TfToken const &aov) const @@ -38,7 +46,7 @@ pxr::SdfPath RenderTaskDelegate::get_aov_id(pxr::TfToken const &aov) const bool RenderTaskDelegate::is_converged() { - pxr::HdTaskSharedPtr renderTask = GetRenderIndex().GetTask(get_task_id()); + pxr::HdTaskSharedPtr renderTask = GetRenderIndex().GetTask(render_task_id_); return ((pxr::HdxRenderTask &)*renderTask).IsConverged(); } @@ -64,7 +72,7 @@ void RenderTaskDelegate::set_renderer_aov(pxr::TfToken const &aov) binding.aovSettings = aov_desc.aovSettings; task_params_.aovBindings.push_back(binding); - GetRenderIndex().GetChangeTracker().MarkTaskDirty(get_task_id(), + GetRenderIndex().GetChangeTracker().MarkTaskDirty(render_task_id_, pxr::HdChangeTracker::DirtyParams); } else if (buffer_descriptors_[buffer_id] != desc) { @@ -90,26 +98,27 @@ void RenderTaskDelegate::get_renderer_aov_data(pxr::TfToken const &aov, void *da buffer->Unmap(); } -pxr::HdTaskSharedPtr RenderTaskDelegate::get_task() -{ - return GetRenderIndex().GetTask(get_task_id()); -} - void RenderTaskDelegate::set_camera_and_viewport(pxr::SdfPath const &camera_id, pxr::GfVec4d const &viewport) { if (task_params_.viewport != viewport || task_params_.camera != camera_id) { task_params_.viewport = viewport; task_params_.camera = camera_id; - GetRenderIndex().GetChangeTracker().MarkTaskDirty(get_task_id(), + GetRenderIndex().GetChangeTracker().MarkTaskDirty(render_task_id_, pxr::HdChangeTracker::DirtyParams); } } -pxr::VtValue RenderTaskDelegate::Get(pxr::SdfPath const & /*id*/, pxr::TfToken const &key) +pxr::VtValue RenderTaskDelegate::Get(pxr::SdfPath const &id, pxr::TfToken const &key) { if (key == pxr::HdTokens->params) { - return pxr::VtValue(task_params_); + if (id == aov_task_id_) { + aov_task_params_.aovName = pxr::HdAovTokens->depth; + return pxr::VtValue(aov_task_params_); + } + else if (id == render_task_id_) { + return pxr::VtValue(task_params_); + } } if (key == pxr::HdTokens->collection) { pxr::HdRprimCollection rprim_collection(pxr::HdTokens->geometry, diff --git a/source/blender/render/hydra/render_task_delegate.h b/source/blender/render/hydra/render_task_delegate.h index f8a1a956816c..1c59eb6b516c 100644 --- a/source/blender/render/hydra/render_task_delegate.h +++ b/source/blender/render/hydra/render_task_delegate.h @@ -5,6 +5,7 @@ #include #include +#include namespace blender::render::hydra { @@ -13,7 +14,7 @@ class RenderTaskDelegate : public pxr::HdSceneDelegate { RenderTaskDelegate(pxr::HdRenderIndex *parent_index, pxr::SdfPath const &delegate_id); ~RenderTaskDelegate() override = default; - pxr::SdfPath get_task_id() const; + pxr::HdTaskSharedPtrVector get_tasks(); pxr::SdfPath get_aov_id(pxr::TfToken const &aov) const; bool is_converged(); @@ -21,7 +22,6 @@ class RenderTaskDelegate : public pxr::HdSceneDelegate { pxr::HdRenderBuffer *get_renderer_aov(pxr::TfToken const &id); void get_renderer_aov_data(pxr::TfToken const &id, void *buf); - pxr::HdTaskSharedPtr get_task(); void set_camera_and_viewport(pxr::SdfPath const &cameraId, pxr::GfVec4d const &viewport); /* Delegate methods */ @@ -30,6 +30,9 @@ class RenderTaskDelegate : public pxr::HdSceneDelegate { pxr::TfTokenVector GetTaskRenderTags(pxr::SdfPath const &taskId) override; private: + pxr::SdfPath aov_task_id_; + pxr::SdfPath render_task_id_; + pxr::HdxVisualizeAovTaskParams aov_task_params_; pxr::HdxRenderTaskParams task_params_; pxr::TfHashMap buffer_descriptors_; diff --git a/source/blender/render/hydra/viewport_engine.cc b/source/blender/render/hydra/viewport_engine.cc index b16c4ad776ae..685b0d27a0ca 100644 --- a/source/blender/render/hydra/viewport_engine.cc +++ b/source/blender/render/hydra/viewport_engine.cc @@ -256,8 +256,10 @@ void ViewportEngine::render(Depsgraph * /* depsgraph */, bContext *context) if (light_tasks_delegate_) { tasks = light_tasks_delegate_->get_tasks(); } - tasks.push_back(render_task_delegate_->get_task()); - + for (auto &task : render_task_delegate_->get_tasks()) { + tasks.push_back(task); + } + engine_->Execute(render_index_.get(), &tasks); if ((bl_engine_->type->flag & RE_USE_GPU_CONTEXT) == 0) { -- 2.30.2