Revision: 2155
          http://smartbody.svn.sourceforge.net/smartbody/?rev=2155&view=rev
Author:   fengww
Date:     2011-06-29 21:55:01 +0000 (Wed, 29 Jun 2011)

Log Message:
-----------
Add SOIL for lightweight image loading.

Add texturing support in GPU deformable model rendering. Currently it supports 
diffuse map ( map_Kd in .mtl ) and tangent space normal map ( map_bump ).

Modify the obj parsing so it reads the corresponding material/texture files.

Modified Paths:
--------------
    
branches/cmake/core/smartbody/smartbody-lib/src/sbm/GPU/SbmDeformableMeshGPU.cpp
    
branches/cmake/core/smartbody/smartbody-lib/src/sbm/GPU/SbmDeformableMeshGPU.h
    branches/cmake/core/smartbody/smartbody-lib/src/sbm/GPU/VBOData.cpp
    branches/cmake/core/smartbody/smartbody-lib/src/sbm/GPU/VBOData.h
    branches/cmake/core/smartbody/smartbody-lib/src/sbm/mcontrol_util.cpp
    branches/cmake/core/smartbody/smartbody-lib/src/sr/sr_gl_render_funcs.cpp
    branches/cmake/core/smartbody/smartbody-lib/src/sr/sr_material.cpp
    branches/cmake/core/smartbody/smartbody-lib/src/sr/sr_material.h
    branches/cmake/core/smartbody/smartbody-lib/src/sr/sr_model.cpp
    branches/cmake/core/smartbody/smartbody-lib/src/sr/sr_model.h
    branches/cmake/core/smartbody/smartbody-lib/src/sr/sr_model_import_obj.cpp
    branches/cmake/core/smartbody/smartbody-lib/visualc9/smartbody-lib.vcproj
    branches/cmake/data/mesh/Utah/Itm_SpectaclesShape.mtl
    branches/cmake/data/mesh/Utah/Uth_Apron_MshShape.mtl
    branches/cmake/data/mesh/Utah/Uth_Arm_Lt_MshShape.mtl
    branches/cmake/data/mesh/Utah/Uth_Arm_Rt_MshShape.mtl
    branches/cmake/data/mesh/Utah/Uth_Eye_Lt_MshShape.mtl
    branches/cmake/data/mesh/Utah/Uth_Eye_Rt_MshShape.mtl
    branches/cmake/data/mesh/Utah/Uth_Eyelash_Lo_MshShape.mtl
    branches/cmake/data/mesh/Utah/Uth_Eyelash_Up_MshShape.mtl
    branches/cmake/data/mesh/Utah/Uth_Knot_MshShape.mtl
    branches/cmake/data/mesh/Utah/Uth_Pants_MshShape.mtl
    branches/cmake/data/mesh/Utah/Uth_Shirt_MshShape.mtl
    branches/cmake/data/mesh/Utah/Uth_Shoe_Lt_MshShape.mtl
    branches/cmake/data/mesh/Utah/Uth_Shoe_Rt_MshShape.mtl
    branches/cmake/data/mesh/Utah/Uth_Teeth_Lo_GrpShape.mtl
    branches/cmake/data/mesh/Utah/Uth_Teeth_Up_MshShape.mtl
    branches/cmake/data/mesh/Utah/headShape.mtl
    branches/cmake/data/sbm-common/scripts/default-init.seq
    branches/cmake/test_suite/input/gaze_test/gaze_test_std_1.ppm
    branches/cmake/test_suite/input/gaze_test/gaze_test_std_2.ppm
    branches/cmake/test_suite/input/gaze_test/gaze_test_std_3.ppm
    branches/cmake/test_suite/input/gaze_test1/gaze_test1_std_1.ppm
    branches/cmake/test_suite/input/gaze_test1/gaze_test1_std_2.ppm
    branches/cmake/test_suite/input/gaze_test1/gaze_test1_std_3.ppm
    branches/cmake/test_suite/input/gaze_test1/gaze_test1_std_4.ppm
    branches/cmake/test_suite/input/gaze_test1/gaze_test1_std_5.ppm
    branches/cmake/test_suite/input/gaze_test2/gaze_test2_std_1.ppm
    branches/cmake/test_suite/input/gaze_test2/gaze_test2_std_2.ppm
    branches/cmake/test_suite/input/gaze_test2/gaze_test2_std_3.ppm
    branches/cmake/test_suite/input/gaze_test2/gaze_test2_std_4.ppm
    branches/cmake/test_suite/input/gaze_test2/gaze_test2_std_5.ppm
    branches/cmake/test_suite/input/gaze_test2/gaze_test2_std_6.ppm
    branches/cmake/test_suite/input/headnod_test/headnod_test_std_1.ppm
    branches/cmake/test_suite/input/headnod_test/headnod_test_std_2.ppm
    branches/cmake/test_suite/input/headnod_test/headnod_test_std_3.ppm
    branches/cmake/test_suite/input/headnod_test/headnod_test_std_4.ppm
    branches/cmake/test_suite/input/headnod_test/headnod_test_std_5.ppm
    branches/cmake/test_suite/input/headnod_test/headnod_test_std_6.ppm
    branches/cmake/test_suite/input/headshake_test/headshake_test_std_1.ppm
    branches/cmake/test_suite/input/headshake_test/headshake_test_std_2.ppm
    branches/cmake/test_suite/input/headshake_test/headshake_test_std_3.ppm
    branches/cmake/test_suite/input/headshake_test/headshake_test_std_4.ppm
    branches/cmake/test_suite/input/headshake_test/headshake_test_std_5.ppm
    branches/cmake/test_suite/input/headshake_test/headshake_test_std_6.ppm
    branches/cmake/test_suite/input/loco_test/loco_test_std_1.ppm
    branches/cmake/test_suite/input/loco_test/loco_test_std_2.ppm
    branches/cmake/test_suite/input/loco_test/loco_test_std_3.ppm
    branches/cmake/test_suite/input/loco_test/loco_test_std_4.ppm
    branches/cmake/test_suite/input/loco_test_1/loco_test_1_std_1.ppm
    branches/cmake/test_suite/input/loco_test_1/loco_test_1_std_2.ppm
    branches/cmake/test_suite/input/loco_test_1/loco_test_1_std_3.ppm
    branches/cmake/test_suite/input/loco_test_2/loco_test_2_std_1.ppm
    branches/cmake/test_suite/input/loco_test_2/loco_test_2_std_2.ppm
    branches/cmake/test_suite/input/loco_test_2/loco_test_2_std_3.ppm
    branches/cmake/test_suite/input/loco_test_2/loco_test_2_std_4.ppm
    branches/cmake/test_suite/input/posture_test/posture_test_std_1.ppm
    branches/cmake/test_suite/input/posture_test/posture_test_std_2.ppm
    branches/cmake/test_suite/input/posture_test/posture_test_std_3.ppm
    branches/cmake/test_suite/input/posture_test/posture_test_std_4.ppm
    branches/cmake/test_suite/input/steering_test/steering_test.seq
    branches/cmake/test_suite/input/test-constraint/test-constraint_std_1.ppm
    branches/cmake/test_suite/input/test-constraint/test-constraint_std_2.ppm
    branches/cmake/test_suite/input/test-constraint/test-constraint_std_3.ppm
    branches/cmake/test_suite/input/test-event/test-event_std_1.ppm
    branches/cmake/test_suite/input/test-event/test-event_std_2.ppm
    
