diff --git a/binaries/data/mods/official/art/textures/ui/session/counter_edge.dds b/binaries/data/mods/official/art/textures/ui/session/counter_edge.dds index 599d96d8d1..a46c00a9f4 100644 --- a/binaries/data/mods/official/art/textures/ui/session/counter_edge.dds +++ b/binaries/data/mods/official/art/textures/ui/session/counter_edge.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c4d4609729fa7d97ed1680fec99ae3a2e2cae129f97e3b365e6bc8e6e5e267c +oid sha256:48ccdc53052302125910d1e21e0e655b3409b1a5a1926844992d58e43595de46 size 4224 diff --git a/binaries/data/mods/official/art/textures/ui/session/counter_icon.dds b/binaries/data/mods/official/art/textures/ui/session/counter_icon.dds index 85278fccfd..61d88bab6e 100644 --- a/binaries/data/mods/official/art/textures/ui/session/counter_icon.dds +++ b/binaries/data/mods/official/art/textures/ui/session/counter_icon.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:995f01f73796de79881e6fbb9c6a9ce2b9f5d1510a78bbabf845602373a8b64c +oid sha256:f98e4c6150eb4c55558cc44efd1e2c8c345e5f35f6b7579d0c506540098b4a5a size 4224 diff --git a/binaries/data/mods/official/art/textures/ui/session/counter_tile.dds b/binaries/data/mods/official/art/textures/ui/session/counter_tile.dds index 2d729942c9..7e79f4a527 100644 --- a/binaries/data/mods/official/art/textures/ui/session/counter_tile.dds +++ b/binaries/data/mods/official/art/textures/ui/session/counter_tile.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35850da661cdbb514753a86aacd12d16e27859b46c8fb35bc43e44257cff2513 +oid sha256:292d310ceed16232b1ebb6e47c14fdb400f2318edc6e1a800573423d79802962 size 4224 diff --git a/binaries/data/mods/official/art/textures/ui/session/icons/advanced.dds b/binaries/data/mods/official/art/textures/ui/session/icons/advanced.dds index 95b08a7aae..453d5dbab3 100644 --- a/binaries/data/mods/official/art/textures/ui/session/icons/advanced.dds +++ b/binaries/data/mods/official/art/textures/ui/session/icons/advanced.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab44ad9f2e06a151e83e8a5ffce47b772bf1f76c4e072e0e84ebca7b73d0de55 +oid sha256:960f124240dce9062850e8ac5c74a1aad79bb19136c14fe8b9e00593d3ab78e3 size 384 diff --git a/binaries/data/mods/official/art/textures/ui/session/icons/bar.dds b/binaries/data/mods/official/art/textures/ui/session/icons/bar.dds index b80b9cd8e0..45410e35d1 100644 --- a/binaries/data/mods/official/art/textures/ui/session/icons/bar.dds +++ b/binaries/data/mods/official/art/textures/ui/session/icons/bar.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:608a9bca6518735bc9310c4dda8eeae0d6d0084e1410f10d21cb2dcf990695d5 +oid sha256:052a3f61ba7f203a3197706cc8641ee855270b317d3b8d123fe070896266fd00 size 1152 diff --git a/binaries/data/mods/official/art/textures/ui/session/icons/bkg/banner.dds b/binaries/data/mods/official/art/textures/ui/session/icons/bkg/banner.dds index 526ececdec..e23681dd1b 100644 --- a/binaries/data/mods/official/art/textures/ui/session/icons/bkg/banner.dds +++ b/binaries/data/mods/official/art/textures/ui/session/icons/bkg/banner.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d77dd99085ff93b7a9872361630ceed5bad2a508f2a871c8671d7d7ff01eb64c +oid sha256:0b6091073e600a52072c888a4b802532487c6bd32457c5da4c4a3c224f697864 size 16512 diff --git a/binaries/data/mods/official/art/textures/ui/session/icons/bkg/button_flare.dds b/binaries/data/mods/official/art/textures/ui/session/icons/bkg/button_flare.dds index 9a82c25ab4..a2d3c461c9 100644 --- a/binaries/data/mods/official/art/textures/ui/session/icons/bkg/button_flare.dds +++ b/binaries/data/mods/official/art/textures/ui/session/icons/bkg/button_flare.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94123d16c3f76e59fd64754c49653c2ce3f335f9ad3d3d9fe0be7fa47957e6ef +oid sha256:afaf75280be20facc47ab742fbad61a438c849239d48539c6b5712b146482de3 size 8320 diff --git a/binaries/data/mods/official/art/textures/ui/session/icons/bkg/button_idle.dds b/binaries/data/mods/official/art/textures/ui/session/icons/bkg/button_idle.dds index 52d403fa0c..3df1b96817 100644 --- a/binaries/data/mods/official/art/textures/ui/session/icons/bkg/button_idle.dds +++ b/binaries/data/mods/official/art/textures/ui/session/icons/bkg/button_idle.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7dd98503e225f30830fa6f9ab6a24f7e184612d19f78eb0d6157083a5f0ac82 +oid sha256:e1ca290822ee3bfc748d4382b5e8f70d3b162cb28daa9af1540ca92c228e8bf4 size 8320 diff --git a/binaries/data/mods/official/art/textures/ui/session/icons/bkg/command.dds b/binaries/data/mods/official/art/textures/ui/session/icons/bkg/command.dds index edcd4d7b3d..528c2dad8f 100644 --- a/binaries/data/mods/official/art/textures/ui/session/icons/bkg/command.dds +++ b/binaries/data/mods/official/art/textures/ui/session/icons/bkg/command.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f1cafa5300180b206a7e66badfaf634b5f79213caa95adb41634b0391ea6f51 +oid sha256:fa61448659dda94bd3b10e52d8275d4a9ad586f86bdd529f920e7d8d49fbdd83 size 16512 diff --git a/binaries/data/mods/official/art/textures/ui/session/icons/bkg/portrait.dds b/binaries/data/mods/official/art/textures/ui/session/icons/bkg/portrait.dds index d9b76fda77..d865635647 100644 --- a/binaries/data/mods/official/art/textures/ui/session/icons/bkg/portrait.dds +++ b/binaries/data/mods/official/art/textures/ui/session/icons/bkg/portrait.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fd2f1843117bf7102c79641e3de4f0b3acf04624e5ab1f220db5684b3d989aa +oid sha256:4be69c2c37113febf0e0f7d293c4b4500925240fe6df4a1baf1105be734be073 size 16512 diff --git a/binaries/data/mods/official/art/textures/ui/session/icons/bkg/portrait_black.dds b/binaries/data/mods/official/art/textures/ui/session/icons/bkg/portrait_black.dds index 467089d853..1033066c4b 100644 --- a/binaries/data/mods/official/art/textures/ui/session/icons/bkg/portrait_black.dds +++ b/binaries/data/mods/official/art/textures/ui/session/icons/bkg/portrait_black.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea92978b3dc3233755ed80552955e5f7e9b3e27f60d9fdfcce6ae6b10e0e9f3a +oid sha256:c7ae8b2e0add6a8da1693f96c38c34a853805dc56d7386822c0e9b28a42c366b size 16512 diff --git a/binaries/data/mods/official/art/textures/ui/session/icons/bkg/statistic.dds b/binaries/data/mods/official/art/textures/ui/session/icons/bkg/statistic.dds index d5303ae26a..149fd075c6 100644 --- a/binaries/data/mods/official/art/textures/ui/session/icons/bkg/statistic.dds +++ b/binaries/data/mods/official/art/textures/ui/session/icons/bkg/statistic.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d30fa8f1c084d6eab7c0ed4c9797e24be31af3b11438fa8d21de30861b855766 +oid sha256:0d5b313135ad6f88d758709847aba0c5ec060dd4719295259fabc98faaf0d9fe size 16512 diff --git a/binaries/data/mods/official/art/textures/ui/session/icons/bkg/tab.dds b/binaries/data/mods/official/art/textures/ui/session/icons/bkg/tab.dds index e9b3229de3..71959361f5 100644 --- a/binaries/data/mods/official/art/textures/ui/session/icons/bkg/tab.dds +++ b/binaries/data/mods/official/art/textures/ui/session/icons/bkg/tab.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44fc35df75d720e3242f541aea6b825f50d19fb6fa11188eb96a121a677b3091 +oid sha256:8486f96a20674b4a5927d77e637604b429d44fc7a24ad92b4ca3c62e59aab570 size 16512 diff --git a/binaries/data/mods/official/art/textures/ui/session/icons/elite.dds b/binaries/data/mods/official/art/textures/ui/session/icons/elite.dds index 0daf155638..0cb09f10c1 100644 --- a/binaries/data/mods/official/art/textures/ui/session/icons/elite.dds +++ b/binaries/data/mods/official/art/textures/ui/session/icons/elite.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d99f16bf95adde743364227d2631456f60e9e3914ab9b693653288f46911775d +oid sha256:4d5a24e87e4e39994f0771de02ec5bb648a4cb16c2f12d3f54a0348e1b96a9d6 size 384 diff --git a/binaries/data/mods/official/art/textures/ui/session/minimap_pane.dds b/binaries/data/mods/official/art/textures/ui/session/minimap_pane.dds index 59192fef57..53ee5c8c60 100644 --- a/binaries/data/mods/official/art/textures/ui/session/minimap_pane.dds +++ b/binaries/data/mods/official/art/textures/ui/session/minimap_pane.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:110c3a114790e461eff3a23e5ebfb6f685d6ed420bf9cc6457d95f686da0e30b +oid sha256:179502766eaeffe0bf9bde5e8bb99435eef9504569b47ad7180f8e9bcfa523f2 size 262272 diff --git a/binaries/data/mods/official/art/textures/ui/session/status_pane.dds b/binaries/data/mods/official/art/textures/ui/session/status_pane.dds index ac37716a58..9f19263ef8 100644 --- a/binaries/data/mods/official/art/textures/ui/session/status_pane.dds +++ b/binaries/data/mods/official/art/textures/ui/session/status_pane.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:658e1128157e5b2387b34c0d7407ea4b8d31b208e7aa839b51d2040bd586e2a6 +oid sha256:fe3e479d3c6f841f9c9405efdab1524748b076805b7f3f52cb5f3d54be26332b size 131200 diff --git a/source/graphics/ObjectManager.cpp b/source/graphics/ObjectManager.cpp index dd6fb8e4a3..06440c5113 100755 --- a/source/graphics/ObjectManager.cpp +++ b/source/graphics/ObjectManager.cpp @@ -199,6 +199,11 @@ void CObjectManager::GetAllObjectNames(std::vector& names) VFSUtil::EnumDirEnts("art/actors/", VFSUtil::RECURSIVE, "*.xml", GetObjectName_ThunkCb, &names); } +void CObjectManager::GetPropObjectNames(std::vector& names) +{ + VFSUtil::EnumDirEnts("art/actors/props/", VFSUtil::RECURSIVE, "*.xml", + GetObjectName_ThunkCb, &names); +} struct CObjectThing_Entity : public CObjectThing { diff --git a/source/graphics/ObjectManager.h b/source/graphics/ObjectManager.h index 822273bcb0..ae3b0dadd0 100755 --- a/source/graphics/ObjectManager.h +++ b/source/graphics/ObjectManager.h @@ -73,6 +73,7 @@ public: // Get all names, quite slowly. (Intended only for ScEd.) void GetAllObjectNames(std::vector& names); + void GetPropObjectNames(std::vector& names); //CBaseEntity* m_SelectedEntity; void SetSelectedEntity(CBaseEntity* thing); diff --git a/source/renderer/WaterManager.h b/source/renderer/WaterManager.h index f7de4d9064..7ccabb024f 100644 --- a/source/renderer/WaterManager.h +++ b/source/renderer/WaterManager.h @@ -38,7 +38,7 @@ public: float m_TWaterTrans; float m_SWaterScrollCounter; float m_TWaterScrollCounter; - float m_WaterTexTimer; + double m_WaterTexTimer; public: WaterManager(); diff --git a/source/simulation/Entity.cpp b/source/simulation/Entity.cpp index 5d13bc5c4e..2f11e4d381 100755 --- a/source/simulation/Entity.cpp +++ b/source/simulation/Entity.cpp @@ -1688,4 +1688,4 @@ jsval CEntity::SetRun( JSContext* cx, uintN argc, jsval* argv ) jsval CEntity::GetRunState( JSContext* UNUSED(cx), uintN UNUSED(argc), jsval* UNUSED(argv) ) { return m_isRunning; -} \ No newline at end of file +} diff --git a/source/tools/atlas/GameInterface/DeltaArray.h b/source/tools/atlas/GameInterface/DeltaArray.h index ca3c8647d8..adaa2bd56e 100644 --- a/source/tools/atlas/GameInterface/DeltaArray.h +++ b/source/tools/atlas/GameInterface/DeltaArray.h @@ -4,6 +4,8 @@ template class DeltaArray2D { public: + virtual ~DeltaArray2D() {} + T get(int x, int y); void set(int x, int y, const T& val); diff --git a/source/tools/atlas/GameInterface/Handlers/CameraCtrl.cpp b/source/tools/atlas/GameInterface/Handlers/CameraCtrl.cpp index d20d00f3b1..6ee1ce8e27 100644 --- a/source/tools/atlas/GameInterface/Handlers/CameraCtrl.cpp +++ b/source/tools/atlas/GameInterface/Handlers/CameraCtrl.cpp @@ -60,7 +60,7 @@ MESSAGEHANDLER(Scroll) CVector3D origin, dir; float x, y; msg->pos.GetScreenSpace(x, y); - g_Game->GetView()->GetCamera()->BuildCameraRay(x, y, origin, dir); + g_Game->GetView()->GetCamera()->BuildCameraRay((int)x, (int)y, origin, dir); dir *= targetDistance; camera.Translate(targetPos - dir - origin); g_Game->GetView()->GetCamera()->UpdateFrustum(); diff --git a/source/tools/atlas/GameInterface/Handlers/Elevation.cpp b/source/tools/atlas/GameInterface/Handlers/Elevation.cpp index ef3d729e78..76f4876a77 100644 --- a/source/tools/atlas/GameInterface/Handlers/Elevation.cpp +++ b/source/tools/atlas/GameInterface/Handlers/Elevation.cpp @@ -115,7 +115,7 @@ BEGIN_COMMAND(AlterElevation) // TODO: proper variable raise amount (store floats in terrain delta array?) float b = g_CurrentBrush.Get(dx, dy); if (b) - m_TerrainDelta.RaiseVertex(x0+dx, y0+dy, amount*b); + m_TerrainDelta.RaiseVertex(x0+dx, y0+dy, (int)(amount*b)); } g_Game->GetWorld()->GetTerrain()->MakeDirty(x0, y0, x0+g_CurrentBrush.m_W, y0+g_CurrentBrush.m_H, RENDERDATA_UPDATE_VERTICES); diff --git a/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp index 30a4191fa2..b83e2c8076 100644 --- a/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp +++ b/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp @@ -316,7 +316,7 @@ QUERYHANDLER(SelectObject) msg->pos.GetScreenSpace(x, y); CVector3D rayorigin, raydir; - g_Game->GetView()->GetCamera()->BuildCameraRay(x, y, rayorigin, raydir); + g_Game->GetView()->GetCamera()->BuildCameraRay((int)x, (int)y, rayorigin, raydir); CUnit* target = g_UnitMan.PickUnit(rayorigin, raydir); diff --git a/source/tools/dds/DDS.pm b/source/tools/dds/DDS.pm new file mode 100644 index 0000000000..737e1c503b --- /dev/null +++ b/source/tools/dds/DDS.pm @@ -0,0 +1,132 @@ +use strict; +use warnings; + +package DDS; + +sub new +{ + my $proto = shift; + my $class = ref($proto) || $proto; + + my $fh; + if (ref $_[0]) + { + $fh = $_[0]; + } + else + { + open $fh, '<', $_[0] or die "Cannot open $_[0]"; + binmode $fh; + } + + my %dds; + $dds{dwMagic} = pack L => read_DWORD($fh); + for (qw(Size Flags Height Width PitchOrLinearSize Depth MipMapCount)) + { + $dds{"dw$_"} = read_DWORD($fh); + } + read_DWORD($fh) for 1..11; # dwReserved1 + + $dds{dwFlags} = expand_flags($dds{dwFlags}, 'sd'); + + $dds{ddpfPixelFormat} = read_DDPIXELFORMAT($fh); + $dds{ddsCaps} = read_DDCAPS2($fh); + + read_DWORD($fh);# dwReserved2 + + bless \%dds, $class; +} + +sub getType +{ + my ($self) = @_; + if (grep $_ eq 'DDPF_RGB', @{$self->{ddpfPixelFormat}{dwFlags}}) + { + return pack N => ( + ((unpack L => 'RRRR') & $self->{ddpfPixelFormat}{dwRBitMask}) | + ((unpack L => 'GGGG') & $self->{ddpfPixelFormat}{dwGBitMask}) | + ((unpack L => 'BBBB') & $self->{ddpfPixelFormat}{dwBBitMask}) | + ((unpack L => 'AAAA') & $self->{ddpfPixelFormat}{dwRGBAlphaBitMask}) + ); + } + elsif (grep $_ eq 'DDPF_FOURCC', @{$self->{ddpfPixelFormat}{dwFlags}}) + { + return $self->{ddpfPixelFormat}{dwFourCC} + } + else + { + die "Unknown type"; + } +} + + +sub read_DWORD +{ + die "Failed to read DWORD" unless (read $_[0], my $b, 4) == 4; + return unpack L => $b; +} + +sub read_DDPIXELFORMAT +{ + my $r = { map +("dw$_" => read_DWORD($_[0])), + qw(Size Flags FourCC RGBBitCount RBitMask GBitMask BBitMask RGBAlphaBitMask) }; + + $r->{dwFourCC} = pack L => $r->{dwFourCC}; + $r->{dwFlags} = expand_flags($r->{dwFlags}, 'pf'); + + return $r; +} + +sub read_DDCAPS2 +{ + my $r = { map +("dw$_" => read_DWORD($_[0])), + qw(Caps1 Caps2) }; + + $r->{dwCaps1} = expand_flags($r->{dwCaps1}, 'cap1'); + $r->{dwCaps2} = expand_flags($r->{dwCaps2}, 'cap2'); + + return $r; +} + + + +my %flag_names = ( + sd => { + DDSD_CAPS => 0x00000001, + DDSD_HEIGHT => 0x00000002, + DDSD_WIDTH => 0x00000004, + DDSD_PITCH => 0x00000008, + DDSD_PIXELFORMAT => 0x00001000, + DDSD_MIPMAPCOUNT => 0x00020000, + DDSD_LINEARSIZE => 0x00080000, + DDSD_DEPTH => 0x00800000, + }, + pf => { + DDPF_ALPHAPIXELS => 0x00000001, + DDPF_FOURCC => 0x00000004, + DDPF_RGB => 0x00000040, + }, + cap1 => { + DDSCAPS_COMPLEX => 0x00000008, + DDSCAPS_TEXTURE => 0x00001000, + DDSCAPS_MIPMAP => 0x00400000, + }, + cap2 => { + DDSCAPS2_CUBEMAP => 0x00000200, + DDSCAPS2_CUBEMAP_POSITIVEX => 0x00000400, + DDSCAPS2_CUBEMAP_NEGATIVEX => 0x00000800, + DDSCAPS2_CUBEMAP_POSITIVEY => 0x00001000, + DDSCAPS2_CUBEMAP_NEGATIVEY => 0x00002000, + DDSCAPS2_CUBEMAP_POSITIVEZ => 0x00004000, + DDSCAPS2_CUBEMAP_NEGATIVEZ => 0x00008000, + DDSCAPS2_VOLUME => 0x00200000, + }, +); + +sub expand_flags +{ + my ($n, $name) = @_; + return [ grep $flag_names{$name}{$_} & $n, keys %{$flag_names{$name}} ]; +} + +1; diff --git a/source/tools/dds/dds_analyse.pl b/source/tools/dds/dds_analyse.pl new file mode 100644 index 0000000000..64419055eb --- /dev/null +++ b/source/tools/dds/dds_analyse.pl @@ -0,0 +1,47 @@ +use DDS; +use Data::Dumper; +use File::Find; + +my @dds; +find({ + wanted => sub { + if (/(\.svn|CVS)$/) + { + $File::Find::prune = 1; + } + else + { + push @dds, $File::Find::name if /\.dds$/; + } + }, + no_chdir => 1, +}, "../../../binaries/data/mods/official/art/textures/"); + + +=pod +for my $f (@dds) +{ + my $dds = new DDS($f); + print "$f\t", $dds->getType(), "\n"; +} +=cut + +#=pod +my @c; +for my $f (@dds) +{ + my $dds = new DDS($f); + if ($dds->getType() eq 'ARGB') + { + $f =~ /(.*).dds/ or die; + push @c, $1; + } +} +print "textureconv -tga ".(join ' ', map "$_.dds", @c)."\n"; +print "textureconv -abgr ".(join ' ', map "$_.tga", @c)."\n"; +=cut + +=pod +my $dds = new DDS("../../../binaries/data/mods/official/art/textures/ui/session/status_pane.dds"); +print Dumper $dds; +=cut \ No newline at end of file diff --git a/source/tools/textureconv/main.cpp b/source/tools/textureconv/main.cpp index 26bef82f07..1af47c0da1 100644 --- a/source/tools/textureconv/main.cpp +++ b/source/tools/textureconv/main.cpp @@ -33,7 +33,7 @@ const TCHAR* msgbox_title = _T("Wildfire Games - Texture Converter"); -enum OutputFileFormat { DXTn, DXT1, DXT3, DXT5, BMP, TGA, BEST }; +enum OutputFileFormat { DXTn, DXT1, DXT3, DXT5, ABGR, BMP, TGA, BEST }; enum trool { tr_false, tr_true, tr_maybe }; struct ConversionSettings { @@ -132,6 +132,8 @@ void process_args(int argc, TCHAR** argv) settings.top().fmt = DXT3; CASE("-dxt5") settings.top().fmt = DXT5; + CASE("-abgr") + settings.top().fmt = ABGR; CASE("-bmp") settings.top().fmt = BMP; CASE("-tga") @@ -183,6 +185,7 @@ void convert(std::tstring filename, ConversionSettings& settings) case DXT1: case DXT3: case DXT5: + case ABGR: extn = _T(".dds"); break; case BMP: @@ -325,6 +328,9 @@ void convert(std::tstring filename, ConversionSettings& settings) case DXT5: ilSetInteger(IL_DXTC_FORMAT, IL_DXT5); break; + case ABGR: + ilSetInteger(IL_DXTC_FORMAT, IL_DXT_NO_COMP); + break; } if (settings.mipmaps) diff --git a/source/tools/textureconv/textureconv.sln b/source/tools/textureconv/textureconv.sln index 2af957b80e..fe75649281 100644 --- a/source/tools/textureconv/textureconv.sln +++ b/source/tools/textureconv/textureconv.sln @@ -23,14 +23,14 @@ Global {FFB317CC-4B72-4CA5-9CB8-86A8A0E8382E}.Debug.Build.0 = Debug|Win32 {FFB317CC-4B72-4CA5-9CB8-86A8A0E8382E}.Release.ActiveCfg = Release|Win32 {FFB317CC-4B72-4CA5-9CB8-86A8A0E8382E}.Release.Build.0 = Release|Win32 - {76BBC723-9716-451F-92D9-A7B65F3BA85F}.Debug.ActiveCfg = Debug|Win32 - {76BBC723-9716-451F-92D9-A7B65F3BA85F}.Debug.Build.0 = Debug|Win32 - {76BBC723-9716-451F-92D9-A7B65F3BA85F}.Release.ActiveCfg = Release|Win32 - {76BBC723-9716-451F-92D9-A7B65F3BA85F}.Release.Build.0 = Release|Win32 - {984C31F1-11EB-4D44-ACF4-B3F573E1F08E}.Debug.ActiveCfg = Debug|Win32 - {984C31F1-11EB-4D44-ACF4-B3F573E1F08E}.Debug.Build.0 = Debug|Win32 - {984C31F1-11EB-4D44-ACF4-B3F573E1F08E}.Release.ActiveCfg = Release|Win32 - {984C31F1-11EB-4D44-ACF4-B3F573E1F08E}.Release.Build.0 = Release|Win32 + {76BBC723-9716-451F-92D9-A7B65F3BA85F}.Debug.ActiveCfg = Debug Unicode|Win32 + {76BBC723-9716-451F-92D9-A7B65F3BA85F}.Debug.Build.0 = Debug Unicode|Win32 + {76BBC723-9716-451F-92D9-A7B65F3BA85F}.Release.ActiveCfg = Release Unicode|Win32 + {76BBC723-9716-451F-92D9-A7B65F3BA85F}.Release.Build.0 = Release Unicode|Win32 + {984C31F1-11EB-4D44-ACF4-B3F573E1F08E}.Debug.ActiveCfg = Debug Unicode|Win32 + {984C31F1-11EB-4D44-ACF4-B3F573E1F08E}.Debug.Build.0 = Debug Unicode|Win32 + {984C31F1-11EB-4D44-ACF4-B3F573E1F08E}.Release.ActiveCfg = Release Unicode|Win32 + {984C31F1-11EB-4D44-ACF4-B3F573E1F08E}.Release.Build.0 = Release Unicode|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/source/tools/textureconv/textureconv.vcproj b/source/tools/textureconv/textureconv.vcproj index 4e50aa32a6..c352c6910c 100644 --- a/source/tools/textureconv/textureconv.vcproj +++ b/source/tools/textureconv/textureconv.vcproj @@ -4,6 +4,7 @@ Version="7.10" Name="textureconv" ProjectGUID="{FFB317CC-4B72-4CA5-9CB8-86A8A0E8382E}" + RootNamespace="textureconv" Keyword="Win32Proj">