r2012 - in trunk: data/maps misc

[DONOTREPLY at icculus.org]

Author: div0
Date: 2006-12-08 05:13:36 -0500 (Fri, 08 Dec 2006)
New Revision: 2012

Modified:
   trunk/data/maps/bloodprison.bsp
   trunk/data/maps/compile.sh
   trunk/misc/nexuiz-map-compiler
Log:
recompiled bloodprison with 1.2 = 1.25 * 0.96 trick; compile.sh is now obsolete, multi-scale added to nexuiz-map-compiler


Modified: trunk/data/maps/bloodprison.bsp
===================================================================
(Binary files differ)

Modified: trunk/data/maps/compile.sh
===================================================================
--- trunk/data/maps/compile.sh	2006-12-08 10:03:26 UTC (rev 2011)
+++ trunk/data/maps/compile.sh	2006-12-08 10:13:36 UTC (rev 2012)
@@ -1,5 +1,14 @@
 #!/bin/sh
 
+# this script is OBSOLETE, use nexuiz-map-compiler
+
+exit 0
+
+# nexuiz-map-compiler * -bsp -samplesize 8 -vis -light -deluxe -patchshadows -samples 3
+# nexuiz-map-compiler farewell -bsp -samplesize 8 -patchmeta -vis -light -deluxe -patchshadows -samples 3
+# nexuiz-map-compiler aggressor -scale 1.25 -bsp -samplesize 8 -vis -light -deluxe -patchshadows -samples 3
+# nexuiz-map-compiler bloodprison -scale 1.25:0.96 -bsp -samplesize 8 -vis -light -deluxe -patchshadows -samples 3
+
 : ignore <<'EOF'
 
 Nexuiz map recompilation script

Modified: trunk/misc/nexuiz-map-compiler
===================================================================
--- trunk/misc/nexuiz-map-compiler	2006-12-08 10:03:26 UTC (rev 2011)
+++ trunk/misc/nexuiz-map-compiler	2006-12-08 10:13:36 UTC (rev 2012)
@@ -99,7 +99,6 @@
 
 sub q3map2(@)
 {
-	my @args = @_;
 	my @args = ($Q3MAP2, '-game', 'quake3', '-fs_basepath', $NEXUIZDIR, '-fs_game', 'data', '-v', @_);
 	print "\$ @args\n";
 	return !system @args;
@@ -112,9 +111,12 @@
 symlink "$mapdir", "$ENV{HOME}/.q3a/data"
 	or die "Setting up directory structure, $mapdir -> $ENV{HOME}/.q3a/data: $!";
 
+my ($prescale, $postscale) = ($options->{scale} =~ /^([0-9.]+)(?::([0-9.]+))?$/);
+$postscale = 1 if not defined $postscale;
+
 for my $m(@{$options->{maps}})
 {
-	if($options->{scale} != 1)
+	if($prescale != 1 or $postscale != 1)
 	{
 		open my $checkfh, "<", "$m.map"
 			or die "open $m.map: $!";
@@ -162,9 +164,9 @@
 
 		q3map2 '-bsp', '-meta', @{$options->{bsp}},   "$m.map"
 			or die "-bsp: $?";
-		if($options->{scale} != 1)
+		if($prescale != 1)
 		{
-			q3map2 '-scale', $options->{scale}, "$m.bsp"
+			q3map2 '-scale', $prescale, "$m.bsp"
 				or die "-scale: $?";
 			rename "${m}_s.bsp", "$m.bsp"
 				or die "rename ${m}_s.bsp $m.bsp: $!";
@@ -173,6 +175,13 @@
 			or die "-vis: $?";
 		q3map2 '-light',        @{$options->{light}}, "$m.map"
 			or die "-light: $?";
+		if($postscale != 1)
+		{
+			q3map2 '-scale', $postscale, "$m.bsp"
+				or die "-scale: $?";
+			rename "${m}_s.bsp", "$m.bsp"
+				or die "rename ${m}_s.bsp $m.bsp: $!";
+		}
 
 		unlink "$m.srf";