Changeset 2

Show
Ignore:
Timestamp:
02/11/06 17:57:16 (2 years ago)
Author:
spog
Message:

added install.py; updated COMPILING; fixed q3 shader transparency rendering; jedi academy hint/caulk filtering

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • GtkRadiant/CHANGES

    r1 r2  
    11This is the changelog for developers, != changelog for the end user  
    22that we distribute with the binaries. (see changelog) 
     3 
     411/02/2006 
     5SPoG 
     6- Added install.py script. 
     7- Updated COMPILING instructions. 
     8- Fixed transparency rendering on quake3 shaders. 
     9- Fixed hint/caulk filtering for Jedi Academy shaders. 
    310 
    41104/02/2006 
  • GtkRadiant/COMPILING

    r1 r2  
    1 see docs/developer/README 
     1developer documentation for GtkRadiant 1.5.0 
     2============================================ 
     3 
     4getting the source 
     5================== 
     6 
     7The latest source is available from the Subversion repository. 
     8  https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/trunk/ 
     9 
     10The subversion client can be obtained from the Subversion site. 
     11  http://subversion.tigris.org 
     12 
     13To get a copy of the source using the commandline Subversion client: 
     14  Change the current directory to the desired location for the source. 
     15  svn checkout https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/trunk/ ./GtkRadiant 
     16  svn checkout https://zerowing.idsoftware.com/svn/radiant.assets/Q3Pack/trunk/ ./GtkRadiant/games/Q3Pack 
     17 
     18 
     19 
     20Linux/OSX(using X-windows) 
     21========================== 
     22 
     23environment: 
     24- gcc3 (preferably) 
     25- scons = 0.96 (radiant is built with scons rather than make) 
     26- python >= 2.3.0 (scons requires python, some build steps use python) 
     27 
     28dependencies: 
     29- gtk+ >= 2.4.0 (requires glib, atk, pango, iconv, etc) 
     30- gtkglext >= 1.0.0 (requires opengl) 
     31- libxml2 >= 2.0.0 
     32- zlib >= 1.2.0 (for archivezip module) 
     33- libpng >= 1.2.0 (for imagepng module) 
     34- libmhash = 0.9.0 (for q3map2) 
     35 
     36build: 
     37Execute 'scons SETUP=0' in the directory containing SConscript 
     38 
     39install: 
     40run './GtkRadiant/install.py' 
     41note - the installed data is not modified by the build, but it may be modified when you update from svn 
     42 
     43run: 
     44Execute './GtkRadiant/install/radiant.x86' (or './GtkRadiant/install/radiant.ppc' on osx) 
     45 
     46 
     47 
     48Win32 (2000 or XP) 
     49================== 
     50 
     51environment: 
     52- visual studio .net 2003 
     53- microsoft c++ compiler 7.1 (comes with vs.net 2003) 
     54- python 2.3.0 or later 
     55 
     56dependencies are prepackaged archives, extract them to the directory above GtkRadiant.sln: 
     57- http://zerowing.idsoftware.com/files/radiant/developer/1.5/gtk2-2.4.14.zip (gtk-wimp, gtkglext, gtk, glib, atk, pango, iconv etc) 
     58- http://zerowing.idsoftware.com/files/radiant/developer/1.5/libxml2-2.6.2.zip 
     59- http://zerowing.idsoftware.com/files/radiant/developer/1.5/STLport-4.6.2.zip 
     60- http://zerowing.idsoftware.com/files/radiant/developer/1.5/zlib1-1.2.1.zip (for archivezip module) 
     61- http://zerowing.idsoftware.com/files/radiant/developer/1.5/libpng-1.2.5.zip (for imagepng module) 
     62- http://zerowing.idsoftware.com/files/radiant/developer/1.5/mhash-0.9.1.zip (for q3map2) 
     63 
     64build: 
     65Open GtkRadiant.sln. 
     66In tools > options > projects > VC++ Directories > executables, add the path to python.exe (e.g. c:\python23\) 
     67Hit 'Build > Build Solution' (F7) 
     68 
     69install: 
     70run './GtkRadiant/install.py' 
     71note - the installed data is not modified by the build, but it may be modified when you update from svn 
     72 
     73run: 
     74set Project > Properties > Debugging > Command to "$(SolutionDir)install/$(TargetFileName)" 
     75hit 'Debug > Start' (F5) 
  • GtkRadiant/plugins/shaders/shaders.cpp

    r1 r2  
    977977    m_args(definition.args), 
    978978    m_filename(definition.filename), 
    979     m_blendFunc(BLEND_ONE, BLEND_ZERO), 
     979    m_blendFunc(BLEND_SRC_ALPHA, BLEND_ONE_MINUS_SRC_ALPHA), 
    980980    m_bInUse(false) 
    981981  { 
  • GtkRadiant/radiant/brushmanip.cpp

    r1 r2  
    11121112filter_brush_all_faces g_filter_brush_caulk(&g_filter_face_caulk); 
    11131113 
     1114filter_face_shader g_filter_face_caulk_ja("textures/system/caulk"); 
     1115filter_brush_all_faces g_filter_brush_caulk_ja(&g_filter_face_caulk_ja); 
     1116 
    11141117filter_face_shader_substring g_filter_face_liquids("textures/liquids/"); 
    11151118filter_brush_any_face g_filter_brush_liquids(&g_filter_face_liquids); 
     
    11201123filter_face_shader g_filter_face_hint_q2("textures/hint"); 
    11211124filter_brush_any_face g_filter_brush_hint_q2(&g_filter_face_hint_q2); 
     1125 
     1126filter_face_shader g_filter_face_hint_ja("textures/system/hint"); 
     1127filter_brush_any_face g_filter_brush_hint_ja(&g_filter_face_hint_ja); 
    11221128 
    11231129filter_face_shader g_filter_face_areaportal("textures/common/areaportal"); 
     
    11471153  add_brush_filter(g_filter_brush_botclip, EXCLUDE_BOTCLIP); 
    11481154  add_brush_filter(g_filter_brush_caulk, EXCLUDE_CAULK); 
     1155  add_brush_filter(g_filter_brush_caulk_ja, EXCLUDE_CAULK); 
    11491156  add_brush_filter(g_filter_brush_liquids, EXCLUDE_LIQUIDS); 
    11501157  add_brush_filter(g_filter_brush_hint, EXCLUDE_HINTSSKIPS); 
    11511158  add_brush_filter(g_filter_brush_hint_q2, EXCLUDE_HINTSSKIPS); 
     1159  add_brush_filter(g_filter_brush_hint_ja, EXCLUDE_HINTSSKIPS); 
    11521160  add_brush_filter(g_filter_brush_clusterportal, EXCLUDE_CLUSTERPORTALS); 
    11531161  add_brush_filter(g_filter_brush_visportal, EXCLUDE_VISPORTALS);