branches/cmake/test_suite/input/test-event-internal/test-event-internal_std_1.ppm
    
branches/cmake/test_suite/input/test-event-internal/test-event-internal_std_2.ppm
    
branches/cmake/test_suite/input/test-event-internal/test-event-internal_std_3.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au.seq
    branches/cmake/test_suite/input/test-face-au/test-face-au.sh
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_1.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_10.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_11.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_12.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_13.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_14.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_15.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_16.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_17.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_18.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_19.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_2.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_20.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_21.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_22.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_23.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_24.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_25.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_26.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_3.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_4.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_5.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_6.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_7.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_8.ppm
    branches/cmake/test_suite/input/test-face-au/test-face-au_std_9.ppm
    
branches/cmake/test_suite/input/test-reach-constraint/test-reach-constraint_std_1.ppm
    
branches/cmake/test_suite/input/test-reach-constraint/test-reach-constraint_std_2.ppm
    
branches/cmake/test_suite/input/test-reach-constraint/test-reach-constraint_std_3.ppm
    
branches/cmake/test_suite/input/test-reach-constraint/test-reach-constraint_std_4.ppm
    
branches/cmake/test_suite/input/test-reach-example/test-reach-example_std_1.ppm
    
branches/cmake/test_suite/input/test-reach-example/test-reach-example_std_2.ppm
    
branches/cmake/test_suite/input/test-reach-example/test-reach-example_std_3.ppm
    
branches/cmake/test_suite/input/test-reach-example/test-reach-example_std_4.ppm
    
branches/cmake/test_suite/input/test-reach-footik/test-reach-footik_std_1.ppm
    
branches/cmake/test_suite/input/test-reach-footik/test-reach-footik_std_2.ppm
    
branches/cmake/test_suite/input/test-reach-footik/test-reach-footik_std_3.ppm
    
branches/cmake/test_suite/input/test-reach-footik/test-reach-footik_std_4.ppm
    
branches/cmake/test_suite/input/test-reach-footik/test-reach-footik_std_5.ppm
    
branches/cmake/test_suite/input/test-reach-noexample/test-reach-noexample_std_1.ppm
    
branches/cmake/test_suite/input/test-reach-noexample/test-reach-noexample_std_2.ppm
    
