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

EMSUSD-1351 - MayaUsd: Code cleanup - Filenames according to coding standard #3815

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
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
4 changes: 2 additions & 2 deletions lib/mayaUsd/fileio/translators/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ target_sources(${PROJECT_NAME}
translatorNurbsPatch.cpp
translatorPrim.cpp
translatorRfMLight.cpp
translatorRfMLight_deprecated.cpp
translatorRfMLightDeprecated.cpp
translatorSkel.cpp
translatorUtil.cpp
translatorXformable.cpp
translatorXformable_decompose.cpp
translatorXformableDecompose.cpp
)

set(HEADERS
Expand Down
4 changes: 2 additions & 2 deletions lib/mayaUsd/render/px_vp20/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ target_sources(${PROJECT_NAME}
PRIVATE
glslProgram.cpp
utils.cpp
utils_legacy.cpp
utilsLegacy.cpp
)

set(HEADERS
glslProgram.h
utils.h
utils_legacy.h
utilsLegacy.h
)

# -----------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
#include "utils_legacy.h"
#include "utilsLegacy.h"

#include <pxr/base/gf/matrix4d.h>
#include <pxr/pxr.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
#ifndef PXVP20_UTILS_LEGACY_H
#define PXVP20_UTILS_LEGACY_H

/// \file px_vp20/utils_legacy.h

#include <mayaUsd/base/api.h>

#include <pxr/base/gf/matrix4d.h>
Expand Down
2 changes: 1 addition & 1 deletion lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "batchRenderer.h"

#include <mayaUsd/render/px_vp20/utils.h>
#include <mayaUsd/render/px_vp20/utils_legacy.h>
#include <mayaUsd/render/px_vp20/utilsLegacy.h>
#include <mayaUsd/render/pxrUsdMayaGL/debugCodes.h>
#include <mayaUsd/render/pxrUsdMayaGL/userData.h>

Expand Down
2 changes: 1 addition & 1 deletion lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "proxyShapeUI.h"

#include <mayaUsd/nodes/proxyShapeBase.h>
#include <mayaUsd/render/px_vp20/utils_legacy.h>
#include <mayaUsd/render/px_vp20/utilsLegacy.h>
#include <mayaUsd/render/pxrUsdMayaGL/batchRenderer.h>
#include <mayaUsd/render/pxrUsdMayaGL/renderParams.h>
#include <mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h>
Expand Down
2 changes: 1 addition & 1 deletion lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "shapeAdapter.h"

#include <mayaUsd/base/api.h>
#include <mayaUsd/render/px_vp20/utils_legacy.h>
#include <mayaUsd/render/px_vp20/utilsLegacy.h>
#include <mayaUsd/render/pxrUsdMayaGL/batchRenderer.h>
#include <mayaUsd/render/pxrUsdMayaGL/debugCodes.h>
#include <mayaUsd/render/pxrUsdMayaGL/renderParams.h>
Expand Down
6 changes: 3 additions & 3 deletions lib/mayaUsd/render/vp2RenderDelegate/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ target_sources(${PROJECT_NAME}
basisCurves.cpp
bboxGeom.cpp
debugCodes.cpp
draw_item.cpp
drawItem.cpp
extComputation.cpp
instancer.cpp
material.cpp
Expand All @@ -16,8 +16,8 @@ target_sources(${PROJECT_NAME}
points.cpp
proxyRenderDelegate.cpp
colorManagementPreferences.cpp
render_delegate.cpp
render_param.cpp
renderDelegate.cpp
renderParam.cpp
sampler.cpp
shader.cpp
tokens.cpp
Expand Down
4 changes: 2 additions & 2 deletions lib/mayaUsd/render/vp2RenderDelegate/basisCurves.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@

#include "bboxGeom.h"
#include "debugCodes.h"
#include "draw_item.h"
#include "drawItem.h"
#include "instancer.h"
#include "material.h"
#include "render_delegate.h"
#include "renderDelegate.h"
#include "tokens.h"

#include <pxr/base/gf/matrix4d.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
#include "draw_item.h"
#include "drawItem.h"

#include "render_delegate.h"
#include "renderDelegate.h"

#include <pxr/imaging/hd/mesh.h>

Expand Down
2 changes: 1 addition & 1 deletion lib/mayaUsd/render/vp2RenderDelegate/material.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "debugCodes.h"
#include "pxr/usd/sdr/registry.h"
#include "pxr/usd/sdr/shaderNode.h"
#include "render_delegate.h"
#include "renderDelegate.h"
#include "tokens.h"

#include <mayaUsd/base/tokens.h>
Expand Down
2 changes: 1 addition & 1 deletion lib/mayaUsd/render/vp2RenderDelegate/mayaPrimCommon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include "bboxGeom.h"
#include "material.h"
#include "render_delegate.h"
#include "renderDelegate.h"
#include "tokens.h"

#include <pxr/usdImaging/usdImaging/delegate.h>
Expand Down
2 changes: 1 addition & 1 deletion lib/mayaUsd/render/vp2RenderDelegate/mayaPrimCommon.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#ifndef HD_VP2_MAYA_PRIM_COMMON
#define HD_VP2_MAYA_PRIM_COMMON

#include "draw_item.h"
#include "drawItem.h"
#include "pxr/imaging/hd/changeTracker.h"
#include "pxr/imaging/hd/types.h"

Expand Down
2 changes: 1 addition & 1 deletion lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "debugCodes.h"
#include "instancer.h"
#include "material.h"
#include "render_delegate.h"
#include "renderDelegate.h"
#include "tokens.h"

#include <mayaUsd/base/tokens.h>
Expand Down
2 changes: 1 addition & 1 deletion lib/mayaUsd/render/vp2RenderDelegate/mesh.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#ifndef HD_VP2_MESH
#define HD_VP2_MESH

#include "draw_item.h"
#include "drawItem.h"
#include "mayaPrimCommon.h"
#include "meshViewportCompute.h"
#include "primvarInfo.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#ifdef HDVP2_ENABLE_GPU_COMPUTE

#include "mesh.h"
#include "render_delegate.h"
#include "renderDelegate.h"

#include <mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h>

Expand Down
4 changes: 2 additions & 2 deletions lib/mayaUsd/render/vp2RenderDelegate/points.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@

#include "bboxGeom.h"
#include "debugCodes.h"
#include "draw_item.h"
#include "drawItem.h"
#include "instancer.h"
#include "material.h"
#include "render_delegate.h"
#include "renderDelegate.h"
#include "tokens.h"

#include <pxr/base/gf/matrix4d.h>
Expand Down
2 changes: 1 addition & 1 deletion lib/mayaUsd/render/vp2RenderDelegate/primvarInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#ifndef HD_VP2_PRIMVARINFO
#define HD_VP2_PRIMVARINFO

#include "draw_item.h"
#include "drawItem.h"
#include "meshViewportCompute.h"

#include <mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h>
Expand Down
4 changes: 2 additions & 2 deletions lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
//
#include "proxyRenderDelegate.h"

#include "draw_item.h"
#include "drawItem.h"
#include "material.h"
#include "mayaPrimCommon.h"
#include "render_delegate.h"
#include "renderDelegate.h"
#include "tokens.h"

#include <mayaUsd/base/tokens.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
#include "render_delegate.h"
#include "renderDelegate.h"

#include "basisCurves.h"
#include "bboxGeom.h"
Expand All @@ -22,7 +22,7 @@
#include "material.h"
#include "mesh.h"
#include "points.h"
#include "render_pass.h"
#include "renderPass.h"
#include "tokens.h"

#include <mayaUsd/render/vp2ShaderFragments/shaderFragments.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
#ifndef HD_VP2_RENDER_DELEGATE
#define HD_VP2_RENDER_DELEGATE

#include "render_param.h"
#include "resource_registry.h"
#include "renderParam.h"
#include "resourceRegistry.h"
#include "shader.h"

#include <pxr/imaging/hd/renderDelegate.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
#include "render_param.h"
#include "renderParam.h"

#include <maya/MProfiler.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#ifndef HD_VP2_RESOURCE_REGISTRY
#define HD_VP2_RESOURCE_REGISTRY

#include "task_commit.h"
#include "taskCommit.h"

#include <tbb/concurrent_queue.h>
#include <tbb/tbb_allocator.h>
Expand Down
4 changes: 2 additions & 2 deletions lib/usd/translators/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ target_sources(${TARGET_NAME}
jointWriter.cpp
lightReader.cpp
lightRfMWriter.cpp
lightRfMWriter_PxrMeshLight.cpp
lightRfMWriterPxrMeshLight.cpp
lightWriter.cpp
locatorWriter.cpp
materialReader.cpp
mayaReferenceReader.cpp
meshReader.cpp
meshWriter.cpp
meshWriter_BlendShapes.cpp
meshWriterBlendShapes.cpp
nurbsCurvesReader.cpp
nurbsCurveWriter.cpp
nurbsPatchReader.cpp
Expand Down
2 changes: 1 addition & 1 deletion lib/usd/translators/lightRfMWriter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ PXRUSDMAYA_DEFINE_WRITER(PxrRectLight, args, context)
return UsdMayaTranslatorRfMLight::Write(args, context);
}

// see lightRfMWriter_PxrMeshLight.cpp for PxrMeshLight.
// see lightRfMWriterPxrMeshLight.cpp for PxrMeshLight.

PXRUSDMAYA_DEFINE_WRITER(PxrSphereLight, args, context)
{
Expand Down