summaryrefslogtreecommitdiffstats
path: root/o3d
diff options
context:
space:
mode:
Diffstat (limited to 'o3d')
-rw-r--r--o3d/build/common.gypi2
-rw-r--r--o3d/core/cross/image_utils.cc1
-rw-r--r--o3d/core/cross/image_utils_test.cc609
-rw-r--r--o3d/core/cross/texture.cc6
-rw-r--r--o3d/import/import.gyp7
-rw-r--r--o3d/tests/tests.gyp6
6 files changed, 321 insertions, 310 deletions
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi
index 108ccd86..0c58010 100644
--- a/o3d/build/common.gypi
+++ b/o3d/build/common.gypi
@@ -75,7 +75,7 @@
'xcode_settings': {
'CFLAGS': ['-gstabs+',
'-fno-eliminate-unused-debug-symbols',
- '-mmacosx-version-min=1.4'],
+ '-mmacosx-version-min=10.4'],
'WARNING_CXXFLAGS': ['-Wstrict-aliasing',
'-Wno-deprecated'],
},
diff --git a/o3d/core/cross/image_utils.cc b/o3d/core/cross/image_utils.cc
index 6d990b8..3e96634 100644
--- a/o3d/core/cross/image_utils.cc
+++ b/o3d/core/cross/image_utils.cc
@@ -99,7 +99,6 @@ bool ScaleUpToPOT(unsigned int width,
uint8 *dst,
int dst_pitch) {
DCHECK(CheckImageDimensions(width, height));
- unsigned int components = 0;
switch (format) {
case Texture::XRGB8:
case Texture::ARGB8:
diff --git a/o3d/core/cross/image_utils_test.cc b/o3d/core/cross/image_utils_test.cc
index 5ef6609..99edc489 100644
--- a/o3d/core/cross/image_utils_test.cc
+++ b/o3d/core/cross/image_utils_test.cc
@@ -1,306 +1,303 @@
-/*
- * Copyright 2009, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use 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 Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * 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.
- */
-
-
-#include "core/cross/client.h"
-#include "core/cross/image_utils.h"
-#include "tests/common/win/testing_common.h"
-#include "base/file_path.h"
-#include "utils/cross/file_path_utils.h"
-
-namespace o3d {
-
-class ImageTest : public testing::Test {
-};
-
-TEST_F(ImageTest, CheckImageDimensions) {
- EXPECT_TRUE(image::CheckImageDimensions(1u, 1u));
- EXPECT_FALSE(image::CheckImageDimensions(0u, 1u));
- EXPECT_FALSE(image::CheckImageDimensions(1u, 0u));
- EXPECT_TRUE(image::CheckImageDimensions(image::kMaxImageDimension,
- image::kMaxImageDimension));
- EXPECT_FALSE(image::CheckImageDimensions(0u, image::kMaxImageDimension));
- EXPECT_FALSE(image::CheckImageDimensions(image::kMaxImageDimension, 0u));
-}
-
-TEST_F(ImageTest, ComputeMipMapCount) {
- EXPECT_EQ(image::ComputeMipMapCount(1, 1), 1);
- EXPECT_EQ(image::ComputeMipMapCount(2, 2), 2);
- EXPECT_EQ(image::ComputeMipMapCount(2, 1), 2);
- EXPECT_EQ(image::ComputeMipMapCount(256, 1), 9);
- EXPECT_EQ(image::ComputeMipMapCount(256, 256), 9);
-}
-
-TEST_F(ImageTest, ComputePOTSize) {
- EXPECT_EQ(image::ComputePOTSize(1), 1);
- EXPECT_EQ(image::ComputePOTSize(2), 2);
- EXPECT_EQ(image::ComputePOTSize(3), 4);
- EXPECT_EQ(image::ComputePOTSize(4), 4);
- EXPECT_EQ(image::ComputePOTSize(5), 8);
- EXPECT_EQ(image::ComputePOTSize(7), 8);
- EXPECT_EQ(image::ComputePOTSize(8), 8);
- EXPECT_EQ(image::ComputePOTSize(9), 16);
- EXPECT_EQ(image::ComputePOTSize(128), 128);
- EXPECT_EQ(image::ComputePOTSize(129), 256);
- EXPECT_EQ(image::ComputePOTSize(255), 256);
- EXPECT_EQ(image::ComputePOTSize(4096), 4096);
-}
-
-static const uint8 kScaleUPDataNPOT[] = {
- // This is a 3x3 image.
- 0x75, 0x58, 0x7b, 0x76,
- 0x8a, 0x54, 0x85, 0x6f,
- 0x93, 0x56, 0x74, 0x7d,
-
- 0x3f, 0x58, 0x7a, 0x64,
- 0x7a, 0x90, 0x75, 0x8f,
- 0xb4, 0x7c, 0x71, 0x6b,
-
- 0x84, 0x84, 0x85, 0x6c,
- 0xb1, 0x73, 0x4f, 0x7c,
- 0x97, 0x87, 0x78, 0xa2,
-};
-
-static const uint8 kScaleUPDataPOT[] = {
- // This is the 4x4 scaled-up version of the above.
- 0x75, 0x58, 0x7b, 0x76,
- 0x8a, 0x54, 0x85, 0x6f,
- 0x8a, 0x54, 0x85, 0x6f,
- 0x93, 0x56, 0x74, 0x7d,
-
- 0x3f, 0x58, 0x7a, 0x64,
- 0x7a, 0x90, 0x75, 0x8f,
- 0x7a, 0x90, 0x75, 0x8f,
- 0xb4, 0x7c, 0x71, 0x6b,
-
- 0x3f, 0x58, 0x7a, 0x64,
- 0x7a, 0x90, 0x75, 0x8f,
- 0x7a, 0x90, 0x75, 0x8f,
- 0xb4, 0x7c, 0x71, 0x6b,
-
- 0x84, 0x84, 0x85, 0x6c,
- 0xb1, 0x73, 0x4f, 0x7c,
- 0xb1, 0x73, 0x4f, 0x7c,
- 0x97, 0x87, 0x78, 0xa2,
-};
-
-// Scales up a NPOT texture, compare with expected results.
-TEST_F(ImageTest, ScaleUpToPOT) {
- const unsigned int kWidth = 3;
- const unsigned int kHeight = 3;
- const unsigned int kComponents = 4;
- const unsigned int kPOTWidth = image::ComputePOTSize(kWidth);
- ASSERT_EQ(kPOTWidth, 4);
- const unsigned int kPOTHeight = image::ComputePOTSize(kHeight);
- ASSERT_EQ(kPOTHeight, 4);
- const Texture::Format format = Texture::ARGB8;
- unsigned int src_size =
- image::ComputeBufferSize(kWidth, kHeight, format);
- ASSERT_EQ(sizeof(kScaleUPDataNPOT), src_size);
- unsigned int dst_size =
- image::ComputeBufferSize(kPOTWidth, kPOTHeight, format);
- ASSERT_EQ(sizeof(kScaleUPDataPOT), dst_size);
- scoped_array<uint8> data(new uint8[dst_size]);
- ASSERT_TRUE(data.get() != NULL);
- // Check that scaling works when source and destination don't alias
- image::ScaleUpToPOT(kWidth, kHeight, format, kScaleUPDataNPOT, data.get(),
- 4 * 4);
- EXPECT_EQ(0, memcmp(data.get(), kScaleUPDataPOT, dst_size));
-
- // Check that scaling works when source and destination do alias
- memset(data.get(), 0, dst_size);
- memcpy(data.get(), kScaleUPDataNPOT, src_size);
- image::ScaleUpToPOT(kWidth, kHeight, format, data.get(), data.get(), 4 * 4);
- EXPECT_EQ(0, memcmp(data.get(), kScaleUPDataPOT, dst_size));
-}
-
-
-// NOTE: untested ffile types are:
-// png grayscale textures
-// dds cube maps
-// dds mipmapped cube maps
-// dds 1D textures
-// dds 3D textures
-
-
-static const uint8 kMipmapDataPOT[] = {
- // This is a 4x4 image
- 0x7D, 0xE4, 0x0F, 0xff, 0x71, 0x7B, 0x9C, 0xff,
- 0xDD, 0xF0, 0x9D, 0xff, 0xFA, 0x08, 0x49, 0xff,
- 0xEA, 0x28, 0xF6, 0xff, 0x73, 0x10, 0x64, 0xff,
- 0x8B, 0x36, 0x58, 0xff, 0x7A, 0x3E, 0x21, 0xff,
- 0x64, 0xCE, 0xB1, 0xff, 0x36, 0x4D, 0xC5, 0xff,
- 0xF3, 0x99, 0x7E, 0xff, 0x5C, 0x56, 0x1E, 0xff,
- 0x59, 0x8C, 0x41, 0xff, 0x39, 0x24, 0x1B, 0xff,
- 0x5D, 0x4D, 0x96, 0xff, 0x5E, 0xF8, 0x8B, 0xff,
- // Followed by its 2x2 mip level
- 0x92, 0x65, 0x81, 0xff, 0xb7, 0x5b, 0x57, 0xff,
- 0x4b, 0x72, 0x74, 0xff, 0x82, 0x8d, 0x6f, 0xff,
- // Followed by its 1x1 mip level
- 0x85, 0x6f, 0x6e, 0xff,
-};
-
-// Generates mip-maps from a known power-of-two image, compare with expected
-// results.
-TEST_F(ImageTest, GenerateMipmapsPOT) {
- const unsigned int kWidth = 4;
- const unsigned int kHeight = 4;
- const unsigned int kComponents = 4;
- const Texture::Format format = Texture::ARGB8;
- unsigned int mipmaps = image::ComputeMipMapCount(kWidth, kHeight);
- EXPECT_EQ(3, mipmaps);
- unsigned int size =
- image::ComputeMipChainSize(kWidth, kHeight, format, mipmaps);
- ASSERT_EQ(sizeof(kMipmapDataPOT), size);
- scoped_array<uint8> data(new uint8[size]);
- ASSERT_TRUE(data.get() != NULL);
- // Copy first level into the buffer.
- unsigned int base_size =
- image::ComputeMipChainSize(kWidth, kHeight, format, 1);
- memcpy(data.get(), kMipmapDataPOT, base_size);
- image::GenerateMipmap(
- kWidth, kHeight, format,
- data.get(), image::ComputeMipPitch(format, 0, kWidth),
- data.get() + image::ComputeMipChainSize(kWidth, kHeight, format, 1),
- image::ComputeMipPitch(format, 1, kWidth));
- image::GenerateMipmap(
- image::ComputeMipDimension(1, kWidth),
- image::ComputeMipDimension(1, kHeight),
- format,
- data.get() + image::ComputeMipChainSize(kWidth, kHeight, format, 1),
- image::ComputeMipPitch(format, 1, kWidth),
- data.get() + image::ComputeMipChainSize(kWidth, kHeight, format, 2),
- image::ComputeMipPitch(format, 2, kWidth));
- // Check the result.
- EXPECT_EQ(0, memcmp(data.get(), kMipmapDataPOT, size));
-}
-
-static const uint8 kMipmapDataNPOT[] = {
- // This is a 7x7 image
- 0x0d, 0x16, 0x68, 0x1b, 0xe6, 0x09, 0x89, 0x55,
- 0xda, 0x28, 0x56, 0x55, 0x3e, 0x00, 0x6f, 0x16,
- 0x98, 0x11, 0x50, 0x72, 0xe7, 0x17, 0x24, 0xca,
- 0x05, 0xe9, 0x92, 0x43, 0xd6, 0xc4, 0x57, 0xcd,
- 0x34, 0x9b, 0x86, 0xcf, 0x50, 0x65, 0xc4, 0x83,
- 0xaf, 0xa3, 0xaa, 0xe3, 0x7c, 0xab, 0x5f, 0x08,
- 0xc1, 0x2e, 0xd1, 0xe9, 0xa8, 0x2b, 0x56, 0x64,
- 0x12, 0x74, 0x92, 0x56, 0x30, 0x16, 0xa0, 0x03,
- 0x5a, 0x3a, 0x88, 0xb9, 0xe8, 0xa3, 0xfd, 0xf6,
- 0xa1, 0x3b, 0x7b, 0x2d, 0xfd, 0x71, 0xc0, 0x0b,
- 0x22, 0x31, 0x41, 0x5a, 0x45, 0x6f, 0x6b, 0x1b,
- 0x10, 0x5a, 0x16, 0x6e, 0x02, 0x89, 0x12, 0xb1,
- 0x67, 0xfc, 0x43, 0x78, 0xc0, 0x55, 0x59, 0xa3,
- 0xf8, 0xe2, 0x6b, 0xb7, 0xad, 0x5f, 0x3c, 0x14,
- 0xe1, 0x0e, 0x84, 0x89, 0x25, 0xa7, 0xea, 0xc6,
- 0x63, 0x20, 0xf9, 0x84, 0xa1, 0xcd, 0x62, 0x0f,
- 0x22, 0xab, 0x59, 0xde, 0xbd, 0xfa, 0xab, 0x4d,
- 0xca, 0x07, 0x85, 0xdf, 0x83, 0x23, 0x80, 0x8b,
- 0x5e, 0xe4, 0x57, 0x45, 0x81, 0x34, 0x52, 0x65,
- 0xf0, 0x14, 0x32, 0x33, 0xfe, 0xe4, 0x31, 0x90,
- 0x15, 0x51, 0x57, 0x89, 0xed, 0xcf, 0x88, 0xc9,
- 0x7b, 0xbb, 0xc6, 0x41, 0xd5, 0x93, 0x7c, 0x65,
- 0x39, 0x80, 0x20, 0xa2, 0xe5, 0xca, 0x9b, 0x7e,
- 0xb2, 0x1f, 0x0d, 0xdc, 0x5c, 0xab, 0x6b, 0x5b,
- 0xc5, 0x57, 0xc0, 0xd2,
- // Followed by its 3x3 mip level
- 0x75, 0x58, 0x7b, 0x76, 0x8a, 0x54, 0x85, 0x6f,
- 0x93, 0x56, 0x74, 0x7d, 0x3f, 0x58, 0x7a, 0x64,
- 0x7a, 0x90, 0x75, 0x8f, 0xb4, 0x7c, 0x71, 0x6b,
- 0x84, 0x84, 0x85, 0x6c, 0xb1, 0x73, 0x4f, 0x7c,
- 0x97, 0x87, 0x78, 0xa2,
- // Followed by its 1x1 mip level
- 0x88, 0x6e, 0x75, 0x7a,
-};
-
-// Generates mip-maps from a known non-power-of-two image, compare with expected
-// results.
-TEST_F(ImageTest, GenerateMipmapsNPOT) {
- const unsigned int kWidth = 7;
- const unsigned int kHeight = 7;
- const unsigned int kComponents = 4;
- const Texture::Format format = Texture::ARGB8;
- unsigned int mipmaps = image::ComputeMipMapCount(kWidth, kHeight);
- EXPECT_EQ(3, mipmaps);
- unsigned int size =
- image::ComputeMipChainSize(kWidth, kHeight, format, mipmaps);
- ASSERT_EQ(sizeof(kMipmapDataNPOT), size);
- scoped_array<uint8> data(new uint8[size]);
- ASSERT_TRUE(data.get() != NULL);
- // Copy first level into the buffer.
- unsigned int base_size =
- image::ComputeMipChainSize(kWidth, kHeight, format, 1);
- memcpy(data.get(), kMipmapDataNPOT, base_size);
- image::GenerateMipmap(
- kWidth, kHeight, format,
- data.get(), image::ComputeMipPitch(format, 0, kWidth),
- data.get() + image::ComputeMipChainSize(kWidth, kHeight, format, 1),
- image::ComputeMipPitch(format, 1, kWidth));
- image::GenerateMipmap(
- image::ComputeMipDimension(1, kWidth),
- image::ComputeMipDimension(1, kHeight),
- format,
- data.get() + image::ComputeMipChainSize(kWidth, kHeight, format, 1),
- image::ComputeMipPitch(format, 1, kWidth),
- data.get() + image::ComputeMipChainSize(kWidth, kHeight, format, 2),
- image::ComputeMipPitch(format, 2, kWidth));
- // Check the result.
- EXPECT_EQ(0, memcmp(data.get(), kMipmapDataNPOT, size));
-}
-
-// Checks that filenames are detected as the correct type.
-TEST_F(ImageTest, GetFileTypeFromFilename) {
- EXPECT_EQ(image::TGA, image::GetFileTypeFromFilename("foo.tga"));
- EXPECT_EQ(image::TGA, image::GetFileTypeFromFilename("BAR.TGA"));
- EXPECT_EQ(image::PNG, image::GetFileTypeFromFilename("foo.png"));
- EXPECT_EQ(image::PNG, image::GetFileTypeFromFilename("BAR.PNG"));
- EXPECT_EQ(image::JPEG, image::GetFileTypeFromFilename("foo.jpeg"));
- EXPECT_EQ(image::JPEG, image::GetFileTypeFromFilename("BAR.JPEG"));
- EXPECT_EQ(image::JPEG, image::GetFileTypeFromFilename("foo.jpg"));
- EXPECT_EQ(image::JPEG, image::GetFileTypeFromFilename("BAR.JPG"));
- EXPECT_EQ(image::JPEG, image::GetFileTypeFromFilename("foo.jpe"));
- EXPECT_EQ(image::JPEG, image::GetFileTypeFromFilename("BAR.JPE"));
- EXPECT_EQ(image::DDS, image::GetFileTypeFromFilename("foo.dds"));
- EXPECT_EQ(image::DDS, image::GetFileTypeFromFilename("BAR.DDS"));
- EXPECT_EQ(image::UNKNOWN, image::GetFileTypeFromFilename("foo.bar"));
- EXPECT_EQ(image::UNKNOWN, image::GetFileTypeFromFilename("FOO.BAR"));
-}
-
-// Checks that mime types are detected as the correct type.
-TEST_F(ImageTest, GetFileTypeFromMimeType) {
- EXPECT_EQ(image::PNG, image::GetFileTypeFromMimeType("image/png"));
- EXPECT_EQ(image::JPEG, image::GetFileTypeFromMimeType("image/jpeg"));
- EXPECT_EQ(image::UNKNOWN, image::GetFileTypeFromFilename("text/plain"));
- EXPECT_EQ(image::UNKNOWN,
- image::GetFileTypeFromFilename("application/x-123"));
-}
-
-} // namespace
-
+/*
+ * Copyright 2009, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use 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 Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * 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.
+ */
+
+
+#include "core/cross/client.h"
+#include "core/cross/image_utils.h"
+#include "tests/common/win/testing_common.h"
+#include "base/file_path.h"
+#include "utils/cross/file_path_utils.h"
+
+namespace o3d {
+
+class ImageTest : public testing::Test {
+};
+
+TEST_F(ImageTest, CheckImageDimensions) {
+ EXPECT_TRUE(image::CheckImageDimensions(1u, 1u));
+ EXPECT_FALSE(image::CheckImageDimensions(0u, 1u));
+ EXPECT_FALSE(image::CheckImageDimensions(1u, 0u));
+ EXPECT_TRUE(image::CheckImageDimensions(image::kMaxImageDimension,
+ image::kMaxImageDimension));
+ EXPECT_FALSE(image::CheckImageDimensions(0u, image::kMaxImageDimension));
+ EXPECT_FALSE(image::CheckImageDimensions(image::kMaxImageDimension, 0u));
+}
+
+TEST_F(ImageTest, ComputeMipMapCount) {
+ EXPECT_EQ(image::ComputeMipMapCount(1, 1), 1u);
+ EXPECT_EQ(image::ComputeMipMapCount(2, 2), 2u);
+ EXPECT_EQ(image::ComputeMipMapCount(2, 1), 2u);
+ EXPECT_EQ(image::ComputeMipMapCount(256, 1), 9u);
+ EXPECT_EQ(image::ComputeMipMapCount(256, 256), 9u);
+}
+
+TEST_F(ImageTest, ComputePOTSize) {
+ EXPECT_EQ(image::ComputePOTSize(1), 1u);
+ EXPECT_EQ(image::ComputePOTSize(2), 2u);
+ EXPECT_EQ(image::ComputePOTSize(3), 4u);
+ EXPECT_EQ(image::ComputePOTSize(4), 4u);
+ EXPECT_EQ(image::ComputePOTSize(5), 8u);
+ EXPECT_EQ(image::ComputePOTSize(7), 8u);
+ EXPECT_EQ(image::ComputePOTSize(8), 8u);
+ EXPECT_EQ(image::ComputePOTSize(9), 16u);
+ EXPECT_EQ(image::ComputePOTSize(128), 128u);
+ EXPECT_EQ(image::ComputePOTSize(129), 256u);
+ EXPECT_EQ(image::ComputePOTSize(255), 256u);
+ EXPECT_EQ(image::ComputePOTSize(4096), 4096u);
+}
+
+static const uint8 kScaleUPDataNPOT[] = {
+ // This is a 3x3 image.
+ 0x75, 0x58, 0x7b, 0x76,
+ 0x8a, 0x54, 0x85, 0x6f,
+ 0x93, 0x56, 0x74, 0x7d,
+
+ 0x3f, 0x58, 0x7a, 0x64,
+ 0x7a, 0x90, 0x75, 0x8f,
+ 0xb4, 0x7c, 0x71, 0x6b,
+
+ 0x84, 0x84, 0x85, 0x6c,
+ 0xb1, 0x73, 0x4f, 0x7c,
+ 0x97, 0x87, 0x78, 0xa2,
+};
+
+static const uint8 kScaleUPDataPOT[] = {
+ // This is the 4x4 scaled-up version of the above.
+ 0x75, 0x58, 0x7b, 0x76,
+ 0x8a, 0x54, 0x85, 0x6f,
+ 0x8a, 0x54, 0x85, 0x6f,
+ 0x93, 0x56, 0x74, 0x7d,
+
+ 0x3f, 0x58, 0x7a, 0x64,
+ 0x7a, 0x90, 0x75, 0x8f,
+ 0x7a, 0x90, 0x75, 0x8f,
+ 0xb4, 0x7c, 0x71, 0x6b,
+
+ 0x3f, 0x58, 0x7a, 0x64,
+ 0x7a, 0x90, 0x75, 0x8f,
+ 0x7a, 0x90, 0x75, 0x8f,
+ 0xb4, 0x7c, 0x71, 0x6b,
+
+ 0x84, 0x84, 0x85, 0x6c,
+ 0xb1, 0x73, 0x4f, 0x7c,
+ 0xb1, 0x73, 0x4f, 0x7c,
+ 0x97, 0x87, 0x78, 0xa2,
+};
+
+// Scales up a NPOT texture, compare with expected results.
+TEST_F(ImageTest, ScaleUpToPOT) {
+ const unsigned int kWidth = 3;
+ const unsigned int kHeight = 3;
+ const unsigned int kPOTWidth = image::ComputePOTSize(kWidth);
+ ASSERT_EQ(kPOTWidth, 4u);
+ const unsigned int kPOTHeight = image::ComputePOTSize(kHeight);
+ ASSERT_EQ(kPOTHeight, 4u);
+ const Texture::Format format = Texture::ARGB8;
+ unsigned int src_size =
+ image::ComputeBufferSize(kWidth, kHeight, format);
+ ASSERT_EQ(sizeof(kScaleUPDataNPOT), src_size);
+ unsigned int dst_size =
+ image::ComputeBufferSize(kPOTWidth, kPOTHeight, format);
+ ASSERT_EQ(sizeof(kScaleUPDataPOT), dst_size);
+ scoped_array<uint8> data(new uint8[dst_size]);
+ ASSERT_TRUE(data.get() != NULL);
+ // Check that scaling works when source and destination don't alias
+ image::ScaleUpToPOT(kWidth, kHeight, format, kScaleUPDataNPOT, data.get(),
+ 4 * 4);
+ EXPECT_EQ(0, memcmp(data.get(), kScaleUPDataPOT, dst_size));
+
+ // Check that scaling works when source and destination do alias
+ memset(data.get(), 0, dst_size);
+ memcpy(data.get(), kScaleUPDataNPOT, src_size);
+ image::ScaleUpToPOT(kWidth, kHeight, format, data.get(), data.get(), 4 * 4);
+ EXPECT_EQ(0, memcmp(data.get(), kScaleUPDataPOT, dst_size));
+}
+
+
+// NOTE: untested ffile types are:
+// png grayscale textures
+// dds cube maps
+// dds mipmapped cube maps
+// dds 1D textures
+// dds 3D textures
+
+
+static const uint8 kMipmapDataPOT[] = {
+ // This is a 4x4 image
+ 0x7D, 0xE4, 0x0F, 0xff, 0x71, 0x7B, 0x9C, 0xff,
+ 0xDD, 0xF0, 0x9D, 0xff, 0xFA, 0x08, 0x49, 0xff,
+ 0xEA, 0x28, 0xF6, 0xff, 0x73, 0x10, 0x64, 0xff,
+ 0x8B, 0x36, 0x58, 0xff, 0x7A, 0x3E, 0x21, 0xff,
+ 0x64, 0xCE, 0xB1, 0xff, 0x36, 0x4D, 0xC5, 0xff,
+ 0xF3, 0x99, 0x7E, 0xff, 0x5C, 0x56, 0x1E, 0xff,
+ 0x59, 0x8C, 0x41, 0xff, 0x39, 0x24, 0x1B, 0xff,
+ 0x5D, 0x4D, 0x96, 0xff, 0x5E, 0xF8, 0x8B, 0xff,
+ // Followed by its 2x2 mip level
+ 0x92, 0x65, 0x81, 0xff, 0xb7, 0x5b, 0x57, 0xff,
+ 0x4b, 0x72, 0x74, 0xff, 0x82, 0x8d, 0x6f, 0xff,
+ // Followed by its 1x1 mip level
+ 0x85, 0x6f, 0x6e, 0xff,
+};
+
+// Generates mip-maps from a known power-of-two image, compare with expected
+// results.
+TEST_F(ImageTest, GenerateMipmapsPOT) {
+ const unsigned int kWidth = 4;
+ const unsigned int kHeight = 4;
+ const Texture::Format format = Texture::ARGB8;
+ unsigned int mipmaps = image::ComputeMipMapCount(kWidth, kHeight);
+ EXPECT_EQ(3u, mipmaps);
+ unsigned int size =
+ image::ComputeMipChainSize(kWidth, kHeight, format, mipmaps);
+ ASSERT_EQ(sizeof(kMipmapDataPOT), size);
+ scoped_array<uint8> data(new uint8[size]);
+ ASSERT_TRUE(data.get() != NULL);
+ // Copy first level into the buffer.
+ unsigned int base_size =
+ image::ComputeMipChainSize(kWidth, kHeight, format, 1);
+ memcpy(data.get(), kMipmapDataPOT, base_size);
+ image::GenerateMipmap(
+ kWidth, kHeight, format,
+ data.get(), image::ComputeMipPitch(format, 0, kWidth),
+ data.get() + image::ComputeMipChainSize(kWidth, kHeight, format, 1),
+ image::ComputeMipPitch(format, 1, kWidth));
+ image::GenerateMipmap(
+ image::ComputeMipDimension(1, kWidth),
+ image::ComputeMipDimension(1, kHeight),
+ format,
+ data.get() + image::ComputeMipChainSize(kWidth, kHeight, format, 1),
+ image::ComputeMipPitch(format, 1, kWidth),
+ data.get() + image::ComputeMipChainSize(kWidth, kHeight, format, 2),
+ image::ComputeMipPitch(format, 2, kWidth));
+ // Check the result.
+ EXPECT_EQ(0, memcmp(data.get(), kMipmapDataPOT, size));
+}
+
+static const uint8 kMipmapDataNPOT[] = {
+ // This is a 7x7 image
+ 0x0d, 0x16, 0x68, 0x1b, 0xe6, 0x09, 0x89, 0x55,
+ 0xda, 0x28, 0x56, 0x55, 0x3e, 0x00, 0x6f, 0x16,
+ 0x98, 0x11, 0x50, 0x72, 0xe7, 0x17, 0x24, 0xca,
+ 0x05, 0xe9, 0x92, 0x43, 0xd6, 0xc4, 0x57, 0xcd,
+ 0x34, 0x9b, 0x86, 0xcf, 0x50, 0x65, 0xc4, 0x83,
+ 0xaf, 0xa3, 0xaa, 0xe3, 0x7c, 0xab, 0x5f, 0x08,
+ 0xc1, 0x2e, 0xd1, 0xe9, 0xa8, 0x2b, 0x56, 0x64,
+ 0x12, 0x74, 0x92, 0x56, 0x30, 0x16, 0xa0, 0x03,
+ 0x5a, 0x3a, 0x88, 0xb9, 0xe8, 0xa3, 0xfd, 0xf6,
+ 0xa1, 0x3b, 0x7b, 0x2d, 0xfd, 0x71, 0xc0, 0x0b,
+ 0x22, 0x31, 0x41, 0x5a, 0x45, 0x6f, 0x6b, 0x1b,
+ 0x10, 0x5a, 0x16, 0x6e, 0x02, 0x89, 0x12, 0xb1,
+ 0x67, 0xfc, 0x43, 0x78, 0xc0, 0x55, 0x59, 0xa3,
+ 0xf8, 0xe2, 0x6b, 0xb7, 0xad, 0x5f, 0x3c, 0x14,
+ 0xe1, 0x0e, 0x84, 0x89, 0x25, 0xa7, 0xea, 0xc6,
+ 0x63, 0x20, 0xf9, 0x84, 0xa1, 0xcd, 0x62, 0x0f,
+ 0x22, 0xab, 0x59, 0xde, 0xbd, 0xfa, 0xab, 0x4d,
+ 0xca, 0x07, 0x85, 0xdf, 0x83, 0x23, 0x80, 0x8b,
+ 0x5e, 0xe4, 0x57, 0x45, 0x81, 0x34, 0x52, 0x65,
+ 0xf0, 0x14, 0x32, 0x33, 0xfe, 0xe4, 0x31, 0x90,
+ 0x15, 0x51, 0x57, 0x89, 0xed, 0xcf, 0x88, 0xc9,
+ 0x7b, 0xbb, 0xc6, 0x41, 0xd5, 0x93, 0x7c, 0x65,
+ 0x39, 0x80, 0x20, 0xa2, 0xe5, 0xca, 0x9b, 0x7e,
+ 0xb2, 0x1f, 0x0d, 0xdc, 0x5c, 0xab, 0x6b, 0x5b,
+ 0xc5, 0x57, 0xc0, 0xd2,
+ // Followed by its 3x3 mip level
+ 0x75, 0x58, 0x7b, 0x76, 0x8a, 0x54, 0x85, 0x6f,
+ 0x93, 0x56, 0x74, 0x7d, 0x3f, 0x58, 0x7a, 0x64,
+ 0x7a, 0x90, 0x75, 0x8f, 0xb4, 0x7c, 0x71, 0x6b,
+ 0x84, 0x84, 0x85, 0x6c, 0xb1, 0x73, 0x4f, 0x7c,
+ 0x97, 0x87, 0x78, 0xa2,
+ // Followed by its 1x1 mip level
+ 0x88, 0x6e, 0x75, 0x7a,
+};
+
+// Generates mip-maps from a known non-power-of-two image, compare with expected
+// results.
+TEST_F(ImageTest, GenerateMipmapsNPOT) {
+ const unsigned int kWidth = 7;
+ const unsigned int kHeight = 7;
+ const Texture::Format format = Texture::ARGB8;
+ unsigned int mipmaps = image::ComputeMipMapCount(kWidth, kHeight);
+ EXPECT_EQ(3u, mipmaps);
+ unsigned int size =
+ image::ComputeMipChainSize(kWidth, kHeight, format, mipmaps);
+ ASSERT_EQ(sizeof(kMipmapDataNPOT), size);
+ scoped_array<uint8> data(new uint8[size]);
+ ASSERT_TRUE(data.get() != NULL);
+ // Copy first level into the buffer.
+ unsigned int base_size =
+ image::ComputeMipChainSize(kWidth, kHeight, format, 1);
+ memcpy(data.get(), kMipmapDataNPOT, base_size);
+ image::GenerateMipmap(
+ kWidth, kHeight, format,
+ data.get(), image::ComputeMipPitch(format, 0, kWidth),
+ data.get() + image::ComputeMipChainSize(kWidth, kHeight, format, 1),
+ image::ComputeMipPitch(format, 1, kWidth));
+ image::GenerateMipmap(
+ image::ComputeMipDimension(1, kWidth),
+ image::ComputeMipDimension(1, kHeight),
+ format,
+ data.get() + image::ComputeMipChainSize(kWidth, kHeight, format, 1),
+ image::ComputeMipPitch(format, 1, kWidth),
+ data.get() + image::ComputeMipChainSize(kWidth, kHeight, format, 2),
+ image::ComputeMipPitch(format, 2, kWidth));
+ // Check the result.
+ EXPECT_EQ(0, memcmp(data.get(), kMipmapDataNPOT, size));
+}
+
+// Checks that filenames are detected as the correct type.
+TEST_F(ImageTest, GetFileTypeFromFilename) {
+ EXPECT_EQ(image::TGA, image::GetFileTypeFromFilename("foo.tga"));
+ EXPECT_EQ(image::TGA, image::GetFileTypeFromFilename("BAR.TGA"));
+ EXPECT_EQ(image::PNG, image::GetFileTypeFromFilename("foo.png"));
+ EXPECT_EQ(image::PNG, image::GetFileTypeFromFilename("BAR.PNG"));
+ EXPECT_EQ(image::JPEG, image::GetFileTypeFromFilename("foo.jpeg"));
+ EXPECT_EQ(image::JPEG, image::GetFileTypeFromFilename("BAR.JPEG"));
+ EXPECT_EQ(image::JPEG, image::GetFileTypeFromFilename("foo.jpg"));
+ EXPECT_EQ(image::JPEG, image::GetFileTypeFromFilename("BAR.JPG"));
+ EXPECT_EQ(image::JPEG, image::GetFileTypeFromFilename("foo.jpe"));
+ EXPECT_EQ(image::JPEG, image::GetFileTypeFromFilename("BAR.JPE"));
+ EXPECT_EQ(image::DDS, image::GetFileTypeFromFilename("foo.dds"));
+ EXPECT_EQ(image::DDS, image::GetFileTypeFromFilename("BAR.DDS"));
+ EXPECT_EQ(image::UNKNOWN, image::GetFileTypeFromFilename("foo.bar"));
+ EXPECT_EQ(image::UNKNOWN, image::GetFileTypeFromFilename("FOO.BAR"));
+}
+
+// Checks that mime types are detected as the correct type.
+TEST_F(ImageTest, GetFileTypeFromMimeType) {
+ EXPECT_EQ(image::PNG, image::GetFileTypeFromMimeType("image/png"));
+ EXPECT_EQ(image::JPEG, image::GetFileTypeFromMimeType("image/jpeg"));
+ EXPECT_EQ(image::UNKNOWN, image::GetFileTypeFromFilename("text/plain"));
+ EXPECT_EQ(image::UNKNOWN,
+ image::GetFileTypeFromFilename("application/x-123"));
+}
+
+} // namespace
+
diff --git a/o3d/core/cross/texture.cc b/o3d/core/cross/texture.cc
index 2ef6c54..837817f 100644
--- a/o3d/core/cross/texture.cc
+++ b/o3d/core/cross/texture.cc
@@ -169,7 +169,8 @@ void Texture2D::DrawImage(const Bitmap& src_img,
void Texture2D::SetFromBitmap(const Bitmap& bitmap) {
DCHECK(bitmap.image_data());
- if (bitmap.width() != width() || bitmap.height() != height() ||
+ if (bitmap.width() != static_cast<unsigned>(width()) ||
+ bitmap.height() != static_cast<unsigned>(height()) ||
bitmap.format() != format() || bitmap.is_cubemap()) {
O3D_ERROR(service_locator())
<< "bitmap must be the same format and dimensions as texture";
@@ -379,7 +380,8 @@ void TextureCUBE::DrawImage(const Bitmap& src_img,
void TextureCUBE::SetFromBitmap(const Bitmap& bitmap) {
DCHECK(bitmap.image_data());
- if (bitmap.width() != edge_length() || bitmap.height() != edge_length() ||
+ if (bitmap.width() != static_cast<unsigned>(edge_length()) ||
+ bitmap.height() != static_cast<unsigned>(edge_length()) ||
bitmap.format() != format() || !bitmap.is_cubemap()) {
O3D_ERROR(service_locator())
<< "bitmap must be the same format and dimensions as texture";
diff --git a/o3d/import/import.gyp b/o3d/import/import.gyp
index 9943b00..01d3dc3 100644
--- a/o3d/import/import.gyp
+++ b/o3d/import/import.gyp
@@ -49,6 +49,7 @@
'cross/zip_archive.cc',
'cross/zip_archive.h',
],
+
'conditions' : [
['renderer == "d3d9" and OS == "win"',
{
@@ -69,6 +70,9 @@
'sources': [
'mac/collada_conditioner_mac.mm',
],
+ 'include_dirs': [
+ '../../third_party/glew/files/include',
+ ],
'link_settings': {
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
@@ -81,6 +85,9 @@
'sources': [
'linux/collada_conditioner_linux.cc',
],
+ 'include_dirs': [
+ '../../third_party/glew/files/include',
+ ],
},
],
],
diff --git a/o3d/tests/tests.gyp b/o3d/tests/tests.gyp
index d205c11..6557b0e 100644
--- a/o3d/tests/tests.gyp
+++ b/o3d/tests/tests.gyp
@@ -88,6 +88,9 @@
'sources': [
'common/mac/testing_common.mm',
],
+ 'include_dirs': [
+ '../../third_party/glew/files/include',
+ ],
'link_settings': {
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
@@ -148,6 +151,9 @@
'sources': [
'common/linux/testing_common.cc',
],
+ 'include_dirs': [
+ '../../third_party/glew/files/include',
+ ],
},
],
],
generated by cgit v1.1 at 2025-01-17 22:18:43 +0000