drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename normalize to normalizeNormalMap

Browse Source
This commit is contained in:
castano
2007-11-22 01:52:10 +00:00
parent fd9ae63a4f
commit c36bf421f5
3 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvimage/NormalMap.cpp
View File

@ -130,7 +130,7 @@ FloatImage * nv::createNormalMap(const Image * img, FloatImage::WrapMode wm, Vec
} }
/// Normalize the given image in place. /// Normalize the given image in place.
void nv::normalize(FloatImage * img) void nv::normalizeNormalMap(FloatImage * img)
{ {
nvCheck(img != NULL); nvCheck(img != NULL);
img->expandNormals(0); img->expandNormals(0);

68
src/nvimage/NormalMap.h
View File

@ -19,37 +19,37 @@
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#ifndef NV_IMAGE_NORMALMAP_H #ifndef NV_IMAGE_NORMALMAP_H
#define NV_IMAGE_NORMALMAP_H #define NV_IMAGE_NORMALMAP_H
#include <nvmath/Vector.h> #include <nvmath/Vector.h>
#include <nvimage/nvimage.h> #include <nvimage/nvimage.h>
#include <nvimage/FloatImage.h> #include <nvimage/FloatImage.h>
namespace nv namespace nv
{ {
class Image; class Image;
enum NormalMapFilter enum NormalMapFilter
{ {
NormalMapFilter_Sobel3x3, // fine detail NormalMapFilter_Sobel3x3, // fine detail
NormalMapFilter_Sobel5x5, // medium detail NormalMapFilter_Sobel5x5, // medium detail
NormalMapFilter_Sobel7x7, // large detail NormalMapFilter_Sobel7x7, // large detail
NormalMapFilter_Sobel9x9, // very large NormalMapFilter_Sobel9x9, // very large
}; };
FloatImage * createNormalMap(const Image * img, FloatImage::WrapMode wm, Vector4::Arg heightWeights, NormalMapFilter filter = NormalMapFilter_Sobel3x3); FloatImage * createNormalMap(const Image * img, FloatImage::WrapMode wm, Vector4::Arg heightWeights, NormalMapFilter filter = NormalMapFilter_Sobel3x3);
FloatImage * createNormalMap(const Image * img, FloatImage::WrapMode wm, Vector4::Arg heightWeights, Vector4::Arg filterWeights); FloatImage * createNormalMap(const Image * img, FloatImage::WrapMode wm, Vector4::Arg heightWeights, Vector4::Arg filterWeights);
void normalize(FloatImage * img); void normalizeNormalMap(FloatImage * img);
// @@ Add generation of DU/DV maps. // @@ Add generation of DU/DV maps.
} // nv namespace } // nv namespace
#endif // NV_IMAGE_NORMALMAP_H #endif // NV_IMAGE_NORMALMAP_H

2
src/nvtt/nvtt.cpp
View File

@ -339,7 +339,7 @@ static FloatImage * createMipmap(const FloatImage * floatImage, const InputOptio
// Normalize mipmap. // Normalize mipmap.
if (inputOptions.normalizeMipmaps) if (inputOptions.normalizeMipmaps)
{ {
normalize(result); normalizeNormalMap(result);
} }
return result; return result;