Navigation

← Previous Changeset
Next Changeset →

Changeset 572

Timestamp:

05/06/08 14:23:49 (8 months ago)

Author:

phill

Message:

o maya2q3 plugin updates.

Files:

trunk/bin/win32/release (8.5)/bin/maya2q3.mll (modified) (previous)
trunk/bin/win32/release (8.5)/bin/maya2q3.pdb (modified) (previous)
trunk/maya2q3/bsp-colordump.cpp (modified) (1 diff)
trunk/maya2q3/bsp.cpp (modified) (1 diff)
trunk/maya2q3/common.h (modified) (1 diff)
trunk/maya2q3/maya2q3.vcproj (modified) (2 diffs)
trunk/maya2q3/maya_entry.cpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/maya2q3/bsp-colordump.cpp

r550	r572
254	254	BdSourceVertexId, attrName, sourceVert );
255	255
256		if( !stat \|\| sourceVert < 0 )
	256	if( !stat \|\| sourceVert < 0 \|\| (size_t)sourceVert >= verts.size() )
257	257	continue;
258	258

trunk/maya2q3/bsp.cpp

r569	r572
253	253	buf.Append( "_lmap_%i", lightmapNum );
254	254
	255	MString shaderName( buf );
	256	MString sgName = shaderName + "SG";
	257
