3dsmax2012_plugins.patch

Krolock, 07/27/2011 09:14 pm

Download (14.1 kB)

b/code/CMakeModules/Find3dsMaxSDK.cmake Wed Jul 27 21:08:19 2011 +0200
17 17
  "$ENV{PROGRAMFILES}/Autodesk/3ds Max 2008 SDK/maxsdk/include"
18 18
  "$ENV{PROGRAMFILES}/Autodesk/3ds Max 9 SDK/maxsdk/include"
19 19
  "$ENV{3DSMAX_2011_SDK_PATH}/maxsdk/include"
20
  "$ENV{ADSK_3DSMAX_SDK_2012}/maxsdk/include"
20 21
) 
21 22

22 23
find_path(MAXSDK_CS_INCLUDE_DIR bipexp.h
......
26 27
  "$ENV{PROGRAMFILES}/Autodesk/3ds Max 2008 SDK/maxsdk/include/CS"
27 28
  "$ENV{PROGRAMFILES}/Autodesk/3ds Max 9 SDK/maxsdk/include/CS"
28 29
  "$ENV{3DSMAX_2011_SDK_PATH}/maxsdk/include/CS"
30
  "$ENV{ADSK_3DSMAX_SDK_2012}/maxsdk/include/CS"
29 31
)
30 32

31 33
MACRO(FIND_3DS_LIBRARY MYLIBRARY MYLIBRARYNAME)          
......
37 39
               "$ENV{PROGRAMFILES}/Autodesk/3ds Max 2008 SDK/maxsdk/lib"
38 40
               "$ENV{PROGRAMFILES}/Autodesk/3ds Max 9 SDK/maxsdk/lib"
39 41
			   "$ENV{3DSMAX_2011_SDK_PATH}/maxsdk/lib"
42
			   "$ENV{ADSK_3DSMAX_SDK_2012}/maxsdk/lib"
40 43
               )               
41 44
ENDMACRO(FIND_3DS_LIBRARY MYLIBRARY MYLIBRARYNAME)
42 45

......
65 68
      ${MAXSDK_MAXSCRIPT_LIBRARY}
66 69
      ${MAXSDK_PARAMBLK2_LIBRARY}
67 70
      ${MAXSDK_BMM_LIBRARY} )
71
	  
72
	  if(IS_DIRECTORY "${MAXSDK_INCLUDE_DIR}/maxscript")
73
		ADD_DEFINITIONS(-DDSMAX2012=1)
74
		MESSAGE(STATUS "Added Definition -DDSMAX2012=1 ")
75
	  endif(IS_DIRECTORY "${MAXSDK_INCLUDE_DIR}/maxscript")
76
			
68 77

69 78
else(MAXSDK_FOUND)
70 79
    set(MAXSDK_LIBRARIES)
b/code/nel/tools/3d/ligo/plugin_max/DllEntry.cpp Wed Jul 27 21:08:19 2011 +0200
41 41

42 42
	hInstance = hinstDLL;				// Hang on to this DLL's instance handle.
43 43

44
#ifdef DSMAX2012
45
#else
46

44 47
	if (!controlsInit) 
45 48
	{
46 49
		controlsInit = TRUE;
......
48 51
		InitCommonControls();			// Initialize Win95 controls
49 52
	}
50 53

54
#endif // DSMAX2012
55

51 56
	// initialize nel context
52 57
	if (!NLMISC::INelContext::isContextInitialised())
53 58
		new NLMISC::CApplicationContext();
b/code/nel/tools/3d/ligo/plugin_max/max_to_ligo.cpp Wed Jul 27 21:08:19 2011 +0200
17 17
#include <assert.h>
18 18

19 19
// From MAXSDK
20
#include <MaxScrpt/maxscrpt.h>
20
#ifdef DSMAX2012
21
#include <maxscript/maxscript.h>
22
#else
23
#include <Maxscrpt/maxscrpt.h>
24
#endif // DSMAX2012
21 25

22 26
#include "max_to_ligo.h"
23 27

b/code/nel/tools/3d/ligo/plugin_max/script.cpp Wed Jul 27 21:08:19 2011 +0200
19 19
#include <assert.h>
20 20

21 21
// Various MAX and MXS includes
22
#include <MaxScrpt/MAXScrpt.h>
22

