Merge remote-tracking branch 'upstream/master'

Reverted .gitattributes xcode_ccache_wrapper change. Fixed line endings
for .gitignore and .gitattributes.

1 files changed, 22 insertions, 22 deletions

diff --git a/sp/src/utils/vrad/notes.txt b/sp/src/utils/vrad/notes.txt
index f0ca18b3..8c21cc6b 100644
--- a/sp/src/utils/vrad/notes.txt
+++ b/sp/src/utils/vrad/notes.txt
@@ -1,22 +1,22 @@
-//=============================================================================

-// CHARLIE:

-

-DONE: just rename files from .c to .cpp in source safe so history is kept

-converting files of to .cpp files -- just get stuff recompiling first

-make sure all common files and external dependencies handle .cpp files

-add the dispmap class

-add the dispface class

-get rid of patches.c or patches.cpp as the case may be

-

-DONE: create a parallel array for visited displacement faces

-change the visited array to a flag in the "bsp" ddispface_t structure

-DONE: add reset visited displacement face functionality

-DONE: visited neighbor flags

-DONE: reset visited neighbor flags

-DONE: move the radial_t structure and some of its functionality to a more global scope

-DONE: create a finallightdispface

-DONE: generate luxels for displacement face

-DONE: fix precomplightmapoffsets to take displacement faces into account

-fill in luxel data from sample data

-modify the GetPhongNormal and GatherSampleLight functions to use displacement face normals at "spot"

-make a lightinfo list? -- so we don't regenerate initlightinfo so many times?

+//=============================================================================
+// CHARLIE:
+
+DONE: just rename files from .c to .cpp in source safe so history is kept
+converting files of to .cpp files -- just get stuff recompiling first
+make sure all common files and external dependencies handle .cpp files
+add the dispmap class
+add the dispface class
+get rid of patches.c or patches.cpp as the case may be
+
+DONE: create a parallel array for visited displacement faces
+change the visited array to a flag in the "bsp" ddispface_t structure
+DONE: add reset visited displacement face functionality
+DONE: visited neighbor flags
+DONE: reset visited neighbor flags
+DONE: move the radial_t structure and some of its functionality to a more global scope
+DONE: create a finallightdispface
+DONE: generate luxels for displacement face
+DONE: fix precomplightmapoffsets to take displacement faces into account
+fill in luxel data from sample data
+modify the GetPhongNormal and GatherSampleLight functions to use displacement face normals at "spot"
+make a lightinfo list? -- so we don't regenerate initlightinfo so many times?