lili/opennurbs
1
0
Fork 0
mirror of https://github.com/mcneel/opennurbs.git synced 2026-04-01 00:36:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sync changes from upstream repository

Browse Source
This commit is contained in:
Bozo the Builder
2024-08-22 01:43:04 -07:00
parent ae65ce6693
commit 904ef7893c
202 changed files with 1884 additions and 1694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
opennurbs_render_content.cpp
View File

@@ -225,12 +225,6 @@ ON_UUID RdkPlugInId(void)
return uuid;
}
ON_UUID UniversalRenderEngineId(void)
{
static ON_UUID uuid = { 0x99999999, 0x9999, 0x9999, { 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99 } };
return uuid;
}
class ON_RenderContentPrivate
{
public:
@@ -722,7 +716,7 @@ ON_RenderContent::ON_RenderContent(const wchar_t* kind)
_private->InternalSetPropertyValue(ON_RENDER_CONTENT_PLUG_IN_ID, RdkPlugInId());
// Set the render engine id to 'universal'.
_private->InternalSetPropertyValue(ON_RENDER_CONTENT_RENDER_ENGINE_ID, UniversalRenderEngineId());
_private->InternalSetPropertyValue(ON_RENDER_CONTENT_RENDER_ENGINE_ID, ON_UniversalRenderEngineId);
}
ON_RenderContent::ON_RenderContent(const ON_RenderContent& rc)
@@ -1773,10 +1767,8 @@ int ONX_Model::AddRenderMaterial(const wchar_t* candidate_name)
if (!ON_ModelComponent::IsValidComponentName(candidate_name))
return ON_UNSET_INT_INDEX;
static ON_UUID uuidPB = { 0x5a8d7b9b, 0xcdc9, 0x49de, { 0x8c, 0x16, 0x2e, 0xf6, 0x4f, 0xb0, 0x97, 0xab } };
ON_RenderMaterial mat;
mat.SetTypeId(uuidPB);
mat.SetTypeId(ON_RenderContentType_PhysicallyBasedMaterial);
const ON_wString mat_name = m_manifest.UnusedName(mat.ComponentType(), ON_nil_uuid, candidate_name,
nullptr, nullptr, 0, nullptr);
@@ -1798,10 +1790,8 @@ int ONX_Model::AddRenderEnvironment(const wchar_t* candidate_name)
if (!ON_ModelComponent::IsValidComponentName(candidate_name))
return ON_UNSET_INT_INDEX;
static ON_UUID uuidBE = { 0xba51ce00, 0xba51, 0xce00, { 0xba, 0x51, 0xce, 0xba, 0x51, 0xce, 0x00, 0x00 } };
ON_RenderEnvironment env;
env.SetTypeId(uuidBE);
env.SetTypeId(ON_RenderContentType_BasicEnvironment);
const ON_wString env_name = m_manifest.UnusedName(env.ComponentType(), ON_nil_uuid, candidate_name,
nullptr, nullptr, 0, nullptr);
@@ -1828,10 +1818,8 @@ int ONX_Model::AddRenderTexture(const wchar_t* filename)
return ON_UNSET_INT_INDEX;
}
static const ON_UUID uuidBM = { 0x57e0ed08, 0x1907, 0x4529, { 0xb0, 0x1b, 0x0c, 0x4a, 0x24, 0x24, 0x55, 0xfd } };
ON_RenderTexture tex;
tex.SetTypeId(uuidBM);
tex.SetTypeId(ON_RenderContentType_BitmapTexture);
tex.SetParameter(ON_RENDER_TEXTURE_FILENAME, clean_filename);
const ON_wString candidate_name = ON_FileSystemPath::FileNameFromPath(clean_filename, false);
@@ -1840,7 +1828,7 @@ int ONX_Model::AddRenderTexture(const wchar_t* filename)
tex.SetName(tex_name);
const ON_ModelComponentReference mcr = AddModelComponent(tex, true);
const auto* model_tex = ON_RenderTexture::Cast(mcr.ModelComponent());
const ON_RenderTexture* model_tex = ON_RenderTexture::Cast(mcr.ModelComponent());
if (nullptr == model_tex)
{
ON_ERROR("Failed to add render texture; AddModelComponent() failed");
@@ -1855,3 +1843,62 @@ ON_DECL void ON_EnsureNameValid(ON_wString& name)
{
EnsureNameValid(name);
}
ON_UUID ON_UniversalRenderEngineId = { 0x99999999, 0x9999, 0x9999, { 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99 } };
ON_UUID ON_RenderContentType_2DCheckerTexture = { 0xfd60c44e, 0x080c, 0x4967, { 0x92, 0xaa, 0x41, 0x0e, 0x8a, 0xa9, 0x5a, 0x0f } };
ON_UUID ON_RenderContentType_3DCheckerTexture = { 0x6cdbb011, 0x3e2a, 0x4769, { 0x87, 0x2f, 0xe3, 0x89, 0x65, 0x63, 0xea, 0x3a } };
ON_UUID ON_RenderContentType_AddTexture = { 0xdbfae616, 0x1ffb, 0x4b75, { 0xa6, 0x46, 0x1c, 0x7f, 0xa8, 0x9a, 0xa9, 0xb3 } };
ON_UUID ON_RenderContentType_AdvancedDotTexture = { 0x9b654648, 0x5799, 0x41bf, { 0x82, 0x3c, 0x48, 0x31, 0x4d, 0x1e, 0xb6, 0xaa } };
ON_UUID ON_RenderContentType_BasicEnvironment = { 0xba51ce00, 0xba51, 0xce00, { 0xba, 0x51, 0xce, 0xba, 0x51, 0xce, 0x00, 0x00 } };
ON_UUID ON_RenderContentType_BitmapTexture = { 0x57e0ed08, 0x1907, 0x4529, { 0xb0, 0x1b, 0x0c, 0x4a, 0x24, 0x24, 0x55, 0xfd } };
ON_UUID ON_RenderContentType_BlendMaterial = { 0xb1e4d000, 0xb1e4, 0xd000, { 0xb1, 0xe4, 0xd0, 0xb1, 0xe4, 0xd0, 0x07, 0x09 } };
ON_UUID ON_RenderContentType_BlendMaterial_V8 = { 0x0322370f, 0xa9af, 0x4264, { 0xa5, 0x7c, 0x58, 0xff, 0x8e, 0x43, 0x45, 0xdd } };
ON_UUID ON_RenderContentType_BlendTexture = { 0x3fa30f00, 0x4c3f, 0x4afe, { 0x88, 0xab, 0xd7, 0x13, 0xb0, 0xbe, 0x2f, 0xd8 } };
ON_UUID ON_RenderContentType_CompositeMaterial = { 0x4eb8c64d, 0xde99, 0x45cb, { 0xb3, 0x7e, 0x68, 0x85, 0xb4, 0x07, 0x2a, 0x4d } };
ON_UUID ON_RenderContentType_CustomMaterial = { 0xba51c000, 0xba51, 0xc000, { 0xba, 0x51, 0xc0, 0xba, 0x51, 0xc0, 0x00, 0x00 } };
ON_UUID ON_RenderContentType_DefaultMaterial = { 0xdefadefa, 0xdefa, 0xdefa, { 0xde, 0xfa, 0xde, 0xfa, 0xde, 0xfa, 0xde, 0xfa } };
ON_UUID ON_RenderContentType_DefaultEnvironment = { 0xdefaeeee, 0xdefa, 0xeeee, { 0xde, 0xfa, 0xee, 0xee, 0xde, 0xfa, 0xee, 0xee } };
ON_UUID ON_RenderContentType_CrossHatchBumpTexture = { 0x6e9c1863, 0x9015, 0x44a4, { 0xaf, 0x6c, 0xc4, 0x27, 0x21, 0x0e, 0xa8, 0xde } };
ON_UUID ON_RenderContentType_CubeMapTexture = { 0x956c41fa, 0xa03b, 0x4733, { 0xaf, 0xe7, 0x23, 0x44, 0xaa, 0x00, 0x82, 0xdd } };
ON_UUID ON_RenderContentType_DisplayAttributeMaterial = { 0xc85d18a8, 0x68dd, 0x49fd, { 0xae, 0x3e, 0x72, 0xa3, 0x79, 0xc8, 0xc4, 0x86 } };
ON_UUID ON_RenderContentType_DotBumpTexture = { 0xfee0999d, 0x26f1, 0x4aea, { 0x81, 0xfe, 0x85, 0x70, 0x28, 0x6a, 0xe9, 0x64 } };
ON_UUID ON_RenderContentType_DoubleSidedMaterial = { 0xe6cd1973, 0xb739, 0x496e, { 0xab, 0x69, 0x32, 0x95, 0x7f, 0xa4, 0x84, 0x92 } };
ON_UUID ON_RenderContentType_EmissionMaterial = { 0x94bb5698, 0xb0cd, 0x4d6e, { 0x84, 0xd7, 0xd2, 0x6f, 0x79, 0x81, 0x7d, 0x6e } };
ON_UUID ON_RenderContentType_ExposureTexture = { 0x0f2f3b9b, 0xa330, 0x418c, { 0x83, 0x71, 0xf9, 0xf4, 0xe7, 0x61, 0xbe, 0x3c } };
ON_UUID ON_RenderContentType_FBmTexture = { 0x8edbb011, 0x4e2a, 0x5769, { 0x87, 0x2f, 0xe3, 0x89, 0x65, 0x63, 0xea, 0x3b } };
ON_UUID ON_RenderContentType_GemMaterial = { 0x5386a427, 0x85bb, 0x48a8, { 0x82, 0xa8, 0x10, 0x9f, 0xf0, 0x19, 0x27, 0xc3 } };
ON_UUID ON_RenderContentType_GlassMaterial = { 0x51b4af08, 0x9dec, 0x4744, { 0x86, 0xf9, 0x54, 0x6f, 0xba, 0xcb, 0x80, 0x0d } };
ON_UUID ON_RenderContentType_GradientTexture = { 0x8edbb013, 0x1e2b, 0x2669, { 0x87, 0x2f, 0xe3, 0x89, 0x65, 0x63, 0xea, 0x3b } };
ON_UUID ON_RenderContentType_GraniteTexture = { 0x56587545, 0xb6de, 0x4f1f, { 0x8c, 0x60, 0x46, 0x39, 0xa2, 0x13, 0x8d, 0x8c } };
ON_UUID ON_RenderContentType_GridTexture = { 0x809acd47, 0x00c8, 0x4c2f, { 0xae, 0x38, 0xaa, 0x5e, 0x3d, 0x8b, 0xea, 0xc7 } };
ON_UUID ON_RenderContentType_GritBumpTexture = { 0x1b762bb6, 0x8b95, 0x4c1b, { 0xb3, 0x38, 0x45, 0x93, 0xc3, 0x3f, 0xfb, 0x65 } };
ON_UUID ON_RenderContentType_HatchBumpTexture = { 0xb4e3a0dd, 0x6b65, 0x4612, { 0x84, 0xb3, 0xcc, 0x64, 0xdd, 0xda, 0x49, 0x6e } };
ON_UUID ON_RenderContentType_HDRTexture = { 0xf28c2d86, 0x0466, 0x40d4, { 0x89, 0xee, 0xa5, 0x4b, 0x6c, 0x5e, 0x92, 0x88 } };
ON_UUID ON_RenderContentType_LeatherBumpTexture = { 0x5dfb43e6, 0x2f03, 0x432f, { 0xbe, 0xcf, 0x9f, 0x9a, 0xb3, 0x0c, 0x89, 0x41 } };
ON_UUID ON_RenderContentType_MarbleTexture = { 0xa6cae674, 0xb2cd, 0x4585, { 0xa2, 0xbe, 0x9a, 0xb2, 0xe5, 0x0d, 0x35, 0x76 } };
ON_UUID ON_RenderContentType_MaskTexture = { 0xb047bd26, 0x32eb, 0x43f7, { 0x9a, 0x4e, 0x6a, 0x82, 0x8c, 0x22, 0x67, 0xd1 } };
ON_UUID ON_RenderContentType_MetalMaterial = { 0x037469d6, 0x0b9a, 0x4e5f, { 0xaf, 0x10, 0xe4, 0x83, 0xc9, 0x92, 0x99, 0x3a } };
ON_UUID ON_RenderContentType_MultiplyTexture = { 0x95bf2b4a, 0xc79b, 0x48e8, { 0x97, 0xd0, 0x25, 0x84, 0xf2, 0xe8, 0xe5, 0x2b } };
ON_UUID ON_RenderContentType_NoiseTexture = { 0x9b787367, 0xebbc, 0x4865, { 0xaf, 0x18, 0xfd, 0x9d, 0xab, 0x7e, 0xb1, 0x77 } };
ON_UUID ON_RenderContentType_PaintMaterial = { 0x492fafa5, 0x0e48, 0x4c8e, { 0x89, 0xa0, 0x08, 0xd3, 0xa1, 0x9b, 0xfe, 0x89 } };
ON_UUID ON_RenderContentType_PerlinMarbleTexture = { 0x113245f5, 0x2f12, 0x4e26, { 0x8d, 0xec, 0xb1, 0x18, 0x30, 0x40, 0x2c, 0x47 } };
ON_UUID ON_RenderContentType_PerturbingTexture = { 0xe26c301a, 0xcad4, 0x4420, { 0x9e, 0xe6, 0xc4, 0x05, 0x62, 0xa2, 0xc9, 0xdd } };
ON_UUID ON_RenderContentType_PhysicallyBasedMaterial = { 0x5a8d7b9b, 0xcdc9, 0x49de, { 0x8c, 0x16, 0x2e, 0xf6, 0x4f, 0xb0, 0x97, 0xab } };
ON_UUID ON_RenderContentType_PhysicalSkyTexture = { 0xfd8913b1, 0x1654, 0x47c5, { 0x8f, 0xd2, 0xe1, 0xf0, 0x29, 0xdd, 0x4a, 0xb4 } };
ON_UUID ON_RenderContentType_PictureMaterial = { 0xa7e351be, 0x9546, 0x42dc, { 0x89, 0x40, 0x88, 0x67, 0xf2, 0x82, 0x90, 0x31 } };
ON_UUID ON_RenderContentType_PlasterMaterial = { 0x6736887e, 0x11dd, 0x4782, { 0x8c, 0xc9, 0xd5, 0x0e, 0x41, 0xff, 0x45, 0xb0 } };
ON_UUID ON_RenderContentType_PlasticMaterial = { 0xab3f2653, 0x4d79, 0x459d, { 0x90, 0x03, 0x1a, 0x63, 0xd9, 0x65, 0x06, 0x2d } };
ON_UUID ON_RenderContentType_ProjectionChangerTexture = { 0x103da058, 0x9de8, 0x4270, { 0xb9, 0x20, 0xbc, 0xac, 0xe5, 0xa6, 0xc7, 0xd9 } };
ON_UUID ON_RenderContentType_RealtimeDisplayMaterial = ON_RenderContentType_DoubleSidedMaterial;
ON_UUID ON_RenderContentType_ResampleTexture = { 0x71d5feef, 0x4144, 0x4133, { 0x8c, 0x38, 0x1e, 0xef, 0x2b, 0xc8, 0x51, 0xf1 } };
ON_UUID ON_RenderContentType_SimpleBitmapTexture = { 0xcfb368a4, 0xffb2, 0x404a, { 0xbb, 0xa9, 0x49, 0x72, 0x03, 0xb5, 0x05, 0x3a } };
ON_UUID ON_RenderContentType_SingleColorTexture = { 0xb9368b92, 0x9f02, 0x45fb, { 0xb6, 0xcf, 0x09, 0x5e, 0xf8, 0x46, 0x35, 0x50 } };
ON_UUID ON_RenderContentType_SpeckleBumpTexture = { 0xf1bf487d, 0xe84d, 0x4693, { 0xaf, 0xfc, 0x3f, 0x39, 0xf2, 0x39, 0xc2, 0x6c } };
ON_UUID ON_RenderContentType_StuccoTexture = { 0x9d5173c5, 0x5f01, 0x4832, { 0xa4, 0x51, 0xa0, 0x22, 0x07, 0x4b, 0xa2, 0x08 } };
ON_UUID ON_RenderContentType_TextureAdjustmentTexture = { 0x79c30c49, 0xed60, 0x4c14, { 0xab, 0x9b, 0x02, 0x24, 0x3f, 0x5c, 0xaf, 0x7f } };
ON_UUID ON_RenderContentType_TileTexture = { 0x7edbb011, 0x4e2a, 0x5769, { 0x87, 0x2f, 0xe3, 0x89, 0x65, 0x63, 0xea, 0x3a } };
ON_UUID ON_RenderContentType_TurbulenceTexture = { 0x9edbb011, 0x4e2a, 0x5769, { 0x87, 0x2f, 0xe3, 0x89, 0x65, 0x63, 0xea, 0x3c } };
ON_UUID ON_RenderContentType_WavesTexture = { 0xbbb53de4, 0x265e, 0x416c, { 0xa2, 0x19, 0x6c, 0x98, 0x2e, 0x70, 0x03, 0x5f } };
ON_UUID ON_RenderContentType_WoodBumpTexture = { 0x757ca668, 0x47c9, 0x43b2, { 0xbb, 0x58, 0x19, 0x03, 0xce, 0x9a, 0x7a, 0x72 } };
ON_UUID ON_RenderContentType_WoodTexture = { 0x11700849, 0xa326, 0x4538, { 0xbd, 0x44, 0x11, 0x86, 0x46, 0x90, 0xda, 0x68 } };