255	258	MStatus stat;
256	259
257		MDGModifier dgMod;
258
259		MFnLambertShader fnShader;
260
261		fnShader.create( true, &stat );
262		check_status( stat );
263
264		fnShader.setName( MString( buf ), &stat );
265		check_status( stat );
266
267		{
268		MFnTypedAttribute attr;
269		MObject attrObj = attr.create( "originalShaderName",
270		"osn", MFnData::kString, MObject::kNullObj, &stat );
271		check_status( stat );
272
273		stat = fnShader.addAttribute( attrObj );
274		check_status( stat );
275
276		MPlug attrPlug = fnShader.findPlug( attrObj, &stat );
277		check_status( stat );
278
279		stat = attrPlug.setString( MString( shader.shader ) );
280		check_status( stat );
281		}
282
283		MPlug outColorPlug = fnShader.findPlug( MString( "outColor" ), &stat );
284		check_status( stat );
285
286		MObject shaderObj = fnShader.object( &stat );
287		check_status( stat );
288
289		MObject texObj = ImportTexture( shader.shader );
290		if( texObj != MObject::kNullObj )
291		{
292		MFnDependencyNode fnTex( texObj, &stat );
293		check_status( stat );
294
295		MPlug texColorPlug = fnTex.findPlug( MString( "outColor" ), &stat );
296		check_status( stat );
297		//MPlug texTransPlug = fnTex.findPlug( MString( "outTransparency" ), &stat );
298		//check_status( stat );
299
300		MPlug shaderColorPlug = fnShader.findPlug( MString( "color" ), &stat );
301		check_status( stat );
302		//MPlug shaderTransPlug = fnShader.findPlug( MString( "transparency" ), &stat );
303		//check_status( stat );
304
305
306		stat = dgMod.connect( texColorPlug, shaderColorPlug );
307		check_status( stat );
308		//stat = dgMod.connect( texTransPlug, shaderTransPlug );
309		//check_status( stat );
310		}
311
312		MFnSet fnGroup;
313		MSelectionList empty;
314		fnGroup.create( empty, MFnSet::kRenderableOnly, false, &stat );
315		check_status( stat );
316
317		buf.Append( "SG" );
318		fnGroup.setName( MString( buf ), &stat );
319		check_status( stat );
320
321		MPlug surfaceShaderPlug = fnGroup.findPlug( MString( "surfaceShader" ), &stat );
322		check_status( stat );
323
324		MObject groupObj = fnGroup.object( &stat );
325		check_status( stat );
326
327		MPlugArray connections;
328		surfaceShaderPlug.connectedTo( connections, true, false, &stat );
329		check_status( stat );
330
331		for( uint i = 0; i < connections.length(); i++ )
332		{
333		stat = dgMod.disconnect( connections[i], surfaceShaderPlug );
334		check_status( stat );
335		}
336
337		stat = dgMod.connect( outColorPlug, surfaceShaderPlug );
338		check_status( stat );
339
340		stat = dgMod.doIt();
341		check_status( stat );
342
343		m_shaders.append( groupObj );
	260	MObject sgObj;
	261
	262	MItDependencyNodes nodeIter( MFn::kShadingEngine, &stat );
	263	check_status( stat );
	264
	265	for( ; ; )
	266	{
	267	bool isDone = nodeIter.isDone( &stat );
	268	check_status( stat );
	269
	270	if( isDone )
	271	break;
	272
	273	MObject obj = nodeIter.thisNode( &stat );
	274	check_status( stat );
	275
	276	stat = nodeIter.next();
	277	check_status( stat );
	278
	279	MFnDependencyNode depNode( obj, &stat );
	280	check_status( stat );
	281
	282	MString depName = depNode.name( &stat );
	283	check_status( stat );
	284
	285	if( depName != sgName )
	286	continue;
	287
	288	sgObj = obj;
	289	break;
	290	}
	291
	292	if( sgObj.isNull() )
	293	{
	294	MDGModifier dgMod;
	295
	296	MFnLambertShader fnShader;
	297
	298	fnShader.create( true, &stat );
	299	check_status( stat );
	300
	301	fnShader.setName( shaderName, &stat );
	302	check_status( stat );
	303
	304	{
	305	MFnTypedAttribute attr;
	306	MObject attrObj = attr.create( "originalShaderName",
	307	"osn", MFnData::kString, MObject::kNullObj, &stat );
	308	check_status( stat );
	309
	310	stat = fnShader.addAttribute( attrObj );
	311	check_status( stat );
	312
	313	MPlug attrPlug = fnShader.findPlug( attrObj, &stat );
	314	check_status( stat );
	315
	316	stat = attrPlug.setString( MString( shader.shader ) );
	317	check_status( stat );
	318	}
	319
	320	MPlug outColorPlug = fnShader.findPlug( MString( "outColor" ), &stat );
	321	check_status( stat );
	322
	323	MObject shaderObj = fnShader.object( &stat );
	324	check_status( stat );
	325
	326	MObject texObj = ImportTexture( shader.shader );
	327	if( texObj != MObject::kNullObj )
	328	{
	329	MFnDependencyNode fnTex( texObj, &stat );
	330	check_status( stat );
	331
	332	MPlug texColorPlug = fnTex.findPlug( MString( "outColor" ), &stat );
	333	check_status( stat );
	334	//MPlug texTransPlug = fnTex.findPlug( MString( "outTransparency" ), &stat );
	335	//check_status( stat );
	336
	337	MPlug shaderColorPlug = fnShader.findPlug( MString( "color" ), &stat );
	338	check_status( stat );
	339	//MPlug shaderTransPlug = fnShader.findPlug( MString( "transparency" ), &stat );
	340	//check_status( stat );
	341
	342
	343	stat = dgMod.connect( texColorPlug, shaderColorPlug );
	344	check_status( stat );
	345	//stat = dgMod.connect( texTransPlug, shaderTransPlug );
	346	//check_status( stat );
	347	}
	348
	349	MFnSet fnGroup;
	350	MSelectionList empty;
	351	fnGroup.create( empty, MFnSet::kRenderableOnly, false, &stat );
	352	check_status( stat );
	353
	354	fnGroup.setName( sgName, &stat );
	355	check_status( stat );
	356
	357	MPlug surfaceShaderPlug = fnGroup.findPlug( MString( "surfaceShader" ), &stat );
	358	check_status( stat );
	359
	360	sgObj = fnGroup.object( &stat );
	361	check_status( stat );
	362
	363	MPlugArray connections;
	364	surfaceShaderPlug.connectedTo( connections, true, false, &stat );
	365	check_status( stat );
	366
	367	for( uint i = 0; i < connections.length(); i++ )
	368	{
	369	stat = dgMod.disconnect( connections[i], surfaceShaderPlug );
	370	check_status( stat );
	371	}
	372
	373	stat = dgMod.connect( outColorPlug, surfaceShaderPlug );
	374	check_status( stat );
	375
	376	stat = dgMod.doIt();
	377	check_status( stat );
	378	}
	379
	380	m_shaders.append( sgObj );
