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

Sync changes from upstream repository

Browse Source 
Co-authored-by: croudyj <croudyj@gmail.com>
Co-authored-by: Dale Lear <dalelear@mcneel.com>
Co-authored-by: kike-garbo <kike@mcneel.com>
Co-authored-by: piac <giulio@mcneel.com>
Co-authored-by: Steve Baer <steve@mcneel.com>
This commit is contained in:
Bozo the Builder
2023-07-11 10:47:32 -07:00
parent c0e8097eb9
commit 1b649d7330
25 changed files with 248 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
opennurbs_render_content.cpp
View File

@@ -261,12 +261,12 @@ ON_Color ON_Environment::BackgroundColor(void) const
return m_impl->m_back_col;
}
void ON_Environment::SetBackgroundColor(ON_Color color)
void ON_Environment::SetBackgroundColor(const ON_Color& col)
{
m_impl->m_back_col = color;
m_impl->m_back_col = col;
}
ON_Texture ON_Environment::BackgroundImage(void) const
const ON_Texture& ON_Environment::BackgroundImage(void) const
{
return m_impl->m_back_image;
}
@@ -977,22 +977,22 @@ ON_RenderContent::ChildIterator ON_RenderContent::GetChildIterator(void) const
return ChildIterator(this);
}
const ON_RenderContent* ON_RenderContent::Parent(void) const
ON_RenderContent* ON_RenderContent::Parent(void) const
{
return _private->m_parent;
}
const ON_RenderContent* ON_RenderContent::FirstChild(void) const
ON_RenderContent* ON_RenderContent::FirstChild(void) const
{
return _private->m_first_child;
}
const ON_RenderContent* ON_RenderContent::NextSibling(void) const
ON_RenderContent* ON_RenderContent::NextSibling(void) const
{
return _private->m_next_sibling;
}
const ON_RenderContent& ON_RenderContent::TopLevel(void) const
ON_RenderContent& ON_RenderContent::TopLevel(void) const
{
return _private->TopLevel();
}
@@ -1310,6 +1310,11 @@ ON_Material ON_RenderMaterial::ToOnMaterial(void) const
return mat;
}
ON_RenderContent* ON_RenderMaterial::NewRenderContent(void) const
{
return new ON_RenderMaterial;
}
// ON_RenderEnvironment
ON_OBJECT_IMPLEMENT(ON_RenderEnvironment, ON_RenderContent, "A0AB8EF9-5FD4-4320-BBDA-A1200D1846E4");
@@ -1375,6 +1380,11 @@ ON_Environment ON_RenderEnvironment::ToOnEnvironment(void) const
return env;
}
ON_RenderContent* ON_RenderEnvironment::NewRenderContent(void) const
{
return new ON_RenderEnvironment;
}
// ON_RenderTexture
ON_OBJECT_IMPLEMENT(ON_RenderTexture, ON_RenderContent, "677D9905-CC8C-41E6-A7AD-2409DDE68ED0");
@@ -1511,6 +1521,17 @@ ON_wString ON_RenderTexture::Filename(void) const
return v.AsString();
}
bool ON_RenderTexture::SetFilename(const wchar_t* f)
{
return SetParameter(ON_RENDER_TEXTURE_FILENAME, f);
}
ON_RenderContent* ON_RenderTexture::NewRenderContent(void) const
{
return new ON_RenderTexture;
}
int ONX_Model::AddRenderMaterial(const wchar_t* mat_name)
{
static ON_UUID uuidPB = { 0x5a8d7b9b, 0xcdc9, 0x49de, { 0x8c, 0x16, 0x2e, 0xf6, 0x4f, 0xb0, 0x97, 0xab } };