Reorg header files.
This commit is contained in:
parent
7394644719
commit
c70e5d6121
|
@ -21,11 +21,13 @@
|
||||||
// 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.
|
||||||
|
|
||||||
|
#include "BlockDXT.h"
|
||||||
|
|
||||||
|
#include <nvimage/ColorBlock.h>
|
||||||
|
|
||||||
#include <nvcore/Stream.h>
|
#include <nvcore/Stream.h>
|
||||||
#include <nvcore/Containers.h> // swap
|
#include <nvcore/Containers.h> // swap
|
||||||
|
|
||||||
#include "ColorBlock.h"
|
|
||||||
#include "BlockDXT.h"
|
|
||||||
|
|
||||||
using namespace nv;
|
using namespace nv;
|
||||||
|
|
||||||
|
|
|
@ -21,16 +21,16 @@
|
||||||
// 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.
|
||||||
|
|
||||||
#include <nvcore/Debug.h>
|
|
||||||
#include <nvcore/Containers.h> // max
|
|
||||||
#include <nvcore/StdStream.h>
|
|
||||||
|
|
||||||
#include <nvimage/DirectDrawSurface.h>
|
#include <nvimage/DirectDrawSurface.h>
|
||||||
#include <nvimage/ColorBlock.h>
|
#include <nvimage/ColorBlock.h>
|
||||||
#include <nvimage/Image.h>
|
#include <nvimage/Image.h>
|
||||||
#include <nvimage/BlockDXT.h>
|
#include <nvimage/BlockDXT.h>
|
||||||
#include <nvimage/PixelFormat.h>
|
#include <nvimage/PixelFormat.h>
|
||||||
|
|
||||||
|
#include <nvcore/Debug.h>
|
||||||
|
#include <nvcore/Containers.h> // max
|
||||||
|
#include <nvcore/StdStream.h>
|
||||||
|
|
||||||
#include <string.h> // memset
|
#include <string.h> // memset
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -33,11 +33,10 @@
|
||||||
* http://www.dspguide.com/ch16.htm
|
* http://www.dspguide.com/ch16.htm
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "Filter.h"
|
||||||
|
|
||||||
#include <nvcore/Containers.h> // swap
|
|
||||||
#include <nvmath/nvmath.h> // fabs
|
|
||||||
#include <nvmath/Vector.h> // Vector4
|
#include <nvmath/Vector.h> // Vector4
|
||||||
#include <nvimage/Filter.h>
|
#include <nvcore/Containers.h> // swap
|
||||||
|
|
||||||
using namespace nv;
|
using namespace nv;
|
||||||
|
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
// This code is in the public domain -- castanyo@yahoo.es
|
// This code is in the public domain -- castanyo@yahoo.es
|
||||||
|
|
||||||
#include <nvcore/Containers.h>
|
|
||||||
#include <nvcore/Ptr.h>
|
|
||||||
|
|
||||||
#include <nvmath/Color.h>
|
|
||||||
#include <nvmath/Matrix.h>
|
|
||||||
|
|
||||||
#include "FloatImage.h"
|
#include "FloatImage.h"
|
||||||
#include "Filter.h"
|
#include "Filter.h"
|
||||||
#include "Image.h"
|
#include "Image.h"
|
||||||
|
|
||||||
|
#include <nvmath/Color.h>
|
||||||
|
#include <nvmath/Matrix.h>
|
||||||
|
|
||||||
|
#include <nvcore/Containers.h>
|
||||||
|
#include <nvcore/Ptr.h>
|
||||||
|
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
using namespace nv;
|
using namespace nv;
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
// This code is in the public domain -- castanyo@yahoo.es
|
// This code is in the public domain -- castanyo@yahoo.es
|
||||||
|
|
||||||
|
#include <nvimage/HoleFilling.h>
|
||||||
|
#include <nvimage/FloatImage.h>
|
||||||
|
|
||||||
|
#include <nvmath/nvmath.h>
|
||||||
|
|
||||||
#include <nvcore/Containers.h>
|
#include <nvcore/Containers.h>
|
||||||
#include <nvcore/Ptr.h>
|
#include <nvcore/Ptr.h>
|
||||||
|
|
||||||
#include <nvmath/nvmath.h>
|
|
||||||
|
|
||||||
#include <nvimage/HoleFilling.h>
|
|
||||||
#include <nvimage/FloatImage.h>
|
|
||||||
|
|
||||||
using namespace nv;
|
using namespace nv;
|
||||||
|
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
// This code is in the public domain -- castanyo@yahoo.es
|
// This code is in the public domain -- castanyo@yahoo.es
|
||||||
|
|
||||||
|
#include <nvimage/Image.h>
|
||||||
|
#include <nvimage/ImageIO.h>
|
||||||
|
|
||||||
|
#include <nvmath/Color.h>
|
||||||
|
|
||||||
#include <nvcore/Debug.h>
|
#include <nvcore/Debug.h>
|
||||||
#include <nvcore/Ptr.h>
|
#include <nvcore/Ptr.h>
|
||||||
#include <nvcore/Containers.h> // swap
|
#include <nvcore/Containers.h> // swap
|
||||||
|
|
||||||
#include <nvmath/Color.h>
|
|
||||||
|
|
||||||
#include <nvimage/Image.h>
|
|
||||||
#include <nvimage/ImageIO.h>
|
|
||||||
|
|
||||||
|
|
||||||
using namespace nv;
|
using namespace nv;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,13 @@
|
||||||
// This code is in the public domain -- castanyo@yahoo.es
|
// This code is in the public domain -- castanyo@yahoo.es
|
||||||
|
|
||||||
|
#include "ImageIO.h"
|
||||||
|
#include "Image.h"
|
||||||
|
#include "FloatImage.h"
|
||||||
|
#include "TgaFile.h"
|
||||||
|
#include "PsdFile.h"
|
||||||
|
|
||||||
|
#include <nvmath/Color.h>
|
||||||
|
|
||||||
#include <nvcore/Ptr.h>
|
#include <nvcore/Ptr.h>
|
||||||
#include <nvcore/Containers.h>
|
#include <nvcore/Containers.h>
|
||||||
#include <nvcore/StrLib.h>
|
#include <nvcore/StrLib.h>
|
||||||
|
@ -7,14 +15,6 @@
|
||||||
//#include <nvcore/Tokenizer.h> // @@ Disable temporarily
|
//#include <nvcore/Tokenizer.h> // @@ Disable temporarily
|
||||||
#include <nvcore/TextWriter.h>
|
#include <nvcore/TextWriter.h>
|
||||||
|
|
||||||
#include <nvmath/Color.h>
|
|
||||||
|
|
||||||
#include "ImageIO.h"
|
|
||||||
#include "Image.h"
|
|
||||||
#include "FloatImage.h"
|
|
||||||
#include "TgaFile.h"
|
|
||||||
#include "PsdFile.h"
|
|
||||||
|
|
||||||
// Extern
|
// Extern
|
||||||
#if defined(HAVE_JPEG)
|
#if defined(HAVE_JPEG)
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
|
@ -21,15 +21,16 @@
|
||||||
// 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.
|
||||||
|
|
||||||
#include <nvcore/Ptr.h>
|
|
||||||
|
|
||||||
#include <nvmath/Color.h>
|
|
||||||
|
|
||||||
#include <nvimage/NormalMap.h>
|
#include <nvimage/NormalMap.h>
|
||||||
#include <nvimage/Filter.h>
|
#include <nvimage/Filter.h>
|
||||||
#include <nvimage/FloatImage.h>
|
#include <nvimage/FloatImage.h>
|
||||||
#include <nvimage/Image.h>
|
#include <nvimage/Image.h>
|
||||||
|
|
||||||
|
#include <nvmath/Color.h>
|
||||||
|
|
||||||
|
#include <nvcore/Ptr.h>
|
||||||
|
|
||||||
|
|
||||||
using namespace nv;
|
using namespace nv;
|
||||||
|
|
||||||
// Create normal map using the given kernels.
|
// Create normal map using the given kernels.
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
// This code is in the public domain -- castanyo@yahoo.es
|
// This code is in the public domain -- castanyo@yahoo.es
|
||||||
|
|
||||||
#include <nvcore/Ptr.h>
|
#include <nvimage/NormalMipmap.h>
|
||||||
|
#include <nvimage/FloatImage.h>
|
||||||
|
|
||||||
#include <nvmath/Montecarlo.h>
|
#include <nvmath/Montecarlo.h>
|
||||||
#include <nvmath/SphericalHarmonic.h>
|
#include <nvmath/SphericalHarmonic.h>
|
||||||
|
|
||||||
#include <nvimage/NormalMipmap.h>
|
#include <nvcore/Ptr.h>
|
||||||
#include <nvimage/FloatImage.h>
|
|
||||||
|
|
||||||
using namespace nv;
|
using namespace nv;
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@ namespace nv
|
||||||
bool isSupported() const
|
bool isSupported() const
|
||||||
{
|
{
|
||||||
if (version != 1) {
|
if (version != 1) {
|
||||||
printf("*** bad version number %u\n", version);
|
nvDebug("*** bad version number %u\n", version);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (channel_count > 4) {
|
if (channel_count > 4) {
|
||||||
|
|
|
@ -12,14 +12,14 @@ http://www.efg2.com/Lab/Library/ImageProcessing/DHALF.TXT
|
||||||
@@ This code needs to be reviewed, I'm not sure it's correct.
|
@@ This code needs to be reviewed, I'm not sure it's correct.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <string.h> // memset
|
#include <nvimage/Quantize.h>
|
||||||
|
#include <nvimage/Image.h>
|
||||||
#include <nvcore/Containers.h> // swap
|
|
||||||
|
|
||||||
#include <nvmath/Color.h>
|
#include <nvmath/Color.h>
|
||||||
|
|
||||||
#include <nvimage/Image.h>
|
#include <nvcore/Containers.h> // swap
|
||||||
#include <nvimage/Quantize.h>
|
|
||||||
|
#include <string.h> // memset
|
||||||
|
|
||||||
using namespace nv;
|
using namespace nv;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user