23
#ifdef DSMAX2012
24
#include <maxscript/maxscript.h>
25
#include <maxscript/foundation/3dmath.h>
26
#include <maxscript/foundation/numbers.h>
27
#include <maxscript/maxwrapper/maxclasses.h>
28
#include <maxscript/foundation/Streams.h>
29
#include <maxscript/foundation/mxstime.h>
30
#include <maxscript/maxwrapper/mxsobjects.h>
31
#include <maxscript/compiler/parser.h>
32
#include <max.h>
33
#include <stdmat.h>
34
#include <maxscript/foundation/functions.h>
35
#else
36
#include <Maxscrpt/maxscrpt.h>
23 37
#include <MaxScrpt/3dmath.h>
24 38
#include <MaxScrpt/Numbers.h>
25 39
#include <MaxScrpt/MAXclses.h>
......
30 44
#include <max.h>
31 45
#include <stdmat.h>
32 46
#include <MaxScrpt/definsfn.h>
47
#endif // DSMAX2012
33 48

34 49
// Visual
35 50
#include <direct.h>
b/code/nel/tools/3d/plugin_max/nel_export/DllEntry.cpp Wed Jul 27 21:08:19 2011 +0200
39 39
	hInstance = hinstDLL;				// Hang on to this DLL's instance handle.
40 40

41 41
	NL3D::registerSerial3d();
42

43
#ifdef DSMAX2012
44
#else
42 45
	
43 46
	if (!controlsInit) {
44 47
		controlsInit = TRUE;
45 48
		InitCustomControls(hInstance);	// Initialize MAX's custom controls
46 49
		InitCommonControls();			// Initialize Win95 controls
47 50
	}
51

52
#endif // DSMAX2012
48 53
			
49 54
	return (TRUE);
50 55
}
b/code/nel/tools/3d/plugin_max/nel_export/nel_export_script.cpp Wed Jul 27 21:08:19 2011 +0200
16 16

17 17
#include "std_afx.h"
18 18
#include "nel_export.h"
19
#ifdef DSMAX2012
20
#include <maxscript/foundation/strings.h>
21
#else
19 22
#include <MaxScrpt/strings.h>
23
#endif // DSMAX2012
20 24
#include "../nel_mesh_lib/export_nel.h"
21 25
#include "../nel_mesh_lib/export_appdata.h"
22 26

b/code/nel/tools/3d/plugin_max/nel_export/std_afx.h Wed Jul 27 21:08:19 2011 +0200
26 26
#include <utilapi.h>
27 27
#include <shlobj.h>
28 28
#undef STRICT
29
#include <MaxScrpt/maxscrpt.h>
29
#ifdef DSMAX2012
30
#include <maxscript/maxscript.h>
31
#include <maxscript/foundation/3dmath.h>
32
#include <maxscript/foundation/numbers.h>
33
#include <maxscript/maxwrapper/maxclasses.h>
34
#include <maxscript/foundation/Streams.h>
35
#include <maxscript/foundation/mxstime.h>
36
#include <maxscript/maxwrapper/mxsobjects.h>
37
#include <maxscript/compiler/parser.h>
38
#include <max.h>
39
#include <stdmat.h>
40
#include <maxscript/foundation/functions.h>
41
#else
42
#include <Maxscrpt/maxscrpt.h>
30 43
#include <MaxScrpt/3dmath.h>
31
#include <MaxScrpt/numbers.h>
32
#include <MaxScrpt/maxclses.h>
33
#include <MaxScrpt/streams.h>
34
#include <MaxScrpt/mstime.h>
35
#include <MaxScrpt/maxobj.h>
36
#include <MaxScrpt/parser.h>
44
#include <MaxScrpt/Numbers.h>
45
#include <MaxScrpt/MAXclses.h>
46
#include <MaxScrpt/Streams.h>
47
#include <MaxScrpt/MSTime.h>
48
#include <MaxScrpt/MAXObj.h>
49
#include <MaxScrpt/Parser.h>
50
#include <max.h>
37 51
#include <stdmat.h>
38 52
#include <MaxScrpt/definsfn.h>
53
#endif // 3DSMAX2012
39 54
#include <animtbl.h>
40 55
#ifdef min
41 56
#undef min
b/code/nel/tools/3d/plugin_max/nel_mesh_lib/StdAfx.h Wed Jul 27 21:08:19 2011 +0200
32 32
#include <stdmat.h>
33 33
#include <shaders.h>
34 34
#include <iparamb2.h>
35
#ifdef DSMAX2012
36
#include <maxscript/maxscript.h>
37
#else
35 38
#include <Maxscrpt/maxscrpt.h>
39
#endif // 3DSMAX2012
36 40
//#include <parser.h>
37 41

