Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PrimitiveVariableTweaks #6173

Draft
wants to merge 4 commits into
base: 1.5_maintenance
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Features
- Inference : Loads ONNX models and performance inference using an array of input tensors.
- ImageToTensor : Converts images to tensors for use with the Inference node.
- TensorToImage : Converts tensors back to images following inference.
- PrimiitiveVariableTweaks : Added node for tweaking primitive variables. Can affect just part of a primitive based on ids or a mask.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PrimiitiveVariableTweaks -> PrimitiveVariableTweaks


API
---
Expand Down
102 changes: 102 additions & 0 deletions include/GafferScene/PrimitiveVariableTweaks.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
//////////////////////////////////////////////////////////////////////////
//
// Copyright (c) 2024, Image Engine Design Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above
// copyright notice, this list of conditions and the following
// disclaimer.
//
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following
// disclaimer in the documentation and/or other materials provided with
// the distribution.
//
// * Neither the name of John Haddon nor the names of
// any other contributors to this software may be used to endorse or
// promote products derived from this software without specific prior
// written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
//////////////////////////////////////////////////////////////////////////

#pragma once

#include "GafferScene/ObjectProcessor.h"

#include "Gaffer/TweakPlug.h"

namespace GafferScene
{

class GAFFERSCENE_API PrimitiveVariableTweaks : public ObjectProcessor
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we can tweak "P", we should probably derive from ObjectProcessor so we can get the bounds right. CopyPrimitiveVariables gives an example of doing this without invoking the cost of bounds propagation unless "P" is actually written to. Alternatively, we could refuse to write to "P" for now.

{

public :

enum class SelectionMode
{
All,
IdList,
IdListPrimitiveVariable,
MaskPrimitiveVariable
};

explicit PrimitiveVariableTweaks( const std::string &name=defaultName<PrimitiveVariableTweaks>() );
~PrimitiveVariableTweaks() override;

GAFFER_NODE_DECLARE_TYPE( GafferScene::PrimitiveVariableTweaks, PrimitiveVariableTweaksTypeId, ObjectProcessor );

Gaffer::IntPlug *interpolationPlug();
const Gaffer::IntPlug *interpolationPlug() const;

Gaffer::IntPlug *selectionModePlug();
const Gaffer::IntPlug *selectionModePlug() const;

Gaffer::Int64VectorDataPlug *idListPlug();
const Gaffer::Int64VectorDataPlug *idListPlug() const;

Gaffer::StringPlug *idListVariablePlug();
const Gaffer::StringPlug *idListVariablePlug() const;

Gaffer::StringPlug *idPlug();
const Gaffer::StringPlug *idPlug() const;

Gaffer::StringPlug *maskVariablePlug();
const Gaffer::StringPlug *maskVariablePlug() const;

Gaffer::BoolPlug *ignoreMissingPlug();
const Gaffer::BoolPlug *ignoreMissingPlug() const;

Gaffer::TweaksPlug *tweaksPlug();
const Gaffer::TweaksPlug *tweaksPlug() const;

protected :

bool affectsProcessedObject( const Gaffer::Plug *input ) const override;
void hashProcessedObject( const ScenePath &path, const Gaffer::Context *context, IECore::MurmurHash &h ) const override;
IECore::ConstObjectPtr computeProcessedObject( const ScenePath &path, const Gaffer::Context *context, const IECore::Object *inputObject ) const override;

private :

static size_t g_firstPlugIndex;

};

IE_CORE_DECLAREPTR( PrimitiveVariableTweaks )

} // namespace GafferScene
2 changes: 1 addition & 1 deletion include/GafferScene/TypeIds.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ enum TypeId
PruneTypeId = 110546,
FreezeTransformTypeId = 110547,
MeshDistortionTypeId = 110548,
OpenGLRenderTypeId = 110549, // Available for reuse
PrimitiveVariableTweaksTypeId = 110549,
InteractiveRenderTypeId = 110550,
CubeTypeId = 110551,
SphereTypeId = 110552,
Expand Down
Loading