Blender Git Loki

Git Commits -> Revision eb522af

Revision eb522af by Sybren A. Stüvel (master)
March 6, 2020, 15:19 (GMT)
Cleanup: move Alembic, AVI, Collada, and USD to `source/blender/io`

This moves the `alembic`, `avi`, `collada`, and `usd` modules into a common
`io` directory.

This also cleans up some `#include "../../{somedir}/{somefile}.h"` by
adding `../../io/{somedir}` to `CMakeLists.txt` and then just using
`#include "{somefile}.h"`.

No functional changes.

Commit Details:

Full Hash: eb522af4fec58876ac1b0a73ad9bcdae2d82d33f
Parent Commit: ff60dd8
Lines Changed: +33837, -33816

153 Added Paths:

/source/blender/io/alembic/ABC_alembic.h (+141, -0) (View)
/source/blender/io/alembic/CMakeLists.txt (+110, -0) (View)
/source/blender/io/alembic/intern/abc_customdata.cc (+484, -0) (View)
/source/blender/io/alembic/intern/abc_customdata.h (+104, -0) (View)
/source/blender/io/alembic/intern/abc_exporter.cc (+677, -0) (View)
/source/blender/io/alembic/intern/abc_exporter.h (+128, -0) (View)
/source/blender/io/alembic/intern/abc_reader_archive.cc (+140, -0) (View)
/source/blender/io/alembic/intern/abc_reader_archive.h (+67, -0) (View)
/source/blender/io/alembic/intern/abc_reader_camera.cc (+113, -0) (View)
/source/blender/io/alembic/intern/abc_reader_camera.h (+40, -0) (View)
/source/blender/io/alembic/intern/abc_reader_curves.cc (+354, -0) (View)
/source/blender/io/alembic/intern/abc_reader_curves.h (+56, -0) (View)
/source/blender/io/alembic/intern/abc_reader_mesh.cc (+889, -0) (View)
/source/blender/io/alembic/intern/abc_reader_mesh.h (+86, -0) (View)
/source/blender/io/alembic/intern/abc_reader_nurbs.cc (+225, -0) (View)
/source/blender/io/alembic/intern/abc_reader_nurbs.h (+40, -0) (View)
/source/blender/io/alembic/intern/abc_reader_object.cc (+333, -0) (View)
/source/blender/io/alembic/intern/abc_reader_object.h (+171, -0) (View)
/source/blender/io/alembic/intern/abc_reader_points.cc (+157, -0) (View)
/source/blender/io/alembic/intern/abc_reader_points.h (+54, -0) (View)
/source/blender/io/alembic/intern/abc_reader_transform.cc (+76, -0) (View)
/source/blender/io/alembic/intern/abc_reader_transform.h (+42, -0) (View)
/source/blender/io/alembic/intern/abc_util.cc (+393, -0) (View)
/source/blender/io/alembic/intern/abc_util.h (+236, -0) (View)
/source/blender/io/alembic/intern/abc_writer_archive.cc (+114, -0) (View)
/source/blender/io/alembic/intern/abc_writer_archive.h (+58, -0) (View)
/source/blender/io/alembic/intern/abc_writer_camera.cc (+81, -0) (View)
/source/blender/io/alembic/intern/abc_writer_camera.h (+45, -0) (View)
/source/blender/io/alembic/intern/abc_writer_curves.cc (+189, -0) (View)
/source/blender/io/alembic/intern/abc_writer_curves.h (+55, -0) (View)
/source/blender/io/alembic/intern/abc_writer_hair.cc (+292, -0) (View)
/source/blender/io/alembic/intern/abc_writer_hair.h (+62, -0) (View)
/source/blender/io/alembic/intern/abc_writer_mball.cc (+97, -0) (View)
/source/blender/io/alembic/intern/abc_writer_mball.h (+56, -0) (View)
/source/blender/io/alembic/intern/abc_writer_mesh.cc (+592, -0) (View)
/source/blender/io/alembic/intern/abc_writer_mesh.h (+91, -0) (View)
/source/blender/io/alembic/intern/abc_writer_nurbs.cc (+172, -0) (View)
/source/blender/io/alembic/intern/abc_writer_nurbs.h (+42, -0) (View)
/source/blender/io/alembic/intern/abc_writer_object.cc (+79, -0) (View)
/source/blender/io/alembic/intern/abc_writer_object.h (+71, -0) (View)
/source/blender/io/alembic/intern/abc_writer_points.cc (+123, -0) (View)
/source/blender/io/alembic/intern/abc_writer_points.h (+49, -0) (View)
/source/blender/io/alembic/intern/abc_writer_transform.cc (+121, -0) (View)
/source/blender/io/alembic/intern/abc_writer_transform.h (+60, -0) (View)
/source/blender/io/alembic/intern/alembic_capi.cc (+1052, -0) (View)
/source/blender/io/avi/AVI_avi.h (+299, -0) (View)
/source/blender/io/avi/CMakeLists.txt (+53, -0) (View)
/source/blender/io/avi/intern/avi.c (+1056, -0) (View)
/source/blender/io/avi/intern/avi_codecs.c (+138, -0) (View)
/source/blender/io/avi/intern/avi_endian.c (+203, -0) (View)
/source/blender/io/avi/intern/avi_endian.h (+40, -0) (View)
/source/blender/io/avi/intern/avi_intern.h (+65, -0) (View)
/source/blender/io/avi/intern/avi_mjpeg.c (+547, -0) (View)
/source/blender/io/avi/intern/avi_mjpeg.h (+30, -0) (View)
/source/blender/io/avi/intern/avi_options.c (+148, -0) (View)
/source/blender/io/avi/intern/avi_rgb.c (+154, -0) (View)
/source/blender/io/avi/intern/avi_rgb.h (+30, -0) (View)
/source/blender/io/avi/intern/avi_rgb32.c (+94, -0) (View)
/source/blender/io/avi/intern/avi_rgb32.h (+30, -0) (View)
/source/blender/io/CMakeLists.txt (+35, -0) (View)
/source/blender/io/collada/AnimationClipExporter.cpp (+50, -0) (View)
/source/blender/io/collada/AnimationClipExporter.h (+51, -0) (View)
/source/blender/io/collada/AnimationExporter.cpp (+877, -0) (View)
/source/blender/io/collada/AnimationExporter.h (+266, -0) (View)
/source/blender/io/collada/AnimationImporter.cpp (+2232, -0) (View)
/source/blender/io/collada/AnimationImporter.h (+254, -0) (View)
/source/blender/io/collada/ArmatureExporter.cpp (+328, -0) (View)
/source/blender/io/collada/ArmatureExporter.h (+107, -0) (View)
/source/blender/io/collada/ArmatureImporter.cpp (+1115, -0) (View)
/source/blender/io/collada/ArmatureImporter.h (+187, -0) (View)
/source/blender/io/collada/BCAnimationCurve.cpp (+691, -0) (View)
/source/blender/io/collada/BCAnimationCurve.h (+152, -0) (View)
/source/blender/io/collada/BCAnimationSampler.cpp (+662, -0) (View)
/source/blender/io/collada/BCAnimationSampler.h (+194, -0) (View)
/source/blender/io/collada/BCMath.cpp (+244, -0) (View)
/source/blender/io/collada/BCMath.h (+110, -0) (View)
/source/blender/io/collada/BCSampleData.cpp (+97, -0) (View)
/source/blender/io/collada/BCSampleData.h (+66, -0) (View)
/source/blender/io/collada/BlenderContext.cpp (+156, -0) (View)
/source/blender/io/collada/BlenderContext.h (+73, -0) (View)
/source/blender/io/collada/BlenderTypes.h (+48, -0) (View)
/source/blender/io/collada/CameraExporter.cpp (+98, -0) (View)
/source/blender/io/collada/CameraExporter.h (+46, -0) (View)
/source/blender/io/collada/CMakeLists.txt (+147, -0) (View)
/source/blender/io/collada/collada.cpp (+117, -0) (View)
/source/blender/io/collada/collada.h (+50, -0) (View)
/source/blender/io/collada/collada_internal.cpp (+340, -0) (View)
/source/blender/io/collada/collada_internal.h (+98, -0) (View)
/source/blender/io/collada/collada_utils.cpp (+1458, -0) (View)
/source/blender/io/collada/collada_utils.h (+399, -0) (View)
/source/blender/io/collada/ControllerExporter.cpp (+649, -0) (View)
/source/blender/io/collada/ControllerExporter.h (+137, -0) (View)
/source/blender/io/collada/DocumentExporter.cpp (+346, -0) (View)
/source/blender/io/collada/DocumentExporter.h (+44, -0) (View)
/source/blender/io/collada/DocumentImporter.cpp (+1265, -0) (View)
/source/blender/io/collada/DocumentImporter.h (+172, -0) (View)
/source/blender/io/collada/EffectExporter.cpp (+312, -0) (View)
/source/blender/io/collada/EffectExporter.h (+89, -0) (View)
/source/blender/io/collada/ErrorHandler.cpp (+118, -0) (View)
/source/blender/io/collada/ErrorHandler.h (+57, -0) (View)
/source/blender/io/collada/ExportSettings.cpp (+21, -0) (View)
/source/blender/io/collada/ExportSettings.h (+295, -0) (View)
/source/blender/io/collada/ExtraHandler.cpp (+93, -0) (View)
/source/blender/io/collada/ExtraHandler.h (+83, -0) (View)
/source/blender/io/collada/ExtraTags.cpp (+126, -0) (View)
/source/blender/io/collada/ExtraTags.h (+77, -0) (View)
/source/blender/io/collada/GeometryExporter.cpp (+718, -0) (View)
/source/blender/io/collada/GeometryExporter.h (+140, -0) (View)
/source/blender/io/collada/ImageExporter.cpp (+169, -0) (View)
/source/blender/io/collada/ImageExporter.h (+51, -0) (View)
/source/blender/io/collada/ImportSettings.cpp (+21, -0) (View)
/source/blender/io/collada/ImportSettings.h (+34, -0) (View)
/source/blender/io/collada/InstanceWriter.cpp (+70, -0) (View)
/source/blender/io/collada/InstanceWriter.h (+35, -0) (View)
/source/blender/io/collada/LightExporter.cpp (+156, -0) (View)
/source/blender/io/collada/LightExporter.h (+44, -0) (View)
/source/blender/io/collada/MaterialExporter.cpp (+75, -0) (View)
/source/blender/io/collada/MaterialExporter.h (+98, -0) (View)
/source/blender/io/collada/Materials.cpp (+396, -0) (View)
/source/blender/io/collada/Materials.h (+76, -0) (View)
/source/blender/io/collada/MeshImporter.cpp (+1208, -0) (View)
/source/blender/io/collada/MeshImporter.h (+182, -0) (View)
/source/blender/io/collada/SceneExporter.cpp (+242, -0) (View)
/source/blender/io/collada/SceneExporter.h (+117, -0) (View)
/source/blender/io/collada/SkinInfo.cpp (+357, -0) (View)
/source/blender/io/collada/SkinInfo.h (+130, -0) (View)
/source/blender/io/collada/TransformReader.cpp (+151, -0) (View)
/source/blender/io/collada/TransformReader.h (+72, -0) (View)
/source/blender/io/collada/TransformWriter.cpp (+141, -0) (View)
/source/blender/io/collada/TransformWriter.h (+48, -0) (View)
/source/blender/io/collada/version.conf (+1, -0) (View)
/source/blender/io/usd/CMakeLists.txt (+111, -0) (View)
/source/blender/io/usd/intern/abstract_hierarchy_iterator.cc (+595, -0) (View)
/source/blender/io/usd/intern/abstract_hierarchy_iterator.h (+251, -0) (View)
/source/blender/io/usd/intern/usd_capi.cc (+233, -0) (View)
/source/blender/io/usd/intern/usd_exporter_context.h (+44, -0) (View)
/source/blender/io/usd/intern/usd_hierarchy_iterator.cc (+150, -0) (View)
/source/blender/io/usd/intern/usd_hierarchy_iterator.h (+71, -0) (View)
/source/blender/io/usd/intern/usd_writer_abstract.cc (+147, -0) (View)
/source/blender/io/usd/intern/usd_writer_abstract.h (+77, -0) (View)
/source/blender/io/usd/intern/usd_writer_camera.cc (+111, -0) (View)
/source/blender/io/usd/intern/usd_writer_camera.h (+38, -0) (View)
/source/blender/io/usd/intern/usd_writer_hair.cc (+90, -0) (View)
/source/blender/io/usd/intern/usd_writer_hair.h (+38, -0) (View)
/source/blender/io/usd/intern/usd_writer_light.cc (+112, -0) (View)
/source/blender/io/usd/intern/usd_writer_light.h (+37, -0) (View)
/source/blender/io/usd/intern/usd_writer_mesh.cc (+489, -0) (View)
/source/blender/io/usd/intern/usd_writer_mesh.h (+66, -0) (View)
/source/blender/io/usd/intern/usd_writer_metaball.cc (+81, -0) (View)
/source/blender/io/usd/intern/usd_writer_metaball.h (+42, -0) (View)
/source/blender/io/usd/intern/usd_writer_transform.cc (+64, -0) (View)
/source/blender/io/usd/intern/usd_writer_transform.h (+42, -0) (View)
/source/blender/io/usd/usd.h (+63, -0) (View)