38 42
// Character Studio SDK include
b/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_misc.cpp Wed Jul 27 21:08:19 2011 +0200
260 260
			if (strcmp (paramDef.int_name, sName)==0)
261 261
			{
262 262
				// ok, return this subanim
263
#ifdef DSMAX2012
264
//Deprecated in 3ds Max 2012. Use GetControllerByID instead.
265
				return param->GetControllerByID(id);
266
#else
263 267
				return param->GetController(id);
268
#endif // DSMAX2012
264 269
			}
265 270
		}
266 271
	}
b/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_script.cpp Wed Jul 27 21:08:19 2011 +0200
15 15
// along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16

17 17
#include "stdafx.h"
18
#ifdef DSMAX2012
19
#include <maxscript/compiler/parser.h>
20
#include <maxscript/foundation/strings.h>
21
#else
18 22
#include <MaxScrpt/parser.h>
19 23
#include <MaxScrpt/strings.h>
24
#endif // DSMAX2012
25

20 26
#include "export_nel.h"
21 27
#include "export_appdata.h"
22 28

b/code/nel/tools/3d/plugin_max/nel_patch_converter/DllEntry.cpp Wed Jul 27 21:08:19 2011 +0200
54 54
	if (!NLMISC::INelContext::isContextInitialised())
55 55
		new NLMISC::CApplicationContext();
56 56
	nlassert(hInstance);
57

58
#ifdef DSMAX2012
59
#else
60

57 61
	if (!controlsInit) 
58 62
	{
59 63
		// This method has been deprecated.
......
61 65
		InitCustomControls(hInstance);	// Initialize MAX's custom controls
62 66
		InitCommonControls();			// Initialize Win95 controls
63 67
	}
68

69
#endif // DSMAX2012
70

64 71
	return (TRUE);
65 72
}
66 73

b/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp Wed Jul 27 21:08:19 2011 +0200
22 22
#define _CRT_SECURE_NO_DEPRECATE
23 23

24 24
#include <assert.h>
25
#include <MaxScrpt/maxscrpt.h>
25
#ifdef DSMAX2012
26
#include <maxscript/maxscript.h>
27
#include <maxScript/foundation/3dmath.h>
28
#else
29
#include <Maxscrpt/maxscrpt.h>
26 30
#include <MaxScrpt/3dmath.h>
31
#endif // 3DSMAX2012
32

27 33

28 34
// Various MAX and MXS includes
35
#ifdef DSMAX2012
36
#include <maxscript/foundation/numbers.h>
37
#include <maxscript/maxwrapper/maxclasses.h>
38
#include <maxscript/foundation/Streams.h>
39
#include <maxscript/foundation/mxstime.h>
40
#include <maxscript/maxwrapper/mxsobjects.h>
41
#include <maxscript/compiler/parser.h>
42
#include <maxscript/foundation/functions.h>
43
#else
29 44
#include <MaxScrpt/Numbers.h>
30 45
#include <MaxScrpt/MAXclses.h>
31 46
#include <MaxScrpt/Streams.h>
32 47
#include <MaxScrpt/MSTime.h>
33 48
#include <MaxScrpt/MAXObj.h>
34 49
#include <MaxScrpt/Parser.h>
50
// define the new primitives using macros from SDK
51
#include <MaxScrpt/definsfn.h>
52
#endif // DSMAX2012
35 53
#include <modstack.h>
36 54
#include <decomp.h>
37 55

38 56
#include <max.h>
39 57
#include <stdmat.h>
40 58

41
// define the new primitives using macros from SDK
42
#include <MaxScrpt/definsfn.h>
59

43 60

44 61
#undef _CRT_SECURE_NO_DEPRECATE
45 62

