Merge commit '515673c08f8718a237e90c2130a1f5294f966d6a'
Conflicts: .gitignore COMPILING CONTRIBUTORS ChangeLog DoxyConfig Doxyfile Doxygen_files/Doxyfile Doxygen_files/doxy_mainpage.h Doxygen_files/doxygen_gtkradiant_foot.html Doxygen_files/doxygen_gtkradiant_head.html Doxygen_files/doxygen_index.html Doxygen_files/doxygen_reference_foot.html Doxygen_files/doxygen_reference_head.html Doxygen_files/example/annotated.html Doxygen_files/example/classIEpair-members.html Doxygen_files/example/classIEpair.html Doxygen_files/example/classes.html Doxygen_files/example/files.html Doxygen_files/example/functions.html Doxygen_files/example/graph_legend.dot Doxygen_files/example/graph_legend.html Doxygen_files/example/index.html Doxygen_files/example/pages.html Doxygen_files/example/test_8c-source.html Doxygen_files/example/test_8c.html Doxygen_files/example/todo.html Doxygen_files/genDoxyfile Doxygen_files/gendoxfunctions Doxygen_files/reference1.html README.doxygen SConscript.q3map2 SConscript.radiant TODO config.py contrib/bkgrnd2d/bkgrnd2d.vcproj contrib/bobtoolz/bobtoolz.vcproj contrib/camera/camera.vcproj contrib/gtkgensurf/gtkgensurf.vcproj contrib/hydratoolz/hydratoolz.vcproj contrib/prtview/prtview.vcproj contrib/ufoai/ufoai.vcproj gen.readme gendox libs/picomodel/picomodules.c plugins/eclassfgd/fgd.vcproj plugins/entity/entity.vcproj plugins/image/image.vcproj plugins/imagem8/imagem8.vcproj plugins/imagepng/imagepng.vcproj plugins/imagewal/imagewal.vcproj plugins/map/map.vcproj plugins/mapxml/mapxml.vcproj plugins/model/model.vcproj plugins/shaders/shaders.vcproj plugins/spritemodel/spritemodel.vcproj plugins/surface/surface.vcproj plugins/surface_heretic2/surface_heretic2.vcproj plugins/surface_quake2/surface_quake2.vcproj plugins/surface_ufoai/surface_ufoai.vcproj plugins/textool/textool.vcproj plugins/vfspak/vfspak.vcproj plugins/vfspk3/vfspk3.vcproj plugins/vfswad/vfswad.vcproj radiant.sln radiant/main.cpp radiant/mainframe.cpp radiant/preferences.cpp radiant/preferences.h radiant/radiant.vcproj setup/data/tools/plugins/bt/bt-el2.txt tools/quake3/q3map2/main.c tools/quake3/q3map2/q3map2.vcproj windows_compile_guide/index.html
This commit is contained in:
Rudolf Polzer
8
regression_tests/q3map2/patch_seam/README.txt
Normal file
8
regression_tests/q3map2/patch_seam/README.txt
Normal file
@@ -0,0 +1,8 @@
|
||||
DESCRIPTION OF PROBLEM:
|
||||
=======================
|
||||
|
||||
The seam where the two patches meet has holes. This is because the
|
||||
triangulations of the two patch meshes don't match.
|
||||
|
||||
It may or may not be possible to adjust the process of compiling patch mesh
|
||||
to make good seams more probable. Investigate.
|
||||
96
regression_tests/q3map2/patch_seam/maps/patch_seam.map
Normal file
96
regression_tests/q3map2/patch_seam/maps/patch_seam.map
Normal file
@@ -0,0 +1,96 @@
|
||||
// entity 0
|
||||
{
|
||||
"classname" "worldspawn"
|
||||
// brush 0
|
||||
{
|
||||
patchDef2
|
||||
{
|
||||
radiant_regression_tests/green
|
||||
( 3 3 0 0 0 )
|
||||
(
|
||||
( ( -512 2368 -1088 -16 -74 ) ( -512 1984 -1088 -16 -62 ) ( -512 1856 -1056 -16 -58 ) )
|
||||
( ( -592 2368 -1088 -18.500000 -74 ) ( -592 1984 -1088 -18.500000 -62 ) ( -592 1856 -1064 -18.500000 -58 ) )
|
||||
( ( -704 2368 -1088 -22 -74 ) ( -704 1984 -1088 -22 -62 ) ( -704 1856 -1064 -22 -58 ) )
|
||||
)
|
||||
}
|
||||
}
|
||||
// brush 1
|
||||
{
|
||||
patchDef2
|
||||
{
|
||||
radiant_regression_tests/green
|
||||
( 3 3 0 0 0 )
|
||||
(
|
||||
( ( -704 1792 -1020 -22 -56 ) ( -704 1824 -1058 -22 -57 ) ( -704 1856 -1064 -22 -58 ) )
|
||||
( ( -616 1792 -1020 -19.250000 -56 ) ( -616 1824 -1058 -19.250000 -57 ) ( -592 1856 -1064 -18.500000 -58 ) )
|
||||
( ( -512 1792 -1008 -16 -56 ) ( -512 1824 -1048 -16 -57 ) ( -512 1856 -1056 -16 -58 ) )
|
||||
)
|
||||
}
|
||||
}
|
||||
// brush 2
|
||||
{
|
||||
( -448 2496 -1160 ) ( -768 2496 -1160 ) ( -768 1984 -1160 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -768 1856 -1152 ) ( -768 2368 -1152 ) ( -448 2368 -1152 ) radiant_regression_tests/tile 0 0 0 0.500000 0.500000 0 0 0
|
||||
( -768 1728 -1152 ) ( -448 1728 -1152 ) ( -448 1728 -1168 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -448 1856 -1152 ) ( -448 2368 -1152 ) ( -448 2368 -1168 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -448 2496 -1152 ) ( -768 2496 -1152 ) ( -768 2496 -1168 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -768 2368 -1152 ) ( -768 1856 -1152 ) ( -768 1856 -1168 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
}
|
||||
// brush 3
|
||||
{
|
||||
( -768 2496 -1152 ) ( -824 2496 -1152 ) ( -824 1728 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -824 1728 -768 ) ( -824 2496 -768 ) ( -768 2496 -768 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -824 1728 -768 ) ( -768 1728 -768 ) ( -768 1728 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -768 1728 -768 ) ( -768 2496 -768 ) ( -768 2496 -1152 ) radiant_regression_tests/tile 0 0 0 0.500000 0.500000 0 0 0
|
||||
( -768 2496 -768 ) ( -824 2496 -768 ) ( -824 2496 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -776 2496 -768 ) ( -776 1728 -768 ) ( -776 1728 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
}
|
||||
// brush 4
|
||||
{
|
||||
( -320 2496 -1152 ) ( -448 2496 -1152 ) ( -448 1728 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -448 1728 -768 ) ( -448 2496 -768 ) ( -320 2496 -768 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -448 1728 -768 ) ( -320 1728 -768 ) ( -320 1728 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -440 1728 -752 ) ( -440 2496 -752 ) ( -440 2496 -1136 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -320 2496 -768 ) ( -448 2496 -768 ) ( -448 2496 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -448 2496 -768 ) ( -448 1728 -768 ) ( -448 1728 -1152 ) radiant_regression_tests/tile 0 0 0 0.500000 0.500000 0 0 0
|
||||
}
|
||||
// brush 5
|
||||
{
|
||||
( -448 2496 -768 ) ( -768 2496 -768 ) ( -768 1728 -768 ) radiant_regression_tests/tile 0 0 0 0.500000 0.500000 0 0 0
|
||||
( -752 1728 -760 ) ( -752 2496 -760 ) ( -432 2496 -760 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -768 1728 -704 ) ( -448 1728 -704 ) ( -448 1728 -768 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -448 1728 -704 ) ( -448 2496 -704 ) ( -448 2496 -768 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -448 2496 -704 ) ( -768 2496 -704 ) ( -768 2496 -768 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -768 2496 -704 ) ( -768 1728 -704 ) ( -768 1728 -768 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
}
|
||||
// brush 6
|
||||
{
|
||||
( -448 2552 -1152 ) ( -768 2552 -1152 ) ( -768 2496 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -768 2496 -768 ) ( -768 2552 -768 ) ( -448 2552 -768 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -768 2496 -768 ) ( -448 2496 -768 ) ( -448 2496 -1160 ) radiant_regression_tests/tile 0 0 0 0.500000 0.500000 0 0 0
|
||||
( -448 2496 -768 ) ( -448 2552 -768 ) ( -448 2552 -1160 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -448 2504 -760 ) ( -768 2504 -760 ) ( -768 2504 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -768 2552 -768 ) ( -768 2496 -768 ) ( -768 2496 -1160 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
}
|
||||
// brush 7
|
||||
{
|
||||
( -448 1728 -1152 ) ( -768 1728 -1152 ) ( -768 1656 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -768 1656 -768 ) ( -768 1728 -768 ) ( -448 1728 -768 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -768 1720 -752 ) ( -448 1720 -752 ) ( -448 1720 -1136 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -448 1656 -768 ) ( -448 1728 -768 ) ( -448 1728 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
( -448 1728 -768 ) ( -768 1728 -768 ) ( -768 1728 -1152 ) radiant_regression_tests/tile 0 0 0 0.500000 0.500000 0 0 0
|
||||
( -768 1728 -768 ) ( -768 1656 -768 ) ( -768 1656 -1152 ) common/caulk 0 0 0 0.500000 0.500000 0 4 0
|
||||
}
|
||||
}
|
||||
// entity 1
|
||||
{
|
||||
"angle" "270"
|
||||
"origin" "-608 2048 -976"
|
||||
"classname" "info_player_deathmatch"
|
||||
}
|
||||
// entity 2
|
||||
{
|
||||
"light" "1000"
|
||||
"origin" "-608 1944 -872"
|
||||
"classname" "light"
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user