diff --git a/Makefile b/Makefile index b96f26b..6e5c33f 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,13 @@ all: mkdir -p ./build cd libs && $(MAKE) - cd radiant && $(MAKE) + cd src && $(MAKE) cd plugins && $(MAKE) cd tools && $(MAKE) cd resources && $(MAKE) clean: cd libs && $(MAKE) clean - cd radiant && $(MAKE) clean + cd src && $(MAKE) clean cd plugins && $(MAKE) clean cd tools && $(MAKE) clean diff --git a/regression_tests/q3map2/base_winding/README.txt b/docs/regression_tests/base_winding/README.txt similarity index 100% rename from regression_tests/q3map2/base_winding/README.txt rename to docs/regression_tests/base_winding/README.txt diff --git a/regression_tests/q3map2/base_winding/base_winding_logging.patch b/docs/regression_tests/base_winding/base_winding_logging.patch similarity index 100% rename from regression_tests/q3map2/base_winding/base_winding_logging.patch rename to docs/regression_tests/base_winding/base_winding_logging.patch diff --git a/regression_tests/q3map2/base_winding/maps/base_winding.map b/docs/regression_tests/base_winding/maps/base_winding.map similarity index 100% rename from regression_tests/q3map2/base_winding/maps/base_winding.map rename to docs/regression_tests/base_winding/maps/base_winding.map diff --git a/regression_tests/q3map2/coarse_snap_normal/README.txt b/docs/regression_tests/coarse_snap_normal/README.txt similarity index 100% rename from regression_tests/q3map2/coarse_snap_normal/README.txt rename to docs/regression_tests/coarse_snap_normal/README.txt diff --git a/regression_tests/q3map2/coarse_snap_normal/maps/coarse_snap_normal.map b/docs/regression_tests/coarse_snap_normal/maps/coarse_snap_normal.map similarity index 100% rename from regression_tests/q3map2/coarse_snap_normal/maps/coarse_snap_normal.map rename to docs/regression_tests/coarse_snap_normal/maps/coarse_snap_normal.map diff --git a/regression_tests/q3map2/decal_misalignment/README.txt b/docs/regression_tests/decal_misalignment/README.txt similarity index 100% rename from regression_tests/q3map2/decal_misalignment/README.txt rename to docs/regression_tests/decal_misalignment/README.txt diff --git a/regression_tests/q3map2/decal_misalignment/maps/decal_misalignment.map b/docs/regression_tests/decal_misalignment/maps/decal_misalignment.map similarity index 100% rename from regression_tests/q3map2/decal_misalignment/maps/decal_misalignment.map rename to docs/regression_tests/decal_misalignment/maps/decal_misalignment.map diff --git a/regression_tests/q3map2/decal_misalignment/scripts/radiant_regression_tests.shader b/docs/regression_tests/decal_misalignment/scripts/radiant_regression_tests.shader similarity index 100% rename from regression_tests/q3map2/decal_misalignment/scripts/radiant_regression_tests.shader rename to docs/regression_tests/decal_misalignment/scripts/radiant_regression_tests.shader diff --git a/regression_tests/q3map2/degenerate_winding/README.txt b/docs/regression_tests/degenerate_winding/README.txt similarity index 100% rename from regression_tests/q3map2/degenerate_winding/README.txt rename to docs/regression_tests/degenerate_winding/README.txt diff --git a/regression_tests/q3map2/degenerate_winding/maps/degenerate_winding.map b/docs/regression_tests/degenerate_winding/maps/degenerate_winding.map similarity index 100% rename from regression_tests/q3map2/degenerate_winding/maps/degenerate_winding.map rename to docs/regression_tests/degenerate_winding/maps/degenerate_winding.map diff --git a/regression_tests/q3map2/degenerate_winding2/README.txt b/docs/regression_tests/degenerate_winding2/README.txt similarity index 100% rename from regression_tests/q3map2/degenerate_winding2/README.txt rename to docs/regression_tests/degenerate_winding2/README.txt diff --git a/regression_tests/q3map2/degenerate_winding2/maps/degenerate_winding2.map b/docs/regression_tests/degenerate_winding2/maps/degenerate_winding2.map similarity index 100% rename from regression_tests/q3map2/degenerate_winding2/maps/degenerate_winding2.map rename to docs/regression_tests/degenerate_winding2/maps/degenerate_winding2.map diff --git a/regression_tests/q3map2/degenerate_winding3/README.txt b/docs/regression_tests/degenerate_winding3/README.txt similarity index 100% rename from regression_tests/q3map2/degenerate_winding3/README.txt rename to docs/regression_tests/degenerate_winding3/README.txt diff --git a/regression_tests/q3map2/degenerate_winding3/maps/degenerate_winding3.map b/docs/regression_tests/degenerate_winding3/maps/degenerate_winding3.map similarity index 100% rename from regression_tests/q3map2/degenerate_winding3/maps/degenerate_winding3.map rename to docs/regression_tests/degenerate_winding3/maps/degenerate_winding3.map diff --git a/regression_tests/q3map2/disappearing_sliver/README.txt b/docs/regression_tests/disappearing_sliver/README.txt similarity index 100% rename from regression_tests/q3map2/disappearing_sliver/README.txt rename to docs/regression_tests/disappearing_sliver/README.txt diff --git a/regression_tests/q3map2/disappearing_sliver/maps/disappearing_sliver.map b/docs/regression_tests/disappearing_sliver/maps/disappearing_sliver.map similarity index 100% rename from regression_tests/q3map2/disappearing_sliver/maps/disappearing_sliver.map rename to docs/regression_tests/disappearing_sliver/maps/disappearing_sliver.map diff --git a/regression_tests/q3map2/disappearing_sliver/winding_logging.patch b/docs/regression_tests/disappearing_sliver/winding_logging.patch similarity index 100% rename from regression_tests/q3map2/disappearing_sliver/winding_logging.patch rename to docs/regression_tests/disappearing_sliver/winding_logging.patch diff --git a/regression_tests/q3map2/disappearing_sliver2/README.txt b/docs/regression_tests/disappearing_sliver2/README.txt similarity index 100% rename from regression_tests/q3map2/disappearing_sliver2/README.txt rename to docs/regression_tests/disappearing_sliver2/README.txt diff --git a/regression_tests/q3map2/disappearing_sliver2/maps/disappearing_sliver2.map b/docs/regression_tests/disappearing_sliver2/maps/disappearing_sliver2.map similarity index 100% rename from regression_tests/q3map2/disappearing_sliver2/maps/disappearing_sliver2.map rename to docs/regression_tests/disappearing_sliver2/maps/disappearing_sliver2.map diff --git a/regression_tests/q3map2/disappearing_sliver3/NOTES.txt b/docs/regression_tests/disappearing_sliver3/NOTES.txt similarity index 100% rename from regression_tests/q3map2/disappearing_sliver3/NOTES.txt rename to docs/regression_tests/disappearing_sliver3/NOTES.txt diff --git a/regression_tests/q3map2/disappearing_sliver3/README.txt b/docs/regression_tests/disappearing_sliver3/README.txt similarity index 100% rename from regression_tests/q3map2/disappearing_sliver3/README.txt rename to docs/regression_tests/disappearing_sliver3/README.txt diff --git a/regression_tests/q3map2/disappearing_sliver3/maps/disappearing_sliver3.map b/docs/regression_tests/disappearing_sliver3/maps/disappearing_sliver3.map similarity index 100% rename from regression_tests/q3map2/disappearing_sliver3/maps/disappearing_sliver3.map rename to docs/regression_tests/disappearing_sliver3/maps/disappearing_sliver3.map diff --git a/regression_tests/q3map2/duplicate_plane/README.txt b/docs/regression_tests/duplicate_plane/README.txt similarity index 100% rename from regression_tests/q3map2/duplicate_plane/README.txt rename to docs/regression_tests/duplicate_plane/README.txt diff --git a/regression_tests/q3map2/duplicate_plane/maps/duplicate_plane.map b/docs/regression_tests/duplicate_plane/maps/duplicate_plane.map similarity index 100% rename from regression_tests/q3map2/duplicate_plane/maps/duplicate_plane.map rename to docs/regression_tests/duplicate_plane/maps/duplicate_plane.map diff --git a/regression_tests/q3map2/model_clipping_45_degrees/README.txt b/docs/regression_tests/model_clipping_45_degrees/README.txt similarity index 100% rename from regression_tests/q3map2/model_clipping_45_degrees/README.txt rename to docs/regression_tests/model_clipping_45_degrees/README.txt diff --git a/regression_tests/q3map2/model_clipping_45_degrees/maps/model_clipping_45_degrees.map b/docs/regression_tests/model_clipping_45_degrees/maps/model_clipping_45_degrees.map similarity index 100% rename from regression_tests/q3map2/model_clipping_45_degrees/maps/model_clipping_45_degrees.map rename to docs/regression_tests/model_clipping_45_degrees/maps/model_clipping_45_degrees.map diff --git a/regression_tests/q3map2/model_clipping_45_degrees/models/mapobjects/wedges/wedge_45.ase b/docs/regression_tests/model_clipping_45_degrees/models/mapobjects/wedges/wedge_45.ase similarity index 100% rename from regression_tests/q3map2/model_clipping_45_degrees/models/mapobjects/wedges/wedge_45.ase rename to docs/regression_tests/model_clipping_45_degrees/models/mapobjects/wedges/wedge_45.ase diff --git a/regression_tests/q3map2/model_clipping_45_degrees/models/mapobjects/wedges/wedge_shallow.ase b/docs/regression_tests/model_clipping_45_degrees/models/mapobjects/wedges/wedge_shallow.ase similarity index 100% rename from regression_tests/q3map2/model_clipping_45_degrees/models/mapobjects/wedges/wedge_shallow.ase rename to docs/regression_tests/model_clipping_45_degrees/models/mapobjects/wedges/wedge_shallow.ase diff --git a/regression_tests/q3map2/model_clipping_45_degrees/models/mapobjects/wedges/wedge_steep.ase b/docs/regression_tests/model_clipping_45_degrees/models/mapobjects/wedges/wedge_steep.ase similarity index 100% rename from regression_tests/q3map2/model_clipping_45_degrees/models/mapobjects/wedges/wedge_steep.ase rename to docs/regression_tests/model_clipping_45_degrees/models/mapobjects/wedges/wedge_steep.ase diff --git a/regression_tests/q3map2/model_clipping_45_degrees/scripts/radiant_regression_tests.shader b/docs/regression_tests/model_clipping_45_degrees/scripts/radiant_regression_tests.shader similarity index 100% rename from regression_tests/q3map2/model_clipping_45_degrees/scripts/radiant_regression_tests.shader rename to docs/regression_tests/model_clipping_45_degrees/scripts/radiant_regression_tests.shader diff --git a/regression_tests/q3map2/patch_seam/README.txt b/docs/regression_tests/patch_seam/README.txt similarity index 100% rename from regression_tests/q3map2/patch_seam/README.txt rename to docs/regression_tests/patch_seam/README.txt diff --git a/regression_tests/q3map2/patch_seam/maps/patch_seam.map b/docs/regression_tests/patch_seam/maps/patch_seam.map similarity index 100% rename from regression_tests/q3map2/patch_seam/maps/patch_seam.map rename to docs/regression_tests/patch_seam/maps/patch_seam.map diff --git a/regression_tests/q3map2/patch_seam/textures/radiant_regression_tests/green.tga b/docs/regression_tests/patch_seam/textures/radiant_regression_tests/green.tga similarity index 100% rename from regression_tests/q3map2/patch_seam/textures/radiant_regression_tests/green.tga rename to docs/regression_tests/patch_seam/textures/radiant_regression_tests/green.tga diff --git a/regression_tests/q3map2/patch_seam/textures/radiant_regression_tests/tile.tga b/docs/regression_tests/patch_seam/textures/radiant_regression_tests/tile.tga similarity index 100% rename from regression_tests/q3map2/patch_seam/textures/radiant_regression_tests/tile.tga rename to docs/regression_tests/patch_seam/textures/radiant_regression_tests/tile.tga diff --git a/regression_tests/q3map2/piercing_triangle/README.txt b/docs/regression_tests/piercing_triangle/README.txt similarity index 100% rename from regression_tests/q3map2/piercing_triangle/README.txt rename to docs/regression_tests/piercing_triangle/README.txt diff --git a/regression_tests/q3map2/piercing_triangle/maps/piercing_triangle.map b/docs/regression_tests/piercing_triangle/maps/piercing_triangle.map similarity index 100% rename from regression_tests/q3map2/piercing_triangle/maps/piercing_triangle.map rename to docs/regression_tests/piercing_triangle/maps/piercing_triangle.map diff --git a/regression_tests/q3map2/plane_aliasing/README.txt b/docs/regression_tests/plane_aliasing/README.txt similarity index 100% rename from regression_tests/q3map2/plane_aliasing/README.txt rename to docs/regression_tests/plane_aliasing/README.txt diff --git a/regression_tests/q3map2/plane_aliasing/maps/plane_aliasing.map b/docs/regression_tests/plane_aliasing/maps/plane_aliasing.map similarity index 100% rename from regression_tests/q3map2/plane_aliasing/maps/plane_aliasing.map rename to docs/regression_tests/plane_aliasing/maps/plane_aliasing.map diff --git a/regression_tests/q3map2/segmentation_fault/README.txt b/docs/regression_tests/segmentation_fault/README.txt similarity index 100% rename from regression_tests/q3map2/segmentation_fault/README.txt rename to docs/regression_tests/segmentation_fault/README.txt diff --git a/regression_tests/q3map2/segmentation_fault/maps/segmentation_fault.map b/docs/regression_tests/segmentation_fault/maps/segmentation_fault.map similarity index 100% rename from regression_tests/q3map2/segmentation_fault/maps/segmentation_fault.map rename to docs/regression_tests/segmentation_fault/maps/segmentation_fault.map diff --git a/regression_tests/q3map2/snap_plane/README.txt b/docs/regression_tests/snap_plane/README.txt similarity index 100% rename from regression_tests/q3map2/snap_plane/README.txt rename to docs/regression_tests/snap_plane/README.txt diff --git a/regression_tests/q3map2/snap_plane/maps/snap_plane.map b/docs/regression_tests/snap_plane/maps/snap_plane.map similarity index 100% rename from regression_tests/q3map2/snap_plane/maps/snap_plane.map rename to docs/regression_tests/snap_plane/maps/snap_plane.map diff --git a/regression_tests/q3map2/sparkly_seam/README.txt b/docs/regression_tests/sparkly_seam/README.txt similarity index 100% rename from regression_tests/q3map2/sparkly_seam/README.txt rename to docs/regression_tests/sparkly_seam/README.txt diff --git a/regression_tests/q3map2/sparkly_seam/maps/sparkly_seam.map b/docs/regression_tests/sparkly_seam/maps/sparkly_seam.map similarity index 100% rename from regression_tests/q3map2/sparkly_seam/maps/sparkly_seam.map rename to docs/regression_tests/sparkly_seam/maps/sparkly_seam.map diff --git a/include/aboutmsg.default b/include/aboutmsg.default deleted file mode 100644 index 0f53645..0000000 --- a/include/aboutmsg.default +++ /dev/null @@ -1 +0,0 @@ -Custom build based on trunk \ No newline at end of file diff --git a/libs/etclib.c b/libs/etclib.c deleted file mode 100644 index 09a149e..0000000 --- a/libs/etclib.c +++ /dev/null @@ -1,114 +0,0 @@ -// Copyright 2009 Google Inc. -// -// Based on the code from Android ETC1Util. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "etclib.h" - -static void ETC_DecodeETC1SubBlock( byte *out, qboolean outRGBA, int r, int g, int b, int tableIndex, unsigned int low, qboolean second, qboolean flipped ){ - int baseX = 0, baseY = 0; - const int modifierTable[] = { - 2, 8, -2, -8, - 5, 17, -5, -17, - 9, 29, -9, -29, - 13, 42, -13, -42, - 18, 60, -18, -60, - 24, 80, -24, -80, - 33, 106, -33, -106, - 47, 183, -47, -183 - }; - const int *table = modifierTable + tableIndex * 4; - int i; - - if ( second ) { - if ( flipped ) { - baseY = 2; - } - else { - baseX = 2; - } - } - - for ( i = 0; i < 8; i++ ) - { - int x, y, k, delta; - int qr, qg, qb; - byte *q; - - if ( flipped ) { - x = baseX + ( i >> 1 ); - y = baseY + ( i & 1 ); - } - else { - x = baseX + ( i >> 2 ); - y = baseY + ( i & 3 ); - } - k = y + ( x * 4 ); - delta = table[( ( low >> k ) & 1 ) | ( ( low >> ( k + 15 ) ) & 2 )]; - - qr = r + delta; - qg = g + delta; - qb = b + delta; - if ( outRGBA ) { - q = out + 4 * ( x + 4 * y ); - } - else { - q = out + 3 * ( x + 4 * y ); - } - *( q++ ) = ( ( qr > 0 ) ? ( ( qr < 255 ) ? qr : 255 ) : 0 ); - *( q++ ) = ( ( qg > 0 ) ? ( ( qg < 255 ) ? qg : 255 ) : 0 ); - *( q++ ) = ( ( qb > 0 ) ? ( ( qb < 255 ) ? qb : 255 ) : 0 ); - if ( outRGBA ) { - *( q++ ) = 255; - } - } -} - -void ETC_DecodeETC1Block( const byte* in, byte* out, qboolean outRGBA ){ - unsigned int high = ( in[0] << 24 ) | ( in[1] << 16 ) | ( in[2] << 8 ) | in[3]; - unsigned int low = ( in[4] << 24 ) | ( in[5] << 16 ) | ( in[6] << 8 ) | in[7]; - int r1, r2, g1, g2, b1, b2; - qboolean flipped = ( ( high & 1 ) != 0 ); - - if ( high & 2 ) { - int rBase, gBase, bBase; - const int lookup[] = { 0, 1, 2, 3, -4, -3, -2, -1 }; - - rBase = ( high >> 27 ) & 31; - r1 = ( rBase << 3 ) | ( rBase >> 2 ); - rBase = ( rBase + ( lookup[( high >> 24 ) & 7] ) ) & 31; - r2 = ( rBase << 3 ) | ( rBase >> 2 ); - - gBase = ( high >> 19 ) & 31; - g1 = ( gBase << 3 ) | ( gBase >> 2 ); - gBase = ( gBase + ( lookup[( high >> 16 ) & 7] ) ) & 31; - g2 = ( gBase << 3 ) | ( gBase >> 2 ); - - bBase = ( high >> 11 ) & 31; - b1 = ( bBase << 3 ) | ( bBase >> 2 ); - bBase = ( bBase + ( lookup[( high >> 8 ) & 7] ) ) & 31; - b2 = ( bBase << 3 ) | ( bBase >> 2 ); - } - else { - r1 = ( ( high >> 24 ) & 0xf0 ) | ( ( high >> 28 ) & 0xf ); - r2 = ( ( high >> 20 ) & 0xf0 ) | ( ( high >> 24 ) & 0xf ); - g1 = ( ( high >> 16 ) & 0xf0 ) | ( ( high >> 20 ) & 0xf ); - g2 = ( ( high >> 12 ) & 0xf0 ) | ( ( high >> 16 ) & 0xf ); - b1 = ( ( high >> 8 ) & 0xf0 ) | ( ( high >> 12 ) & 0xf ); - b2 = ( ( high >> 4 ) & 0xf0 ) | ( ( high >> 8 ) & 0xf ); - } - - ETC_DecodeETC1SubBlock( out, outRGBA, r1, g1, b1, ( high >> 5 ) & 7, low, qfalse, flipped ); - ETC_DecodeETC1SubBlock( out, outRGBA, r2, g2, b2, ( high >> 2 ) & 7, low, qtrue, flipped ); -} diff --git a/libs/etclib/Makefile b/libs/etclib/Makefile index 79e55c3..c8ebb1f 100644 --- a/libs/etclib/Makefile +++ b/libs/etclib/Makefile @@ -14,7 +14,7 @@ WS_OBJS = \ ar rcs $@ $(WS_OBJS) # object files -etclib.o: etclib.c etclib.h +etclib.o: etclib.c ../etclib.h clean: -rm -f *.o ../libetclib.a diff --git a/libs/etclib/etclib.h b/libs/etclib/etclib.h deleted file mode 100644 index 7d24074..0000000 --- a/libs/etclib/etclib.h +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2009 Google Inc. -// -// Based on the code from Android ETC1Util. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef INCLUDED_ETCLIB_H -#define INCLUDED_ETCLIB_H - -#include "bytebool.h" - -#ifdef __cplusplus -extern "C" -{ -#endif - -void ETC_DecodeETC1Block( const byte* in, byte* out, qboolean outRGBA ); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/libs/filematch.c b/libs/filematch.c deleted file mode 100644 index 5b01db7..0000000 --- a/libs/filematch.c +++ /dev/null @@ -1,74 +0,0 @@ -#include -#include "filematch.h" - -// LordHavoc: some portable directory listing code I wrote for lmp2pcx, now used in darkplaces to load id1/*.pak and such... - -int matchpattern( const char *in, const char *pattern, int caseinsensitive ){ - return matchpattern_with_separator( in, pattern, caseinsensitive, "/\\:", 0 ); -} - -// wildcard_least_one: if true * matches 1 or more characters -// if false * matches 0 or more characters -int matchpattern_with_separator( const char *in, const char *pattern, int caseinsensitive, const char *separators, int wildcard_least_one ){ - int c1, c2; - while ( *pattern ) - { - switch ( *pattern ) - { - case 0: - return 1; // end of pattern - case '?': // match any single character - if ( *in == 0 || strchr( separators, *in ) ) { - return 0; // no match - } - in++; - pattern++; - break; - case '*': // match anything until following string - if ( wildcard_least_one ) { - if ( *in == 0 || strchr( separators, *in ) ) { - return 0; // no match - } - in++; - } - pattern++; - while ( *in ) - { - if ( strchr( separators, *in ) ) { - break; - } - // see if pattern matches at this offset - if ( matchpattern_with_separator( in, pattern, caseinsensitive, separators, wildcard_least_one ) ) { - return 1; - } - // nope, advance to next offset - in++; - } - break; - default: - if ( *in != *pattern ) { - if ( !caseinsensitive ) { - return 0; // no match - } - c1 = *in; - if ( c1 >= 'A' && c1 <= 'Z' ) { - c1 += 'a' - 'A'; - } - c2 = *pattern; - if ( c2 >= 'A' && c2 <= 'Z' ) { - c2 += 'a' - 'A'; - } - if ( c1 != c2 ) { - return 0; // no match - } - } - in++; - pattern++; - break; - } - } - if ( *in ) { - return 0; // reached end of pattern but not end of input - } - return 1; // success -} diff --git a/libs/filematch/Makefile b/libs/filematch/Makefile index f507520..aeb1102 100644 --- a/libs/filematch/Makefile +++ b/libs/filematch/Makefile @@ -14,7 +14,7 @@ WS_OBJS = \ ar rcs $@ $(WS_OBJS) # object files -filematch.o: filematch.c filematch.h +filematch.o: filematch.c ../filematch.h clean: -rm -f *.o ../libfilematch.a diff --git a/libs/filematch/filematch.h b/libs/filematch/filematch.h deleted file mode 100644 index cdb340a..0000000 --- a/libs/filematch/filematch.h +++ /dev/null @@ -1,16 +0,0 @@ -#if !defined( INCLUDED_FILEMATCH_H ) -#define INCLUDED_FILEMATCH_H - -#ifdef __cplusplus -extern "C" -{ -#endif - -int matchpattern( const char *in, const char *pattern, int caseinsensitive ); -int matchpattern_with_separator( const char *in, const char *pattern, int caseinsensitive, const char *separators, int wildcard_least_one ); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/plugins/brushexport/export.cpp b/plugins/brushexport/export.cpp index 2235455..f6d84ca 100644 --- a/plugins/brushexport/export.cpp +++ b/plugins/brushexport/export.cpp @@ -10,7 +10,7 @@ #include // this is very evil, but right now there is no better way -#include "../../radiant/brush.h" +#include "../../src/brush.h" // for limNames const int MAX_MATERIAL_NAME = 20; diff --git a/radiant/Makefile b/src/Makefile similarity index 100% rename from radiant/Makefile rename to src/Makefile diff --git a/radiant/autosave.cpp b/src/autosave.cpp similarity index 100% rename from radiant/autosave.cpp rename to src/autosave.cpp diff --git a/radiant/autosave.h b/src/autosave.h similarity index 100% rename from radiant/autosave.h rename to src/autosave.h diff --git a/radiant/brush.cpp b/src/brush.cpp similarity index 100% rename from radiant/brush.cpp rename to src/brush.cpp diff --git a/radiant/brush.h b/src/brush.h similarity index 100% rename from radiant/brush.h rename to src/brush.h diff --git a/radiant/brush_primit.cpp b/src/brush_primit.cpp similarity index 100% rename from radiant/brush_primit.cpp rename to src/brush_primit.cpp diff --git a/radiant/brush_primit.h b/src/brush_primit.h similarity index 100% rename from radiant/brush_primit.h rename to src/brush_primit.h diff --git a/radiant/brushmanip.cpp b/src/brushmanip.cpp similarity index 100% rename from radiant/brushmanip.cpp rename to src/brushmanip.cpp diff --git a/radiant/brushmanip.h b/src/brushmanip.h similarity index 100% rename from radiant/brushmanip.h rename to src/brushmanip.h diff --git a/radiant/brushmodule.cpp b/src/brushmodule.cpp similarity index 100% rename from radiant/brushmodule.cpp rename to src/brushmodule.cpp diff --git a/radiant/brushmodule.h b/src/brushmodule.h similarity index 100% rename from radiant/brushmodule.h rename to src/brushmodule.h diff --git a/radiant/brushnode.cpp b/src/brushnode.cpp similarity index 100% rename from radiant/brushnode.cpp rename to src/brushnode.cpp diff --git a/radiant/brushnode.h b/src/brushnode.h similarity index 100% rename from radiant/brushnode.h rename to src/brushnode.h diff --git a/radiant/brushtokens.cpp b/src/brushtokens.cpp similarity index 100% rename from radiant/brushtokens.cpp rename to src/brushtokens.cpp diff --git a/radiant/brushtokens.h b/src/brushtokens.h similarity index 100% rename from radiant/brushtokens.h rename to src/brushtokens.h diff --git a/radiant/brushxml.cpp b/src/brushxml.cpp similarity index 100% rename from radiant/brushxml.cpp rename to src/brushxml.cpp diff --git a/radiant/brushxml.h b/src/brushxml.h similarity index 100% rename from radiant/brushxml.h rename to src/brushxml.h diff --git a/radiant/build.cpp b/src/build.cpp similarity index 100% rename from radiant/build.cpp rename to src/build.cpp diff --git a/radiant/build.h b/src/build.h similarity index 100% rename from radiant/build.h rename to src/build.h diff --git a/radiant/camwindow.cpp b/src/camwindow.cpp similarity index 100% rename from radiant/camwindow.cpp rename to src/camwindow.cpp diff --git a/radiant/camwindow.h b/src/camwindow.h similarity index 100% rename from radiant/camwindow.h rename to src/camwindow.h diff --git a/radiant/clippertool.cpp b/src/clippertool.cpp similarity index 100% rename from radiant/clippertool.cpp rename to src/clippertool.cpp diff --git a/radiant/clippertool.h b/src/clippertool.h similarity index 100% rename from radiant/clippertool.h rename to src/clippertool.h diff --git a/radiant/commands.cpp b/src/commands.cpp similarity index 100% rename from radiant/commands.cpp rename to src/commands.cpp diff --git a/radiant/commands.h b/src/commands.h similarity index 100% rename from radiant/commands.h rename to src/commands.h diff --git a/radiant/console.cpp b/src/console.cpp similarity index 100% rename from radiant/console.cpp rename to src/console.cpp diff --git a/radiant/console.h b/src/console.h similarity index 100% rename from radiant/console.h rename to src/console.h diff --git a/radiant/csg.cpp b/src/csg.cpp similarity index 100% rename from radiant/csg.cpp rename to src/csg.cpp diff --git a/radiant/csg.h b/src/csg.h similarity index 100% rename from radiant/csg.h rename to src/csg.h diff --git a/radiant/dialog.cpp b/src/dialog.cpp similarity index 100% rename from radiant/dialog.cpp rename to src/dialog.cpp diff --git a/radiant/dialog.h b/src/dialog.h similarity index 100% rename from radiant/dialog.h rename to src/dialog.h diff --git a/radiant/eclass.cpp b/src/eclass.cpp similarity index 100% rename from radiant/eclass.cpp rename to src/eclass.cpp diff --git a/radiant/eclass.h b/src/eclass.h similarity index 100% rename from radiant/eclass.h rename to src/eclass.h diff --git a/radiant/eclass_def.cpp b/src/eclass_def.cpp similarity index 100% rename from radiant/eclass_def.cpp rename to src/eclass_def.cpp diff --git a/radiant/eclass_def.h b/src/eclass_def.h similarity index 100% rename from radiant/eclass_def.h rename to src/eclass_def.h diff --git a/radiant/eclass_doom3.cpp b/src/eclass_doom3.cpp similarity index 100% rename from radiant/eclass_doom3.cpp rename to src/eclass_doom3.cpp diff --git a/radiant/eclass_doom3.h b/src/eclass_doom3.h similarity index 100% rename from radiant/eclass_doom3.h rename to src/eclass_doom3.h diff --git a/radiant/eclass_fgd.cpp b/src/eclass_fgd.cpp similarity index 100% rename from radiant/eclass_fgd.cpp rename to src/eclass_fgd.cpp diff --git a/radiant/eclass_fgd.h b/src/eclass_fgd.h similarity index 100% rename from radiant/eclass_fgd.h rename to src/eclass_fgd.h diff --git a/radiant/eclass_xml.cpp b/src/eclass_xml.cpp similarity index 100% rename from radiant/eclass_xml.cpp rename to src/eclass_xml.cpp diff --git a/radiant/eclass_xml.h b/src/eclass_xml.h similarity index 100% rename from radiant/eclass_xml.h rename to src/eclass_xml.h diff --git a/radiant/entity.cpp b/src/entity.cpp similarity index 100% rename from radiant/entity.cpp rename to src/entity.cpp diff --git a/radiant/entity.h b/src/entity.h similarity index 100% rename from radiant/entity.h rename to src/entity.h diff --git a/radiant/entityinspector.cpp b/src/entityinspector.cpp similarity index 100% rename from radiant/entityinspector.cpp rename to src/entityinspector.cpp diff --git a/radiant/entityinspector.h b/src/entityinspector.h similarity index 100% rename from radiant/entityinspector.h rename to src/entityinspector.h diff --git a/radiant/entitylist.cpp b/src/entitylist.cpp similarity index 100% rename from radiant/entitylist.cpp rename to src/entitylist.cpp diff --git a/radiant/entitylist.h b/src/entitylist.h similarity index 100% rename from radiant/entitylist.h rename to src/entitylist.h diff --git a/radiant/environment.cpp b/src/environment.cpp similarity index 100% rename from radiant/environment.cpp rename to src/environment.cpp diff --git a/radiant/environment.h b/src/environment.h similarity index 100% rename from radiant/environment.h rename to src/environment.h diff --git a/radiant/error.cpp b/src/error.cpp similarity index 100% rename from radiant/error.cpp rename to src/error.cpp diff --git a/radiant/error.h b/src/error.h similarity index 100% rename from radiant/error.h rename to src/error.h diff --git a/radiant/feedback.cpp b/src/feedback.cpp similarity index 100% rename from radiant/feedback.cpp rename to src/feedback.cpp diff --git a/radiant/feedback.h b/src/feedback.h similarity index 100% rename from radiant/feedback.h rename to src/feedback.h diff --git a/radiant/filetypes.cpp b/src/filetypes.cpp similarity index 100% rename from radiant/filetypes.cpp rename to src/filetypes.cpp diff --git a/radiant/filetypes.h b/src/filetypes.h similarity index 100% rename from radiant/filetypes.h rename to src/filetypes.h diff --git a/radiant/filters.cpp b/src/filters.cpp similarity index 100% rename from radiant/filters.cpp rename to src/filters.cpp diff --git a/radiant/filters.h b/src/filters.h similarity index 100% rename from radiant/filters.h rename to src/filters.h diff --git a/radiant/findtexturedialog.cpp b/src/findtexturedialog.cpp similarity index 100% rename from radiant/findtexturedialog.cpp rename to src/findtexturedialog.cpp diff --git a/radiant/findtexturedialog.h b/src/findtexturedialog.h similarity index 100% rename from radiant/findtexturedialog.h rename to src/findtexturedialog.h diff --git a/radiant/glwidget.cpp b/src/glwidget.cpp similarity index 100% rename from radiant/glwidget.cpp rename to src/glwidget.cpp diff --git a/radiant/glwidget.h b/src/glwidget.h similarity index 100% rename from radiant/glwidget.h rename to src/glwidget.h diff --git a/radiant/grid.cpp b/src/grid.cpp similarity index 100% rename from radiant/grid.cpp rename to src/grid.cpp diff --git a/radiant/grid.h b/src/grid.h similarity index 100% rename from radiant/grid.h rename to src/grid.h diff --git a/radiant/groupdialog.cpp b/src/groupdialog.cpp similarity index 100% rename from radiant/groupdialog.cpp rename to src/groupdialog.cpp diff --git a/radiant/groupdialog.h b/src/groupdialog.h similarity index 100% rename from radiant/groupdialog.h rename to src/groupdialog.h diff --git a/radiant/gtkdlgs.cpp b/src/gtkdlgs.cpp similarity index 100% rename from radiant/gtkdlgs.cpp rename to src/gtkdlgs.cpp diff --git a/radiant/gtkdlgs.h b/src/gtkdlgs.h similarity index 100% rename from radiant/gtkdlgs.h rename to src/gtkdlgs.h diff --git a/radiant/gtkmisc.cpp b/src/gtkmisc.cpp similarity index 100% rename from radiant/gtkmisc.cpp rename to src/gtkmisc.cpp diff --git a/radiant/gtkmisc.h b/src/gtkmisc.h similarity index 100% rename from radiant/gtkmisc.h rename to src/gtkmisc.h diff --git a/radiant/help.cpp b/src/help.cpp similarity index 100% rename from radiant/help.cpp rename to src/help.cpp diff --git a/radiant/help.h b/src/help.h similarity index 100% rename from radiant/help.h rename to src/help.h diff --git a/radiant/image.cpp b/src/image.cpp similarity index 100% rename from radiant/image.cpp rename to src/image.cpp diff --git a/radiant/image.h b/src/image.h similarity index 100% rename from radiant/image.h rename to src/image.h diff --git a/radiant/main.cpp b/src/main.cpp similarity index 100% rename from radiant/main.cpp rename to src/main.cpp diff --git a/radiant/main.h b/src/main.h similarity index 100% rename from radiant/main.h rename to src/main.h diff --git a/radiant/mainframe.cpp b/src/mainframe.cpp similarity index 100% rename from radiant/mainframe.cpp rename to src/mainframe.cpp diff --git a/radiant/mainframe.h b/src/mainframe.h similarity index 100% rename from radiant/mainframe.h rename to src/mainframe.h diff --git a/radiant/map.cpp b/src/map.cpp similarity index 100% rename from radiant/map.cpp rename to src/map.cpp diff --git a/radiant/map.h b/src/map.h similarity index 100% rename from radiant/map.h rename to src/map.h diff --git a/radiant/mru.cpp b/src/mru.cpp similarity index 100% rename from radiant/mru.cpp rename to src/mru.cpp diff --git a/radiant/mru.h b/src/mru.h similarity index 100% rename from radiant/mru.h rename to src/mru.h diff --git a/radiant/multimon.cpp b/src/multimon.cpp similarity index 100% rename from radiant/multimon.cpp rename to src/multimon.cpp diff --git a/radiant/multimon.h b/src/multimon.h similarity index 100% rename from radiant/multimon.h rename to src/multimon.h diff --git a/radiant/nullmodel.cpp b/src/nullmodel.cpp similarity index 100% rename from radiant/nullmodel.cpp rename to src/nullmodel.cpp diff --git a/radiant/nullmodel.h b/src/nullmodel.h similarity index 100% rename from radiant/nullmodel.h rename to src/nullmodel.h diff --git a/radiant/parse.cpp b/src/parse.cpp similarity index 100% rename from radiant/parse.cpp rename to src/parse.cpp diff --git a/radiant/parse.h b/src/parse.h similarity index 100% rename from radiant/parse.h rename to src/parse.h diff --git a/radiant/patch.cpp b/src/patch.cpp similarity index 100% rename from radiant/patch.cpp rename to src/patch.cpp diff --git a/radiant/patch.h b/src/patch.h similarity index 100% rename from radiant/patch.h rename to src/patch.h diff --git a/radiant/patchdialog.cpp b/src/patchdialog.cpp similarity index 100% rename from radiant/patchdialog.cpp rename to src/patchdialog.cpp diff --git a/radiant/patchdialog.h b/src/patchdialog.h similarity index 100% rename from radiant/patchdialog.h rename to src/patchdialog.h diff --git a/radiant/patchmanip.cpp b/src/patchmanip.cpp similarity index 100% rename from radiant/patchmanip.cpp rename to src/patchmanip.cpp diff --git a/radiant/patchmanip.h b/src/patchmanip.h similarity index 100% rename from radiant/patchmanip.h rename to src/patchmanip.h diff --git a/radiant/patchmodule.cpp b/src/patchmodule.cpp similarity index 100% rename from radiant/patchmodule.cpp rename to src/patchmodule.cpp diff --git a/radiant/patchmodule.h b/src/patchmodule.h similarity index 100% rename from radiant/patchmodule.h rename to src/patchmodule.h diff --git a/radiant/plugin.cpp b/src/plugin.cpp similarity index 100% rename from radiant/plugin.cpp rename to src/plugin.cpp diff --git a/radiant/plugin.h b/src/plugin.h similarity index 100% rename from radiant/plugin.h rename to src/plugin.h diff --git a/radiant/pluginapi.cpp b/src/pluginapi.cpp similarity index 100% rename from radiant/pluginapi.cpp rename to src/pluginapi.cpp diff --git a/radiant/pluginapi.h b/src/pluginapi.h similarity index 100% rename from radiant/pluginapi.h rename to src/pluginapi.h diff --git a/radiant/pluginmanager.cpp b/src/pluginmanager.cpp similarity index 100% rename from radiant/pluginmanager.cpp rename to src/pluginmanager.cpp diff --git a/radiant/pluginmanager.h b/src/pluginmanager.h similarity index 100% rename from radiant/pluginmanager.h rename to src/pluginmanager.h diff --git a/radiant/pluginmenu.cpp b/src/pluginmenu.cpp similarity index 100% rename from radiant/pluginmenu.cpp rename to src/pluginmenu.cpp diff --git a/radiant/pluginmenu.h b/src/pluginmenu.h similarity index 100% rename from radiant/pluginmenu.h rename to src/pluginmenu.h diff --git a/radiant/plugintoolbar.cpp b/src/plugintoolbar.cpp similarity index 100% rename from radiant/plugintoolbar.cpp rename to src/plugintoolbar.cpp diff --git a/radiant/plugintoolbar.h b/src/plugintoolbar.h similarity index 100% rename from radiant/plugintoolbar.h rename to src/plugintoolbar.h diff --git a/radiant/points.cpp b/src/points.cpp similarity index 100% rename from radiant/points.cpp rename to src/points.cpp diff --git a/radiant/points.h b/src/points.h similarity index 100% rename from radiant/points.h rename to src/points.h diff --git a/radiant/preferencedictionary.cpp b/src/preferencedictionary.cpp similarity index 100% rename from radiant/preferencedictionary.cpp rename to src/preferencedictionary.cpp diff --git a/radiant/preferencedictionary.h b/src/preferencedictionary.h similarity index 100% rename from radiant/preferencedictionary.h rename to src/preferencedictionary.h diff --git a/radiant/preferences.cpp b/src/preferences.cpp similarity index 100% rename from radiant/preferences.cpp rename to src/preferences.cpp diff --git a/radiant/preferences.h b/src/preferences.h similarity index 100% rename from radiant/preferences.h rename to src/preferences.h diff --git a/radiant/qe3.cpp b/src/qe3.cpp similarity index 100% rename from radiant/qe3.cpp rename to src/qe3.cpp diff --git a/radiant/qe3.h b/src/qe3.h similarity index 100% rename from radiant/qe3.h rename to src/qe3.h diff --git a/radiant/qgl.cpp b/src/qgl.cpp similarity index 100% rename from radiant/qgl.cpp rename to src/qgl.cpp diff --git a/radiant/qgl.h b/src/qgl.h similarity index 100% rename from radiant/qgl.h rename to src/qgl.h diff --git a/radiant/referencecache.cpp b/src/referencecache.cpp similarity index 100% rename from radiant/referencecache.cpp rename to src/referencecache.cpp diff --git a/radiant/referencecache.h b/src/referencecache.h similarity index 100% rename from radiant/referencecache.h rename to src/referencecache.h diff --git a/radiant/renderer.cpp b/src/renderer.cpp similarity index 100% rename from radiant/renderer.cpp rename to src/renderer.cpp diff --git a/radiant/renderer.h b/src/renderer.h similarity index 100% rename from radiant/renderer.h rename to src/renderer.h diff --git a/radiant/renderstate.cpp b/src/renderstate.cpp similarity index 100% rename from radiant/renderstate.cpp rename to src/renderstate.cpp diff --git a/radiant/renderstate.h b/src/renderstate.h similarity index 100% rename from radiant/renderstate.h rename to src/renderstate.h diff --git a/radiant/resource.h b/src/resource.h similarity index 100% rename from radiant/resource.h rename to src/resource.h diff --git a/radiant/scenegraph.cpp b/src/scenegraph.cpp similarity index 100% rename from radiant/scenegraph.cpp rename to src/scenegraph.cpp diff --git a/radiant/scenegraph.h b/src/scenegraph.h similarity index 100% rename from radiant/scenegraph.h rename to src/scenegraph.h diff --git a/radiant/select.cpp b/src/select.cpp similarity index 100% rename from radiant/select.cpp rename to src/select.cpp diff --git a/radiant/select.h b/src/select.h similarity index 100% rename from radiant/select.h rename to src/select.h diff --git a/radiant/selection.cpp b/src/selection.cpp similarity index 100% rename from radiant/selection.cpp rename to src/selection.cpp diff --git a/radiant/selection.h b/src/selection.h similarity index 100% rename from radiant/selection.h rename to src/selection.h diff --git a/radiant/server.cpp b/src/server.cpp similarity index 100% rename from radiant/server.cpp rename to src/server.cpp diff --git a/radiant/server.h b/src/server.h similarity index 100% rename from radiant/server.h rename to src/server.h diff --git a/radiant/shaders.cpp b/src/shaders.cpp similarity index 100% rename from radiant/shaders.cpp rename to src/shaders.cpp diff --git a/radiant/shaders.h b/src/shaders.h similarity index 100% rename from radiant/shaders.h rename to src/shaders.h diff --git a/radiant/sockets.cpp b/src/sockets.cpp similarity index 100% rename from radiant/sockets.cpp rename to src/sockets.cpp diff --git a/radiant/sockets.h b/src/sockets.h similarity index 100% rename from radiant/sockets.h rename to src/sockets.h diff --git a/radiant/stacktrace.cpp b/src/stacktrace.cpp similarity index 100% rename from radiant/stacktrace.cpp rename to src/stacktrace.cpp diff --git a/radiant/stacktrace.h b/src/stacktrace.h similarity index 100% rename from radiant/stacktrace.h rename to src/stacktrace.h diff --git a/radiant/surfacedialog.cpp b/src/surfacedialog.cpp similarity index 100% rename from radiant/surfacedialog.cpp rename to src/surfacedialog.cpp diff --git a/radiant/surfacedialog.h b/src/surfacedialog.h similarity index 100% rename from radiant/surfacedialog.h rename to src/surfacedialog.h diff --git a/radiant/texmanip.cpp b/src/texmanip.cpp similarity index 100% rename from radiant/texmanip.cpp rename to src/texmanip.cpp diff --git a/radiant/texmanip.h b/src/texmanip.h similarity index 100% rename from radiant/texmanip.h rename to src/texmanip.h diff --git a/radiant/textureentry.cpp b/src/textureentry.cpp similarity index 100% rename from radiant/textureentry.cpp rename to src/textureentry.cpp diff --git a/radiant/textureentry.h b/src/textureentry.h similarity index 100% rename from radiant/textureentry.h rename to src/textureentry.h diff --git a/radiant/textures.cpp b/src/textures.cpp similarity index 100% rename from radiant/textures.cpp rename to src/textures.cpp diff --git a/radiant/textures.h b/src/textures.h similarity index 100% rename from radiant/textures.h rename to src/textures.h diff --git a/radiant/texwindow.cpp b/src/texwindow.cpp similarity index 100% rename from radiant/texwindow.cpp rename to src/texwindow.cpp diff --git a/radiant/texwindow.h b/src/texwindow.h similarity index 100% rename from radiant/texwindow.h rename to src/texwindow.h diff --git a/radiant/timer.cpp b/src/timer.cpp similarity index 100% rename from radiant/timer.cpp rename to src/timer.cpp diff --git a/radiant/timer.h b/src/timer.h similarity index 100% rename from radiant/timer.h rename to src/timer.h diff --git a/radiant/treemodel.cpp b/src/treemodel.cpp similarity index 100% rename from radiant/treemodel.cpp rename to src/treemodel.cpp diff --git a/radiant/treemodel.h b/src/treemodel.h similarity index 100% rename from radiant/treemodel.h rename to src/treemodel.h diff --git a/radiant/undo.cpp b/src/undo.cpp similarity index 100% rename from radiant/undo.cpp rename to src/undo.cpp diff --git a/radiant/undo.h b/src/undo.h similarity index 100% rename from radiant/undo.h rename to src/undo.h diff --git a/radiant/url.cpp b/src/url.cpp similarity index 100% rename from radiant/url.cpp rename to src/url.cpp diff --git a/radiant/url.h b/src/url.h similarity index 100% rename from radiant/url.h rename to src/url.h diff --git a/radiant/view.cpp b/src/view.cpp similarity index 100% rename from radiant/view.cpp rename to src/view.cpp diff --git a/radiant/view.h b/src/view.h similarity index 100% rename from radiant/view.h rename to src/view.h diff --git a/radiant/watchbsp.cpp b/src/watchbsp.cpp similarity index 100% rename from radiant/watchbsp.cpp rename to src/watchbsp.cpp diff --git a/radiant/watchbsp.h b/src/watchbsp.h similarity index 100% rename from radiant/watchbsp.h rename to src/watchbsp.h diff --git a/radiant/winding.cpp b/src/winding.cpp similarity index 100% rename from radiant/winding.cpp rename to src/winding.cpp diff --git a/radiant/winding.h b/src/winding.h similarity index 100% rename from radiant/winding.h rename to src/winding.h diff --git a/radiant/windowobservers.cpp b/src/windowobservers.cpp similarity index 100% rename from radiant/windowobservers.cpp rename to src/windowobservers.cpp diff --git a/radiant/windowobservers.h b/src/windowobservers.h similarity index 100% rename from radiant/windowobservers.h rename to src/windowobservers.h diff --git a/radiant/worldspawn.ico b/src/worldspawn.ico similarity index 100% rename from radiant/worldspawn.ico rename to src/worldspawn.ico diff --git a/radiant/worldspawn.rc b/src/worldspawn.rc similarity index 100% rename from radiant/worldspawn.rc rename to src/worldspawn.rc diff --git a/radiant/xmlstuff.cpp b/src/xmlstuff.cpp similarity index 100% rename from radiant/xmlstuff.cpp rename to src/xmlstuff.cpp diff --git a/radiant/xmlstuff.h b/src/xmlstuff.h similarity index 100% rename from radiant/xmlstuff.h rename to src/xmlstuff.h diff --git a/radiant/xywindow.cpp b/src/xywindow.cpp similarity index 100% rename from radiant/xywindow.cpp rename to src/xywindow.cpp diff --git a/radiant/xywindow.h b/src/xywindow.h similarity index 100% rename from radiant/xywindow.h rename to src/xywindow.h