b/code/nel/tools/3d/plugin_max/nel_patch_edit/np_mods.cpp Wed Jul 27 21:08:19 2011 +0200
36 36
	{
37 37
		hInstance = hinstDLL;
38 38
		DisableThreadLibraryCalls(hInstance);
39
		
39
#ifdef DSMAX2012
40
#else
40 41
		if (!controlsInit) 
41 42
		{
42 43
			controlsInit = TRUE;
......
53 54
			// initialize Chicago controls
54 55
			InitCommonControls();
55 56
		}
57
#endif // DSMAX2012
56 58
	}
57 59
	
58 60
	return TRUE;
b/code/nel/tools/3d/plugin_max/nel_patch_edit_adv/NP_mods.cpp Wed Jul 27 21:08:19 2011 +0200
25 25
{
26 26
	hInstance = hinstDLL;
27 27

28
#ifdef DSMAX2012
29
#else
30

28 31
	if ( !controlsInit ) 
29 32
	{
30 33
		controlsInit = TRUE;
......
40 43
		
41 44
		// initialize Chicago controls
42 45
		InitCommonControls();
43
		}
46
	}
47
#endif // DSMAX2012
44 48

45 49
	switch(fdwReason) {
46 50
		case DLL_PROCESS_ATTACH:
b/code/nel/tools/3d/plugin_max/nel_patch_lib/rpo2nel.cpp Wed Jul 27 21:08:19 2011 +0200
18 18

19 19
// For MAX_RELEASE
20 20
#include <plugapi.h>
21
#include <MaxScrpt/maxscrpt.h>
21
#ifdef DSMAX2012
22
#include <maxscript/maxscript.h>
23
#else
24
#include <Maxscrpt/maxscrpt.h>
25
#endif // 3DSMAX2012
22 26

23 27
#include "rpo.h"
24 28
#include "nel/3d/zone.h"
b/code/nel/tools/3d/plugin_max/nel_patch_paint/DllEntry.cpp Wed Jul 27 21:08:19 2011 +0200
21 21
			
22 22
	hInstance = hinstDLL;
23 23

24
#ifdef DSMAX2012
25
#else
26

24 27
	if ( !controlsInit ) 
25 28
	{
26 29
		controlsInit = TRUE;
......
36 39
		
37 40
		// initialize Chicago controls
38 41
		InitCommonControls();
39
		}
42
	}
43

44
#endif // DSMAX2012
40 45

41 46
	switch(fdwReason) {
42 47
		case DLL_PROCESS_ATTACH:
b/code/nel/tools/3d/plugin_max/nel_patch_paint/nel_patch_paint.h Wed Jul 27 21:08:19 2011 +0200
3 3

4 4
#include "resource.h"
5 5
#include <algorithm>
6
#include <MaxScrpt/maxscrpt.h>
6
#ifdef DSMAX2012
7
#include <maxscript/maxscript.h>
8
#else
9
#include <Maxscrpt/maxscrpt.h>
10
#endif // 3DSMAX2012
7 11
#include "namesel.h"
8 12
#include "nsclip.h"
9 13
#include "sbmtlapi.h"
b/code/nel/tools/3d/plugin_max/nel_vertex_tree_paint/dllmain.cpp Wed Jul 27 21:08:19 2011 +0200
18 18

19 19
	switch (fdwReason) {
20 20
		case DLL_PROCESS_ATTACH:
21

22
#ifdef DSMAX2012
23
#else
21 24
			InitCustomControls(hInstance);	// Initialize MAX's custom controls
22 25
			InitCommonControls();			// Initialize Win95 controls
26
#endif // DSMAX2012
27

23 28
			break;
24 29
		}
25 30
			
b/code/nel/tools/3d/plugin_max/tile_utility/DllEntry.cpp Wed Jul 27 21:08:19 2011 +0200
44 44
			
45 45
	hInstance = hinstDLL;				// Hang on to this DLL's instance handle.
46 46

47
#ifdef DSMAX2012
48
#else
47 49
	if (!controlsInit) {
48 50
		controlsInit = TRUE;
49 51
		InitCustomControls(hInstance);	// Initialize MAX's custom controls
50 52
		InitCommonControls();			// Initialize Win95 controls
51 53
	}
52
			
54

55
#endif // DSMAX2012
56

53 57
	return (TRUE);
54 58
}
55 59