152 Deleted Paths:

/source/blender/alembic/ABC_alembic.h (+0, -141)
/source/blender/alembic/CMakeLists.txt (+0, -110)
/source/blender/alembic/intern/abc_customdata.cc (+0, -484)
/source/blender/alembic/intern/abc_customdata.h (+0, -104)
/source/blender/alembic/intern/abc_exporter.cc (+0, -677)
/source/blender/alembic/intern/abc_exporter.h (+0, -128)
/source/blender/alembic/intern/abc_reader_archive.cc (+0, -140)
/source/blender/alembic/intern/abc_reader_archive.h (+0, -67)
/source/blender/alembic/intern/abc_reader_camera.cc (+0, -113)
/source/blender/alembic/intern/abc_reader_camera.h (+0, -40)
/source/blender/alembic/intern/abc_reader_curves.cc (+0, -354)
/source/blender/alembic/intern/abc_reader_curves.h (+0, -56)
/source/blender/alembic/intern/abc_reader_mesh.cc (+0, -889)
/source/blender/alembic/intern/abc_reader_mesh.h (+0, -86)
/source/blender/alembic/intern/abc_reader_nurbs.cc (+0, -225)
/source/blender/alembic/intern/abc_reader_nurbs.h (+0, -40)
/source/blender/alembic/intern/abc_reader_object.cc (+0, -333)
/source/blender/alembic/intern/abc_reader_object.h (+0, -171)
/source/blender/alembic/intern/abc_reader_points.cc (+0, -157)
/source/blender/alembic/intern/abc_reader_points.h (+0, -54)
/source/blender/alembic/intern/abc_reader_transform.cc (+0, -76)
/source/blender/alembic/intern/abc_reader_transform.h (+0, -42)
/source/blender/alembic/intern/abc_util.cc (+0, -393)
/source/blender/alembic/intern/abc_util.h (+0, -236)
/source/blender/alembic/intern/abc_writer_archive.cc (+0, -114)
/source/blender/alembic/intern/abc_writer_archive.h (+0, -58)
/source/blender/alembic/intern/abc_writer_camera.cc (+0, -81)
/source/blender/alembic/intern/abc_writer_camera.h (+0, -45)
/source/blender/alembic/intern/abc_writer_curves.cc (+0, -189)
/source/blender/alembic/intern/abc_writer_curves.h (+0, -55)
/source/blender/alembic/intern/abc_writer_hair.cc (+0, -292)
/source/blender/alembic/intern/abc_writer_hair.h (+0, -62)
/source/blender/alembic/intern/abc_writer_mball.cc (+0, -97)
/source/blender/alembic/intern/abc_writer_mball.h (+0, -56)
/source/blender/alembic/intern/abc_writer_mesh.cc (+0, -592)
/source/blender/alembic/intern/abc_writer_mesh.h (+0, -91)
/source/blender/alembic/intern/abc_writer_nurbs.cc (+0, -172)
/source/blender/alembic/intern/abc_writer_nurbs.h (+0, -42)
/source/blender/alembic/intern/abc_writer_object.cc (+0, -79)
/source/blender/alembic/intern/abc_writer_object.h (+0, -71)
/source/blender/alembic/intern/abc_writer_points.cc (+0, -123)
/source/blender/alembic/intern/abc_writer_points.h (+0, -49)
/source/blender/alembic/intern/abc_writer_transform.cc (+0, -121)
/source/blender/alembic/intern/abc_writer_transform.h (+0, -60)
/source/blender/alembic/intern/alembic_capi.cc (+0, -1052)
/source/blender/avi/AVI_avi.h (+0, -299)
/source/blender/avi/CMakeLists.txt (+0, -53)
/source/blender/avi/intern/avi.c (+0, -1056)
/source/blender/avi/intern/avi_codecs.c (+0, -138)
/source/blender/avi/intern/avi_endian.c (+0, -203)
/source/blender/avi/intern/avi_endian.h (+0, -40)
/source/blender/avi/intern/avi_intern.h (+0, -65)
/source/blender/avi/intern/avi_mjpeg.c (+0, -547)
/source/blender/avi/intern/avi_mjpeg.h (+0, -30)
/source/blender/avi/intern/avi_options.c (+0, -148)
/source/blender/avi/intern/avi_rgb.c (+0, -154)
/source/blender/avi/intern/avi_rgb.h (+0, -30)
/source/blender/avi/intern/avi_rgb32.c (+0, -94)
/source/blender/avi/intern/avi_rgb32.h (+0, -30)
/source/blender/collada/AnimationClipExporter.cpp (+0, -50)
/source/blender/collada/AnimationClipExporter.h (+0, -51)
/source/blender/collada/AnimationExporter.cpp (+0, -877)
/source/blender/collada/AnimationExporter.h (+0, -266)
/source/blender/collada/AnimationImporter.cpp (+0, -2232)
/source/blender/collada/AnimationImporter.h (+0, -254)
/source/blender/collada/ArmatureExporter.cpp (+0, -328)
/source/blender/collada/ArmatureExporter.h (+0, -107)
/source/blender/collada/ArmatureImporter.cpp (+0, -1115)
/source/blender/collada/ArmatureImporter.h (+0, -187)
/source/blender/collada/BCAnimationCurve.cpp (+0, -691)
/source/blender/collada/BCAnimationCurve.h (+0, -152)
/source/blender/collada/BCAnimationSampler.cpp (+0, -662)
/source/blender/collada/BCAnimationSampler.h (+0, -194)
/source/blender/collada/BCMath.cpp (+0, -244)
/source/blender/collada/BCMath.h (+0, -110)
/source/blender/collada/BCSampleData.cpp (+0, -97)
/source/blender/collada/BCSampleData.h (+0, -66)
/source/blender/collada/BlenderContext.cpp (+0, -156)
/source/blender/collada/BlenderContext.h (+0, -73)
/source/blender/collada/BlenderTypes.h (+0, -48)
/source/blender/collada/CameraExporter.cpp (+0, -98)
/source/blender/collada/CameraExporter.h (+0, -46)
/source/blender/collada/CMakeLists.txt (+0, -147)
/source/blender/collada/collada.cpp (+0, -117)
/source/blender/collada/collada.h (+0, -50)
/source/blender/collada/collada_internal.cpp (+0, -340)
/source/blender/collada/collada_internal.h (+0, -98)
/source/blender/collada/collada_utils.cpp (+0, -1458)
/source/blender/collada/collada_utils.h (+0, -399)
/source/blender/collada/ControllerExporter.cpp (+0, -649)
/source/blender/collada/ControllerExporter.h (+0, -137)
/source/blender/collada/DocumentExporter.cpp (+0, -346)
/source/blender/collada/DocumentExporter.h (+0, -44)
/source/blender/collada/DocumentImporter.cpp (+0, -1265)
/source/blender/collada/DocumentImporter.h (+0, -172)
/source/blender/collada/EffectExporter.cpp (+0, -312)
/source/blender/collada/EffectExporter.h (+0, -89)
/source/blender/collada/ErrorHandler.cpp (+0, -118)
/source/blender/collada/ErrorHandler.h (+0, -57)
/source/blender/collada/ExportSettings.cpp (+0, -21)
/source/blender/collada/ExportSettings.h (+0, -295)
/source/blender/collada/ExtraHandler.cpp (+0, -93)
/source/blender/collada/ExtraHandler.h (+0, -83)
/source/blender/collada/ExtraTags.cpp (+0, -126)
/source/blender/collada/ExtraTags.h (+0, -77)
/source/blender/collada/GeometryExporter.cpp (+0, -718)
/source/blender/collada/GeometryExporter.h (+0, -140)
/source/blender/collada/ImageExporter.cpp (+0, -169)
/source/blender/collada/ImageExporter.h (+0, -51)
/source/blender/collada/ImportSettings.cpp (+0, -21)
/source/blender/collada/ImportSettings.h (+0, -34)
/source/blender/collada/InstanceWriter.cpp (+0, -70)
/source/blender/collada/InstanceWriter.h (+0, -35)
/source/blender/collada/LightExporter.cpp (+0, -156)
/source/blender/collada/LightExporter.h (+0, -44)
/source/blender/collada/MaterialExporter.cpp (+0, -75)
/source/blender/collada/MaterialExporter.h (+0, -98)
/source/blender/collada/Materials.cpp (+0, -396)
/source/blender/collada/Materials.h (+0, -76)
/source/blender/collada/MeshImporter.cpp (+0, -1208)
/source/blender/collada/MeshImporter.h (+0, -182)
/source/blender/collada/SceneExporter.cpp (+0, -242)
/source/blender/collada/SceneExporter.h (+0, -117)
/source/blender/collada/SkinInfo.cpp (+0, -357)
/source/blender/collada/SkinInfo.h (+0, -130)
/source/blender/collada/TransformReader.cpp (+0, -151)
/source/blender/collada/TransformReader.h (+0, -72)
/source/blender/collada/TransformWriter.cpp (+0, -141)
/source/blender/collada/TransformWriter.h (+0, -48)
/source/blender/collada/version.conf (+0, -1)
/source/blender/usd/CMakeLists.txt (+0, -111)
/source/blender/usd/intern/abstract_hierarchy_iterator.cc (+0, -595)
/source/blender/usd/intern/abstract_hierarchy_iterator.h (+0, -251)
/source/blender/usd/intern/usd_capi.cc (+0, -233)
/source/blender/usd/intern/usd_exporter_context.h (+0, -44)
/source/blender/usd/intern/usd_hierarchy_iterator.cc (+0, -150)
/source/blender/usd/intern/usd_hierarchy_iterator.h (+0, -71)
/source/blender/usd/intern/usd_writer_abstract.cc (+0, -147)
/source/blender/usd/intern/usd_writer_abstract.h (+0, -77)
/source/blender/usd/intern/usd_writer_camera.cc (+0, -111)
/source/blender/usd/intern/usd_writer_camera.h (+0, -38)
/source/blender/usd/intern/usd_writer_hair.cc (+0, -90)
/source/blender/usd/intern/usd_writer_hair.h (+0, -38)
/source/blender/usd/intern/usd_writer_light.cc (+0, -112)
/source/blender/usd/intern/usd_writer_light.h (+0, -37)
/source/blender/usd/intern/usd_writer_mesh.cc (+0, -489)
/source/blender/usd/intern/usd_writer_mesh.h (+0, -66)
/source/blender/usd/intern/usd_writer_metaball.cc (+0, -81)
/source/blender/usd/intern/usd_writer_metaball.h (+0, -42)
/source/blender/usd/intern/usd_writer_transform.cc (+0, -64)
/source/blender/usd/intern/usd_writer_transform.h (+0, -42)
/source/blender/usd/usd.h (+0, -63)

13 Modified Paths:

/source/blender/blenkernel/CMakeLists.txt (+2, -2) (Diff)
/source/blender/blenloader/CMakeLists.txt (+1, -1) (Diff)
/source/blender/CMakeLists.txt (+1, -15) (Diff)
/source/blender/editors/io/CMakeLists.txt (+3, -3) (Diff)
/source/blender/editors/io/io_collada.c (+1, -1) (Diff)
/source/blender/imbuf/CMakeLists.txt (+1, -1) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_cachefile.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_scene_api.c (+1, -1) (Diff)
/source/blender/modifiers/CMakeLists.txt (+1, -1) (Diff)
/source/blender/python/intern/CMakeLists.txt (+2, -2) (Diff)
/tests/gtests/alembic/CMakeLists.txt (+1, -1) (Diff)
/tests/gtests/usd/CMakeLists.txt (+1, -1) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021