[Nel] Patches for GNU/Linux compilation + core dump

[Loic Dachary]

        Hi,

        Here is a small patch so that compilation works on GNU/Linux
(todays CVS tree). Things become kind of messy on my side because of
the pending patches.

        - missing vegetable_light_ex.{h,cpp} patch_lightmap.cpp in Makefile.am
        - rvalue used with non-const ref 
        - spurious inlines 

        All patches are relative to nel/src/3d.

        The resulting snowballs dumps core, unfortunately. I had enough
for today and will trace the error later. Here is the gdb trace anyway,
in case something obvious can be said ;-) (Yes, it's incomplete because
debugging information was not included). 

Program received signal SIGSEGV, Segmentation fault.
0x4040b721 in NL3D::CMeshMRMGeom::render () from /usr/lib/libnel3d.so.0
(gdb) bt
#0  0x4040b721 in NL3D::CMeshMRMGeom::render () from /usr/lib/libnel3d.so.0
#1  0x404127ea in NL3D::CMeshMRM::render () from /usr/lib/libnel3d.so.0
#2  0x4051fa17 in NL3D::CTransformShapeRenderObs::traverse ()
   from /usr/lib/libnel3d.so.0
#3  0x404cf033 in NL3D::CRenderTrav::traverse () from /usr/lib/libnel3d.so.0
#4  0x404d49bc in NL3D::CScene::render () from /usr/lib/libnel3d.so.0
#5  0x407688e6 in NL3D::CSceneUser::render () from /usr/lib/libnel3d.so.0
#6  0x08051dab in NLMISC::CEventServer::addListener ()
#7  0x40f466cf in __libc_start_main () from /lib/libc.so.6
        

        Enjoy,

Index: driver/opengl/driver_opengl_material.cpp
===================================================================
RCS file: 
/home/cvsroot/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp,v
retrieving revision 1.59
diff -u -r1.59 driver_opengl_material.cpp
--- driver/opengl/driver_opengl_material.cpp    14 Mar 2002 18:28:20 -0000      
1.59
+++ driver/opengl/driver_opengl_material.cpp    19 Mar 2002 15:34:16 -0000
@@ -1065,7 +1065,7 @@
 
 
 // ***************************************************************************
-inline CTextureCube   *CDriverGL::getSpecularCubeMap(uint exp)
+CTextureCube   *CDriverGL::getSpecularCubeMap(uint exp)
 {
        const uint SpecularMapSize = 32;
        const uint SpecularMapSizeHighExponent = 64;
Index: driver/opengl/driver_opengl_texture.cpp
===================================================================
RCS file: 
/home/cvsroot/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp,v
retrieving revision 1.50
diff -u -r1.50 driver_opengl_texture.cpp
--- driver/opengl/driver_opengl_texture.cpp     14 Mar 2002 18:28:20 -0000      
1.50
+++ driver/opengl/driver_opengl_texture.cpp     19 Mar 2002 15:34:30 -0000
@@ -822,7 +822,7 @@
 
 
 // ***************************************************************************
-inline void            CDriverGL::forceActivateTexEnvColor(uint stage, 
NLMISC::CRGBA col)
+void           CDriverGL::forceActivateTexEnvColor(uint stage, NLMISC::CRGBA 
col)
 {
        static  const float     OO255= 1.0f/255;        
        _CurrentTexEnv[stage].ConstantColor= col;

Index: Makefile.am
===================================================================
RCS file: /home/cvsroot/code/nel/src/3d/Makefile.am,v
retrieving revision 1.71
diff -u -r1.71 Makefile.am
--- Makefile.am 14 Mar 2002 18:32:02 -0000      1.71
+++ Makefile.am 19 Mar 2002 16:42:50 -0000
@@ -74,7 +74,6 @@
                        event_mouse_listener.h                          \
                        fast_floor.cpp                                  \
                        fast_floor.h                                    \
-                       files.txt                                       \
                        flare_model.cpp                                 \
                        flare_model.h                                   \
                        flare_shape.cpp                                 \
@@ -209,6 +208,7 @@
                        patch.h                                         \
                        patchuv_locator.cpp                             \
                        patchuv_locator.h                               \
+                      patch_lightmap.cpp                              \
                        patch_noise.cpp                                 \
                        patch_rdr_pass.cpp                              \
                        patch_rdr_pass.h                                \
@@ -440,6 +440,8 @@
                        vegetable_def.h                                 \
                        vegetable_instance_group.cpp                    \
                        vegetable_instance_group.h                      \
+                       vegetable_light_ex.cpp                         \
+                       vegetable_light_ex.h                           \
                        vegetable_manager.cpp                           \
                        vegetable_manager.h                             \
                        vegetable_quadrant.cpp                          \
@@ -487,6 +489,8 @@
                        zone_smoother.h                                 \
                        zone_tgt_smoother.cpp                           \
                        zone_tgt_smoother.h
+
+noinst_HEADERS      = std3d.h mesh_vertex_program.h meshvp_wind_tree.h
 
 AM_CXXFLAGS          = -I$(top_srcdir)/src @FREETYPE_CFLAGS@
 
Index: vegetable_light_ex.cpp
===================================================================
RCS file: /home/cvsroot/code/nel/src/3d/vegetable_light_ex.cpp,v
retrieving revision 1.2
diff -u -r1.2 vegetable_light_ex.cpp
--- vegetable_light_ex.cpp      15 Mar 2002 16:10:44 -0000      1.2
+++ vegetable_light_ex.cpp      19 Mar 2002 13:08:10 -0000
@@ -42,7 +42,8 @@
                // get the attenuation
                uint    att= PointLightFactor[i];
                // modulate the color with it.
-               Color[i].modulateFromui(pl->getDiffuse(), att);
+               NLMISC::CRGBA diffuse = pl->getDiffuse();
+               Color[i].modulateFromui(diffuse, att);
        }
 }

-- 
Loic   Dachary         http://www.dachary.org/  address@hidden
12 bd  Magenta         http://www.senga.org/      address@hidden
75010    Paris         T: 33 1 42 45 07 97          address@hidden
        GPG Public Key: http://www.dachary.org/loic/gpg.txt