344	381
345	382	m_shaderMap.push_back( std::pair< int, int >( shaderNum, lightmapNum ) );

trunk/maya2q3/common.h

r549	r572
97	97	#include <maya/MPlugArray.h>
98	98	#include <maya/MFnDependencyNode.h>
	99	#include <maya/MIteratorType.h>
	100	#include <maya/MItDependencyGraph.h>
	101	#include <maya/MItDependencyNodes.h>
99	102	#include <maya/MFnAttribute.h>
100	103	#include <maya/MFnTypedAttribute.h>

trunk/maya2q3/maya2q3.vcproj

r549	r572
464	464	Name="VCPostBuildEventTool"
465	465	Description="Copying to Maya plugins directory."
466		CommandLine="copy "$(OutDir)\$(ProjectName).mll" "C:\Program Files (x86)\Autodesk\Maya8.5\bin\plug-ins" copy "$(ProjectDir)\AEQ3ShaderTemplate.mel" "C:\Program Files (x86)\Autodesk\Maya8.5\scripts\AETemplates" copy "$(ProjectDir)\maya2q3.mel" "C:\Program Files (x86)\Autodesk\Maya8.5\scripts\others" "
	466	CommandLine="copy "$(OutDir)\$(ProjectName).mll" "C:\Projects\Hermitworks Tools - Staging\maya8.5\plug-ins" copy "$(ProjectDir)\AEQ3ShaderTemplate.mel" "C:\Projects\Hermitworks Tools - Staging\maya8.5\scripts" copy "$(ProjectDir)\maya2q3.mel" "C:\Projects\Hermitworks Tools - Staging\maya8.5\scripts" "
467	467	/>
468	468	</Configuration>
…	…
552	552	<Tool
553	553	Name="VCPostBuildEventTool"
554		Description="Copying to ~~Maya plugins~~ directory."
555		CommandLine="copy "$(OutDir)\$(ProjectName).mll" "C:\Program Files (x86)\Autodesk\Maya8.5\bin\plug-ins" copy "$(ProjectDir)\AEQ3ShaderTemplate.mel" "C:\Program Files (x86)\Autodesk\Maya8.5\scripts\AETemplates" copy "$(ProjectDir)\maya2q3.mel" "C:\Program Files (x86)\Autodesk\Maya8.5\scripts\others" "
	554	Description="Copying to tools staging directory."
	555	CommandLine="copy "$(OutDir)\$(ProjectName).mll" "C:\Projects\Hermitworks Tools - Staging\maya8.5\plug-ins" copy "$(ProjectDir)\AEQ3ShaderTemplate.mel" "C:\Projects\Hermitworks Tools - Staging\maya8.5\scripts" copy "$(ProjectDir)\maya2q3.mel" "C:\Projects\Hermitworks Tools - Staging\maya8.5\scripts" "
556	556	/>
557	557	</Configuration>

trunk/maya2q3/maya_entry.cpp

r561	r572
26	26
27	27	static const char *g_vendor = "HermitWorks";
28		static const char *g_version = "3.3.7";
	28	static const char *g_version = "3.3.8";
29	29	static const char *g_reqVer = "Any";
30	30

Navigation

Changeset 572

Legend:

trunk/maya2q3/bsp-colordump.cpp

trunk/maya2q3/bsp.cpp

trunk/maya2q3/common.h

trunk/maya2q3/maya2q3.vcproj

trunk/maya2q3/maya_entry.cpp

Download in other formats: