mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-02-05 20:41:00 +00:00
157b114ec7
Added new inspector type TypeShapeAssetId which is processed as a assetId string instead of an AssetPtr. Added utility function to ShapeAsset to getAssetIdByFilename, which lets you find - if any exist - the asset that utilizes a given loose file. If it doesn't find one, it can attempt to run an auto-import if the editor settings allow, then proceed. Fixed callback of the shapeAsset inspector fields so the Open in Shape Editor correctly binds the asset's shape to the editor for modification. Added function to open a shapeAssetId in the shape editor to facilitate the above. Added additional check to findShapeConstructor to look up the full path of the shape in the cases where a full path is provided instead of a local path. This prevents the shapeConstructor from not finding shapes that absolutely exist. Added beginnings of Datablock representation in Asset Browser. Fixed a few minor issues with asset auto import causing false positive errors, preventing Import or erroneous logging. Fixed issue where editing of asset import configs didn't save. Fixed logic of materials in asset browser so they will open in the material editor as expected. Re-enabled AutoImport of assets editor setting by default.
122 lines
3.5 KiB
C++
122 lines
3.5 KiB
C++
#pragma once
|
|
//-----------------------------------------------------------------------------
|
|
// Copyright (c) 2013 GarageGames, LLC
|
|
//
|
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
// of this software and associated documentation files (the "Software"), to
|
|
// deal in the Software without restriction, including without limitation the
|
|
// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
|
// sell copies of the Software, and to permit persons to whom the Software is
|
|
// furnished to do so, subject to the following conditions:
|
|
//
|
|
// The above copyright notice and this permission notice shall be included in
|
|
// all copies or substantial portions of the Software.
|
|
//
|
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
// IN THE SOFTWARE.
|
|
//-----------------------------------------------------------------------------
|
|
#ifndef IMAGE_ASSET_H
|
|
#define IMAGE_ASSET_H
|
|
|
|
#ifndef _ASSET_BASE_H_
|
|
#include "assets/assetBase.h"
|
|
#endif
|
|
|
|
#ifndef _ASSET_DEFINITION_H_
|
|
#include "assets/assetDefinition.h"
|
|
#endif
|
|
|
|
#ifndef _STRINGUNIT_H_
|
|
#include "string/stringUnit.h"
|
|
#endif
|
|
|
|
#ifndef _ASSET_FIELD_TYPES_H_
|
|
#include "assets/assetFieldTypes.h"
|
|
#endif
|
|
#ifndef _ASSET_PTR_H_
|
|
#include "assets/assetPtr.h"
|
|
#endif
|
|
|
|
#include "gfx/bitmap/gBitmap.h"
|
|
#include "gfx/gfxTextureHandle.h"
|
|
|
|
//-----------------------------------------------------------------------------
|
|
class ImageAsset : public AssetBase
|
|
{
|
|
typedef AssetBase Parent;
|
|
|
|
public:
|
|
/// The different types of image use cases
|
|
enum ImageTypes
|
|
{
|
|
Albedo = 0,
|
|
Normal = 1,
|
|
Composite = 2,
|
|
GUI = 3,
|
|
Roughness = 4,
|
|
AO = 5,
|
|
Metalness = 6,
|
|
Glow = 7,
|
|
Particle = 8,
|
|
Decal = 9,
|
|
Cubemap = 10,
|
|
};
|
|
|
|
protected:
|
|
StringTableEntry mImageFileName;
|
|
|
|
GFXTexHandle mImage;
|
|
|
|
bool mIsValidImage;
|
|
bool mUseMips;
|
|
bool mIsHDRImage;
|
|
|
|
ImageTypes mImageType;
|
|
|
|
Map<GFXTextureProfile, GFXTexHandle> mResourceMap;
|
|
|
|
public:
|
|
ImageAsset();
|
|
virtual ~ImageAsset();
|
|
|
|
/// Engine.
|
|
static void initPersistFields();
|
|
virtual void copyTo(SimObject* object);
|
|
|
|
/// Declare Console Object.
|
|
DECLARE_CONOBJECT(ImageAsset);
|
|
|
|
void setImageFileName(const char* pScriptFile);
|
|
inline StringTableEntry getImageFileName(void) const { return mImageFileName; };
|
|
|
|
bool isValid() { return mIsValidImage; }
|
|
|
|
GFXTexHandle getImage(GFXTextureProfile requestedProfile);
|
|
|
|
const char* getImageInfo();
|
|
|
|
protected:
|
|
virtual void initializeAsset(void);
|
|
virtual void onAssetRefresh(void);
|
|
|
|
static bool setImageFileName(void *obj, const char *index, const char *data) { static_cast<ImageAsset*>(obj)->setImageFileName(data); return false; }
|
|
static const char* getImageFileName(void* obj, const char* data) { return static_cast<ImageAsset*>(obj)->getImageFileName(); }
|
|
|
|
void loadImage();
|
|
|
|
bool getAssetByFilename(StringTableEntry fileName, AssetPtr<ImageAsset>* imageAsset);
|
|
};
|
|
|
|
DefineConsoleType(TypeImageAssetPtr, ImageAsset)
|
|
|
|
typedef ImageAsset::ImageTypes ImageAssetType;
|
|
DefineEnumType(ImageAssetType);
|
|
|
|
#endif
|
|
|