Compare commits
7 Commits
db0bdc8618
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| a5aee0a464 | |||
| dfaf911b57 | |||
| 5b02733d20 | |||
| 11336807d7 | |||
| c05dae9429 | |||
| 23b14ac69f | |||
| c9fdd30185 |
13
.github/scripts/windows.bat
vendored
13
.github/scripts/windows.bat
vendored
@@ -9,6 +9,19 @@ MKDIR install
|
||||
|
||||
:: Build with x64 architecture in Release mode
|
||||
CD build
|
||||
:: We set this to revert the incompatible ABI for MSVC STL.
|
||||
:: See: https://github.com/microsoft/STL/wiki/VS-2022-Changelog#vs-2022-1710
|
||||
::
|
||||
:: Ideally, I can install new VCRedist to resolve this issue.
|
||||
:: However, Blender embeds its own VCRedist when distribution which has lower VCRedist version.
|
||||
:: And at the same time, Blender will load our BMap.dll built by new VCRedist, so it trigger the incompatible ABI issue.
|
||||
::
|
||||
:: Currently, the VCRedist distributed by Blender 4.5 LTS is incompatible with our BMap.dll.
|
||||
:: So I write it in script, rather than in CMake file, to temporaryly fix this issue.
|
||||
::
|
||||
:: This fix also is written in dependency build scripts, please remove them together if you remove this,
|
||||
:: when Blender migrate to the new VCRedist.
|
||||
set CXXFLAGS=/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR=1
|
||||
cmake -A x64 -DCMAKE_CXX_STANDARD=23 -DNEMO_BUILD_UNVIRT=ON -DNEMO_BUILD_BALLANCE=ON -DNEMO_BUILD_BMAP=ON -DNEMO_BUILD_BMAPINSPECTOR=ON -DYYCCommonplace_ROOT=%YYCCommonplace_ROOT% -DSTB_ROOT=%STB_ROOT% -DZLIB_ROOT=%ZLIB_ROOT% ../..
|
||||
cmake --build . --config Release
|
||||
cmake --install . --prefix=../install --config Release
|
||||
|
||||
1
.github/scripts/yycc/windows.bat
vendored
1
.github/scripts/yycc/windows.bat
vendored
@@ -9,6 +9,7 @@ MKDIR install
|
||||
|
||||
:: Build with x64 architecture in Release mode
|
||||
CD build
|
||||
set CXXFLAGS=/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR=1
|
||||
cmake -A x64 -DCMAKE_CXX_STANDARD=23 ../..
|
||||
cmake --build . --config Release
|
||||
cmake --install . --prefix=../install --config Release
|
||||
|
||||
2
.github/workflows/linux.yml
vendored
2
.github/workflows/linux.yml
vendored
@@ -18,7 +18,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
repository: 'yyc12345/YYCCommonplace'
|
||||
ref: 'master'
|
||||
ref: 'v2.0.0'
|
||||
path: 'extern/YYCCommonplace'
|
||||
- name: Build YYCCommonplace
|
||||
shell: bash
|
||||
|
||||
2
.github/workflows/macos.yml
vendored
2
.github/workflows/macos.yml
vendored
@@ -13,7 +13,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
repository: 'yyc12345/YYCCommonplace'
|
||||
ref: 'master'
|
||||
ref: 'v2.0.0'
|
||||
path: 'extern/YYCCommonplace'
|
||||
- name: Build YYCCommonplace
|
||||
shell: bash
|
||||
|
||||
2
.github/workflows/windows.yml
vendored
2
.github/workflows/windows.yml
vendored
@@ -20,7 +20,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
repository: 'yyc12345/YYCCommonplace'
|
||||
ref: 'master'
|
||||
ref: 'v2.0.0'
|
||||
path: 'extern/YYCCommonplace'
|
||||
- name: Build YYCCommonplace
|
||||
shell: cmd
|
||||
|
||||
@@ -5,10 +5,11 @@
|
||||
#include "Rule.hpp"
|
||||
#include <VTAll.hpp>
|
||||
#include <yycc.hpp>
|
||||
#include <yycc/carton/termcolor.hpp>
|
||||
#include <yycc/string/op.hpp>
|
||||
#include <yycc/patch/stream.hpp>
|
||||
#include <yycc/windows/console.hpp>
|
||||
#include <yycc/carton/termcolor.hpp>
|
||||
#include <yycc/carton/ironpad.hpp>
|
||||
#include <iostream>
|
||||
#include <optional>
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
#include <yycc/macro/class_copy_move.hpp>
|
||||
#include <yycc/macro/ptr_size_detector.hpp>
|
||||
#include <utility>
|
||||
#include <optional>
|
||||
|
||||
#define BMAPINSP_L LibCmo
|
||||
#define BMAPINSP_C LibCmo::CK2
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
#include <vector>
|
||||
#include <set>
|
||||
#include <optional>
|
||||
#include <algorithm>
|
||||
#include <unordered_set>
|
||||
|
||||
namespace L = LibCmo;
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace BMapInspector::Ruleset {
|
||||
public:
|
||||
ZZQRule2();
|
||||
virtual ~ZZQRule2();
|
||||
YYCC_DEFAULT_COPY_MOVE(ZZQRule2)
|
||||
YYCC_DELETE_COPY_MOVE(ZZQRule2)
|
||||
|
||||
public:
|
||||
std::u8string_view GetRuleName() const override;
|
||||
|
||||
@@ -50,8 +50,12 @@ It would be okey for you to use any Antlr you like.
|
||||
|
||||
### Passing Dependencies
|
||||
|
||||
When executing Java code relying on these dependencies,
|
||||
you can use `-cp` option of Java runtime to pass the directory where you can find those dependency's JAR files.
|
||||
When compiling or executing Java code relying on these dependencies,
|
||||
you can use `-cp` option to pass these dependency's JAR files.
|
||||
All dependencies should be specified in one `-cp` option with `;` as separator.
|
||||
|
||||
For example, when compiling, you can pass `-cp "<path-to-antlr4-jar>;<path-to-gson-jar>"` as option.
|
||||
Or pass `-cp ".;<path-to-antlr4-jar>;<path-to-gson-jar>"` when executing.
|
||||
|
||||
## Python
|
||||
|
||||
|
||||
@@ -538,6 +538,121 @@ namespace LibCmo::VxMath {
|
||||
|
||||
#pragma endregion
|
||||
|
||||
#pragma region VxImageDescEx
|
||||
|
||||
VxImageDescEx::VxImageDescEx() : m_Width(0), m_Height(0), m_Image(nullptr) {}
|
||||
|
||||
VxImageDescEx::VxImageDescEx(CKDWORD width, CKDWORD height) : m_Width(width), m_Height(height), m_Image(nullptr) {
|
||||
CreateImage(width, height);
|
||||
}
|
||||
|
||||
YYCC_IMPL_COPY_CTOR(VxImageDescEx, rhs) : m_Width(rhs.m_Width), m_Height(rhs.m_Height), m_Image(nullptr) {
|
||||
// copy image
|
||||
if (rhs.m_Image != nullptr) {
|
||||
CreateImage(rhs.m_Width, rhs.m_Height, rhs.m_Image);
|
||||
}
|
||||
}
|
||||
|
||||
YYCC_IMPL_COPY_OPER(VxImageDescEx, rhs) {
|
||||
FreeImage();
|
||||
|
||||
m_Width = rhs.m_Width;
|
||||
m_Height = rhs.m_Height;
|
||||
if (rhs.m_Image != nullptr) {
|
||||
CreateImage(rhs.m_Width, rhs.m_Height, rhs.m_Image);
|
||||
}
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
YYCC_IMPL_MOVE_CTOR(VxImageDescEx, rhs) : m_Width(rhs.m_Width), m_Height(rhs.m_Height), m_Image(rhs.m_Image) {
|
||||
// move image
|
||||
rhs.m_Height = 0;
|
||||
rhs.m_Width = 0;
|
||||
rhs.m_Image = nullptr;
|
||||
}
|
||||
|
||||
YYCC_IMPL_MOVE_OPER(VxImageDescEx, rhs) {
|
||||
FreeImage();
|
||||
|
||||
m_Height = rhs.m_Height;
|
||||
m_Width = rhs.m_Width;
|
||||
m_Image = rhs.m_Image;
|
||||
rhs.m_Height = 0;
|
||||
rhs.m_Width = 0;
|
||||
rhs.m_Image = nullptr;
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
VxImageDescEx::~VxImageDescEx() {
|
||||
FreeImage();
|
||||
}
|
||||
|
||||
void VxImageDescEx::CreateImage(CKDWORD Width, CKDWORD Height) {
|
||||
FreeImage();
|
||||
m_Width = Width;
|
||||
m_Height = Height;
|
||||
m_Image = new CKBYTE[GetImageSize()];
|
||||
}
|
||||
|
||||
void VxImageDescEx::CreateImage(CKDWORD Width, CKDWORD Height, const void* dataptr) {
|
||||
CreateImage(Width, Height);
|
||||
std::memcpy(m_Image, dataptr, GetImageSize());
|
||||
}
|
||||
|
||||
void VxImageDescEx::FreeImage() {
|
||||
m_Width = 0;
|
||||
m_Height = 0;
|
||||
if (m_Image != nullptr) {
|
||||
delete[] m_Image;
|
||||
m_Image = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
CKDWORD VxImageDescEx::GetImageSize() const {
|
||||
return static_cast<CKDWORD>(PIXEL_SIZE * m_Width * m_Height);
|
||||
}
|
||||
|
||||
const CKBYTE* VxImageDescEx::GetImage() const { return m_Image; }
|
||||
|
||||
CKBYTE* VxImageDescEx::GetMutableImage() { return m_Image; }
|
||||
|
||||
CKDWORD VxImageDescEx::GetPixelCount() const {
|
||||
return static_cast<CKDWORD>(m_Width * m_Height);
|
||||
}
|
||||
|
||||
const CKDWORD* VxImageDescEx::GetPixels() const {
|
||||
return reinterpret_cast<CKDWORD*>(m_Image);
|
||||
}
|
||||
|
||||
CKDWORD* VxImageDescEx::GetMutablePixels() {
|
||||
return reinterpret_cast<CKDWORD*>(m_Image);
|
||||
}
|
||||
|
||||
CKDWORD VxImageDescEx::GetWidth() const { return m_Width; }
|
||||
|
||||
CKDWORD VxImageDescEx::GetHeight() const { return m_Height; }
|
||||
|
||||
bool VxImageDescEx::IsValid() const {
|
||||
return (m_Width != 0u && m_Height != 0u && m_Image != nullptr);
|
||||
}
|
||||
|
||||
bool VxImageDescEx::IsHWEqual(const VxImageDescEx& rhs) const {
|
||||
return (m_Width == rhs.m_Width && m_Height == rhs.m_Height);
|
||||
}
|
||||
|
||||
// bool VxImageDescEx::IsMaskEqual(const VxImageDescEx& rhs) const {
|
||||
// return (
|
||||
// m_RedMask == rhs.m_RedMask &&
|
||||
// m_GreenMask == rhs.m_GreenMask &&
|
||||
// m_BlueMask == rhs.m_BlueMask &&
|
||||
// m_AlphaMask == rhs.m_AlphaMask
|
||||
// );
|
||||
// }
|
||||
|
||||
#pragma endregion
|
||||
|
||||
#pragma region Patched
|
||||
|
||||
namespace NSVxVector {
|
||||
|
||||
@@ -341,53 +341,20 @@ namespace LibCmo::VxMath {
|
||||
public:
|
||||
static constexpr CKDWORD FACTOR_SIZE = 1u; /**< Single color factor (one of ARGB) occpied size in byte. */
|
||||
static constexpr CKDWORD PIXEL_SIZE = FACTOR_SIZE * 4u; /**< Single pixel occpied size in byte. */
|
||||
|
||||
public:
|
||||
/**
|
||||
* @brief Create a blank (invalid) image.
|
||||
*/
|
||||
VxImageDescEx() : m_Width(0), m_Height(0), m_Image(nullptr) {}
|
||||
VxImageDescEx();
|
||||
/**
|
||||
* @brief Create a image with given width and height.
|
||||
* @param[in] width The width of image.
|
||||
* @param[in] height The height of image.
|
||||
*/
|
||||
VxImageDescEx(CKDWORD width, CKDWORD height) : m_Width(width), m_Height(height), m_Image(nullptr) { CreateImage(width, height); }
|
||||
VxImageDescEx(const VxImageDescEx& rhs) : m_Width(rhs.m_Width), m_Height(rhs.m_Height), m_Image(nullptr) {
|
||||
// copy image
|
||||
if (rhs.m_Image != nullptr) {
|
||||
CreateImage(rhs.m_Width, rhs.m_Height, rhs.m_Image);
|
||||
}
|
||||
}
|
||||
VxImageDescEx(VxImageDescEx&& rhs) noexcept : m_Width(rhs.m_Width), m_Height(rhs.m_Height), m_Image(rhs.m_Image) {
|
||||
// move image
|
||||
rhs.m_Height = 0;
|
||||
rhs.m_Width = 0;
|
||||
rhs.m_Image = nullptr;
|
||||
}
|
||||
VxImageDescEx& operator=(const VxImageDescEx& rhs) {
|
||||
FreeImage();
|
||||
|
||||
m_Width = rhs.m_Width;
|
||||
m_Height = rhs.m_Height;
|
||||
if (rhs.m_Image != nullptr) {
|
||||
CreateImage(rhs.m_Width, rhs.m_Height, rhs.m_Image);
|
||||
}
|
||||
|
||||
return *this;
|
||||
}
|
||||
VxImageDescEx& operator=(VxImageDescEx&& rhs) noexcept {
|
||||
FreeImage();
|
||||
|
||||
m_Height = rhs.m_Height;
|
||||
m_Width = rhs.m_Width;
|
||||
m_Image = rhs.m_Image;
|
||||
rhs.m_Height = 0;
|
||||
rhs.m_Width = 0;
|
||||
rhs.m_Image = nullptr;
|
||||
|
||||
return *this;
|
||||
}
|
||||
~VxImageDescEx() { FreeImage(); }
|
||||
VxImageDescEx(CKDWORD width, CKDWORD height);
|
||||
~VxImageDescEx();
|
||||
YYCC_DECL_COPY_MOVE(VxImageDescEx)
|
||||
|
||||
/**
|
||||
* @brief Create image with given width and height
|
||||
@@ -397,12 +364,7 @@ namespace LibCmo::VxMath {
|
||||
* \li There is no initialization (fill with zero) for this new created image.
|
||||
* \li Old image will be free first before creating.
|
||||
*/
|
||||
void CreateImage(CKDWORD Width, CKDWORD Height) {
|
||||
FreeImage();
|
||||
m_Width = Width;
|
||||
m_Height = Height;
|
||||
m_Image = new CKBYTE[GetImageSize()];
|
||||
}
|
||||
void CreateImage(CKDWORD Width, CKDWORD Height);
|
||||
/**
|
||||
* @brief Create image with given width, height and data.
|
||||
* @param[in] Width The width of image.
|
||||
@@ -413,86 +375,69 @@ namespace LibCmo::VxMath {
|
||||
* an undefined behavior is raised.
|
||||
* @remarks Old image will be free first before creating.
|
||||
*/
|
||||
void CreateImage(CKDWORD Width, CKDWORD Height, const void* dataptr) {
|
||||
CreateImage(Width, Height);
|
||||
std::memcpy(m_Image, dataptr, GetImageSize());
|
||||
}
|
||||
void CreateImage(CKDWORD Width, CKDWORD Height, const void* dataptr);
|
||||
/**
|
||||
* @brief Free current image. Reset this to invalid status.
|
||||
*/
|
||||
void FreeImage() {
|
||||
m_Width = 0;
|
||||
m_Height = 0;
|
||||
if (m_Image != nullptr) {
|
||||
delete[] m_Image;
|
||||
m_Image = nullptr;
|
||||
}
|
||||
}
|
||||
void FreeImage();
|
||||
|
||||
/**
|
||||
* @brief Get the allocated memory size of image.
|
||||
* @return The allocated memory size of image.
|
||||
* Basically it is image width * height * (single pixel size).
|
||||
*/
|
||||
CKDWORD GetImageSize() const { return static_cast<CKDWORD>(PIXEL_SIZE * m_Width * m_Height); }
|
||||
CKDWORD GetImageSize() const;
|
||||
/**
|
||||
* @brief Get a constant pointer to image in memory unit for viewing.
|
||||
* @return A constant pointer to image in memory unit.
|
||||
*/
|
||||
const CKBYTE* GetImage() const { return m_Image; }
|
||||
const CKBYTE* GetImage() const;
|
||||
/**
|
||||
* @brief Get a mutable pointer to image in memory unit for modifying.
|
||||
* @return A mutable pointer to image in memory uint.
|
||||
*/
|
||||
CKBYTE* GetMutableImage() { return m_Image; }
|
||||
CKBYTE* GetMutableImage();
|
||||
|
||||
/**
|
||||
* @brief Get the full count of pixel in image.
|
||||
* @return The count of image. Basically it is image width * height.
|
||||
*/
|
||||
CKDWORD GetPixelCount() const { return static_cast<CKDWORD>(m_Width * m_Height); }
|
||||
CKDWORD GetPixelCount() const;
|
||||
/**
|
||||
* @brief Get a constant pointer to image in pixel unit for viewing.
|
||||
* @return A constant pointer to image in pixel unit.
|
||||
*/
|
||||
const CKDWORD* GetPixels() const { return reinterpret_cast<CKDWORD*>(m_Image); }
|
||||
const CKDWORD* GetPixels() const;
|
||||
/**
|
||||
* @brief Get a mutable pointer to image in pixel uint for modifying.
|
||||
* @return A mutable pointer to image in pixel uint.
|
||||
*/
|
||||
CKDWORD* GetMutablePixels() { return reinterpret_cast<CKDWORD*>(m_Image); }
|
||||
CKDWORD* GetMutablePixels();
|
||||
|
||||
/**
|
||||
* @brief Get the width of this image in pixel.
|
||||
* @return The width of this image in pixel.
|
||||
*/
|
||||
CKDWORD GetWidth() const { return m_Width; }
|
||||
CKDWORD GetWidth() const;
|
||||
/**
|
||||
* @brief Get the height of this image in pixel.
|
||||
* @return The height of this image in pixel.
|
||||
*/
|
||||
CKDWORD GetHeight() const { return m_Height; }
|
||||
CKDWORD GetHeight() const;
|
||||
|
||||
/**
|
||||
* @brief Check whether this image is valid image for using.
|
||||
* @details If one of width and height is zero, or underlying image pointer, this image is invalid.
|
||||
* @return True if it is, otherwise false.
|
||||
*/
|
||||
bool IsValid() const { return (m_Width != 0u && m_Height != 0u && m_Image != nullptr); }
|
||||
bool IsValid() const;
|
||||
/**
|
||||
* @brief Check whether the width and height of this image are equal to another image.
|
||||
* @param[in] rhs Another image for comparing.
|
||||
* @return True if their width and height are equal, otherwise false.
|
||||
*/
|
||||
bool IsHWEqual(const VxImageDescEx& rhs) const { return (m_Width == rhs.m_Width && m_Height == rhs.m_Height); }
|
||||
// bool IsMaskEqual(const VxImageDescEx& rhs) const {
|
||||
// return (
|
||||
// m_RedMask == rhs.m_RedMask &&
|
||||
// m_GreenMask == rhs.m_GreenMask &&
|
||||
// m_BlueMask == rhs.m_BlueMask &&
|
||||
// m_AlphaMask == rhs.m_AlphaMask
|
||||
// );
|
||||
// }
|
||||
bool IsHWEqual(const VxImageDescEx& rhs) const;
|
||||
// bool IsMaskEqual(const VxImageDescEx& rhs) const;
|
||||
|
||||
//public:
|
||||
// CKDWORD m_RedMask;
|
||||
|
||||
Reference in New Issue
Block a user