-
-
Notifications
You must be signed in to change notification settings - Fork 2.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4393 from TerenceRussell/master
Added support for "map_Bump -bm"
- Loading branch information
Showing
4 changed files
with
94 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
/* | ||
--------------------------------------------------------------------------- | ||
Open Asset Import Library (assimp) | ||
--------------------------------------------------------------------------- | ||
Copyright (c) 2006-2022, assimp team | ||
All rights reserved. | ||
Redistribution and use of this software 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 the assimp team, nor the names of its | ||
contributors may be used to endorse or promote products | ||
derived from this software without specific prior | ||
written permission of the assimp team. | ||
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. | ||
--------------------------------------------------------------------------- | ||
*/ | ||
|
||
/** @file OBJMATERIAL.h | ||
* @brief Obj-specific material macros | ||
* | ||
*/ | ||
|
||
#ifndef AI_OBJMATERIAL_H_INC | ||
#define AI_OBJMATERIAL_H_INC | ||
|
||
#ifdef __GNUC__ | ||
# pragma GCC system_header | ||
#endif | ||
|
||
#include <assimp/material.h> | ||
|
||
// --------------------------------------------------------------------------- | ||
// Pure key names for all obj texture-related properties | ||
//! @cond MATS_DOC_FULL | ||
|
||
// support for bump -bm | ||
#define _AI_MATKEY_OBJ_BUMPMULT_BASE "$tex.bumpmult" | ||
//! @endcond | ||
|
||
// --------------------------------------------------------------------------- | ||
#define AI_MATKEY_OBJ_BUMPMULT(type, N) _AI_MATKEY_OBJ_BUMPMULT_BASE, type, N | ||
|
||
//! @cond MATS_DOC_FULL | ||
#define AI_MATKEY_OBJ_BUMPMULT_NORMALS(N) \ | ||
AI_MATKEY_OBJ_BUMPMULT(aiTextureType_NORMALS, N) | ||
|
||
#define AI_MATKEY_OBJ_BUMPMULT_HEIGHT(N) \ | ||
AI_MATKEY_OBJ_BUMPMULT(aiTextureType_HEIGHT, N) | ||
|
||
//! @endcond | ||
|
||
|
||
#endif |