branches/cmake/test_suite/input/test-reach-physics/test-reach-physics_std_1.ppm
    
branches/cmake/test_suite/input/test-reach-physics/test-reach-physics_std_2.ppm
    
branches/cmake/test_suite/input/test-reach-physics/test-reach-physics_std_3.ppm
    
branches/cmake/test_suite/input/test-speech-audiofile/test-speech-audiofile_std_1.ppm
    
branches/cmake/test_suite/input/test-speech-audiofile/test-speech-audiofile_std_2.ppm
    
branches/cmake/test_suite/input/test-speech-audiofile/test-speech-audiofile_std_3.ppm
    
branches/cmake/test_suite/input/test-speech-audiofile/test-speech-audiofile_std_4.ppm
    
branches/cmake/test_suite/input/test-speech-remote/test-speech-remote_std_1.ppm
    
branches/cmake/test_suite/input/test-speech-remote/test-speech-remote_std_2.ppm
    
branches/cmake/test_suite/input/test-speech-remote/test-speech-remote_std_3.ppm
    
branches/cmake/test_suite/input/test-speech-remote/test-speech-remote_std_4.ppm
    
branches/cmake/test_suite/input/viseme_basic_test/viseme_basic_test_std_1.ppm
    
branches/cmake/test_suite/input/viseme_basic_test/viseme_basic_test_std_10.ppm
    
branches/cmake/test_suite/input/viseme_basic_test/viseme_basic_test_std_11.ppm
    
branches/cmake/test_suite/input/viseme_basic_test/viseme_basic_test_std_12.ppm
    
branches/cmake/test_suite/input/viseme_basic_test/viseme_basic_test_std_13.ppm
    
branches/cmake/test_suite/input/viseme_basic_test/viseme_basic_test_std_14.ppm
    
branches/cmake/test_suite/input/viseme_basic_test/viseme_basic_test_std_2.ppm
    
branches/cmake/test_suite/input/viseme_basic_test/viseme_basic_test_std_3.ppm
    
branches/cmake/test_suite/input/viseme_basic_test/viseme_basic_test_std_4.ppm
    
branches/cmake/test_suite/input/viseme_basic_test/viseme_basic_test_std_5.ppm
    
branches/cmake/test_suite/input/viseme_basic_test/viseme_basic_test_std_6.ppm
    
branches/cmake/test_suite/input/viseme_basic_test/viseme_basic_test_std_7.ppm
    
branches/cmake/test_suite/input/viseme_basic_test/viseme_basic_test_std_8.ppm
    
branches/cmake/test_suite/input/viseme_basic_test/viseme_basic_test_std_9.ppm
    
branches/cmake/test_suite/input/viseme_curve_test/viseme_curve_test_std_1.ppm
    
branches/cmake/test_suite/input/viseme_curve_test/viseme_curve_test_std_2.ppm
    
branches/cmake/test_suite/input/viseme_curve_test/viseme_curve_test_std_3.ppm
    
branches/cmake/test_suite/input/viseme_curve_test/viseme_curve_test_std_4.ppm
    
branches/cmake/test_suite/input/viseme_curve_test/viseme_curve_test_std_5.ppm
    
branches/cmake/test_suite/input/viseme_curve_test/viseme_curve_test_std_6.ppm

Added Paths:
-----------
    branches/cmake/core/smartbody/smartbody-lib/src/external/SOIL/
    branches/cmake/core/smartbody/smartbody-lib/src/external/SOIL/SOIL.c
    branches/cmake/core/smartbody/smartbody-lib/src/external/SOIL/SOIL.h
    branches/cmake/core/smartbody/smartbody-lib/src/external/SOIL/image_DXT.c
    branches/cmake/core/smartbody/smartbody-lib/src/external/SOIL/image_DXT.h
    branches/cmake/core/smartbody/smartbody-lib/src/external/SOIL/image_helper.c
    branches/cmake/core/smartbody/smartbody-lib/src/external/SOIL/image_helper.h
    
branches/cmake/core/smartbody/smartbody-lib/src/external/SOIL/stb_image_aug.c
    
branches/cmake/core/smartbody/smartbody-lib/src/external/SOIL/stb_image_aug.h
    branches/cmake/core/smartbody/smartbody-lib/src/external/SOIL/stbi_DDS_aug.h
    
branches/cmake/core/smartbody/smartbody-lib/src/external/SOIL/stbi_DDS_aug_c.h
    branches/cmake/core/smartbody/smartbody-lib/src/external/SOIL/test_SOIL.cpp
    branches/cmake/core/smartbody/smartbody-lib/src/sbm/GPU/SbmTexture.cpp
    branches/cmake/core/smartbody/smartbody-lib/src/sbm/GPU/SbmTexture.h


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security 
threats, fraudulent activity, and more. Splunk takes this data and makes 
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Smartbody-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/smartbody-svn

Reply via email to