Navigation

← Previous Change
Next Change →

OSGSortLastWindow.cpp

Timestamp:

05/05/08 06:42:33 (7 months ago)

Author:

vossg

Message:

fixed: field container field interface cleanup

removed duplicated interfaces (e.g get/edit * and get/edit & for all fields)
adjust available field access according to field properties (allow/diallow null ptr, custom access functions)
to avoid loopholes through different access possibilities

Files:

trunk/Source/System/Cluster/Window/SortLast/OSGSortLastWindow.cpp (modified) (18 diffs)

Legend:

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

trunk/Source/System/Cluster/Window/SortLast/OSGSortLastWindow.cpp

r1177	r1194
101	101
102	102	// is rebuild neccessary ?
103		if(!rebuild && get~~GroupNodes().~~size())
	103	if(!rebuild && getMFGroupNodes()->size())
104	104	return;
105	105
106		groupCount = get~~Servers().~~size();
	106	groupCount = getMFServers()->size();
107	107
108	108	if(getComposer() != NullFC)
…	…
116	116
117	117	clearGroupNodes();
118		edit~~GroupLengths().~~clear();
119
120		for(v = 0; v < get~~Port().~~size(); ++v)
121		{
122		ViewportPtr vp = getPort(~~)[v]~~;
	118	editMFGroupLengths()->clear();
	119
	120	for(v = 0; v < getMFPort()->size(); ++v)
	121	{
	122	ViewportPtr vp = getPort(v);
123	123	NodePtr root = vp->getRoot();
124	124
…	…
284	284
285	285	// duplicate viewports
286		for(cv = 0, sv = 0; cv < get~~Port().~~size(); ++cv)
287		{
288		clientPort = getPort(~~)[cv]~~;
289
290		if(serverWindow->get~~Port().~~size() <= sv)
	286	for(cv = 0, sv = 0; cv < getMFPort()->size(); ++cv)
	287	{
	288	clientPort = getPort(cv);
	289
	290	if(serverWindow->getMFPort()->size() <= sv)
291	291	{
292	292	// create new port
…	…
297	297	else
298	298	{
299		serverPort = serverWindow->getPort(~~)[sv]~~;
	299	serverPort = serverWindow->getPort(sv);
300	300	}
301	301
…	…
321	321	serverPort->clearForegrounds();
322	322
323		for(UInt32 f = 0 ; f < serverPort->get~~Foregrounds().~~size(); ++f)
324		{
325		ForegroundPtr fg = clientPort->getForegrounds(~~)[f]~~;
	323	for(UInt32 f = 0 ; f < serverPort->getMFForegrounds()->size(); ++f)
	324	{
	325	ForegroundPtr fg = clientPort->getForegrounds(f);
326	326
327	327	StatisticsForegroundPtr sfg =
…	…
340	340
341	341	// remove unused ports
342		while(serverWindow->get~~Port().~~size() > sv)
	342	while(serverWindow->getMFPort()->size() > sv)
343	343	{
344	344	serverWindow->subPort(sv);
…	…
357	357	getComposer()->startFrame();
358	358
359		for(sv = 0; sv < serverWindow->get~~Port().~~size(); ++sv)
360		{
361		ViewportPtr vp = serverWindow->getPort(~~)[sv]~~;
	359	for(sv = 0; sv < serverWindow->getMFPort()->size(); ++sv)
	360	{
	361	ViewportPtr vp = serverWindow->getPort(sv);
362	362	NodePtr root = vp->getRoot();
363	363
…	…
418	418	SortLastWindowPtr clusterWindow(this);
419	419	getComposer()->setup(true,
420		get~~Servers().~~size(),
	420	getMFServers()->size(),
421	421	getClientWindow(),
422	422	clusterWindow);
…	…
537	537	{
538	538	UInt32 p;
539		UInt32 groupId = get~~Servers().~~size();
	539	UInt32 groupId = getMFServers()->size();
540	540	UInt32 l,b,r,t;
541	541	UInt32 front,back;
542	542	SortLastWindowPtr clusterWindow(this);
543	543
544		if(get~~Servers().~~size())
	544	if(getMFServers()->size())
545	545	{
546	546	Connection *srcConnection=
…	…
564	564
565	565	// render all viewports
566		for(p = 0; p < get~~Port().~~size() ; ++p)
	566	for(p = 0; p < getMFPort()->size() ; ++p)
567	567	{
568		ViewportPtr vp=getPort(~~)[p]~~;
	568	ViewportPtr vp=getPort(p);
569	569	if(getComposer() != NullFC)
570	570	{
…	…
578	578	action->apply(vp->getRoot());
579	579
580		for(UInt16 i=0; i < vp->get~~Foregrounds().~~size(); i++)
	580	for(UInt16 i=0; i < vp->getMFForegrounds()->size(); i++)
581	581	{
582	582	if(dynamic_cast<StatisticsForegroundPtr>(
…	…
589	589	getComposer()->composeViewport(vp);
590	590
591		for(UInt16 i=0; i < vp->get~~Foregrounds().~~size(); i++)
	591	for(UInt16 i=0; i < vp->getMFForegrounds()->size(); i++)
592	592	{
593	593	if(dynamic_cast<StatisticsForegroundPtr>(
…	…
796	796	if(groups == 1)
797	797	{
798		edit~~GroupLengths().~~push_back(src.size());
	798	editMFGroupLengths()->push_back(src.size());
799	799
800	800	for(dI = src.begin() ; dI != src.end() ; ++dI)
…	…
889	889	UInt32 group = 0;
890	890	UInt32 groupCount = 0;
891		UInt32 usableServers = get~~Servers().~~size();
	891	UInt32 usableServers = getMFServers()->size();
892	892
893	893	if(!getGroupsChanged())
…	…
895	895
896	896	// client and no client rendering
897		if(get~~Servers().~~size() == groupId &&
	897	if(getMFServers()->size() == groupId &&
898	898	(getComposer() == NullFC \|\|
899	899	!getComposer()->getClientRendering()))
900	900	{
901		for(nI = 0 ; nI < get~~GroupNodes().~~size() ; ++nI)
902		{
903		if(getGroupNodes(~~)[nI]~~->getTravMask())
	901	for(nI = 0 ; nI < getMFGroupNodes()->size() ; ++nI)
	902	{
	903	if(getGroupNodes(nI)->getTravMask())
904	904	{
905		getGroupNodes(~~)[nI]~~->setTravMask(0);
906		getGroupNodes(~~)[nI]~~->invalidateVolume();
	905	getGroupNodes(nI)->setTravMask(0);
	906	getGroupNodes(nI)->invalidateVolume();
907	907	}
908	908	}
…	…
915	915
916	916	// server but not usable, then invalidate all nodes
917		if((get~~Servers().~~size() > groupId && usableServers <= groupId))
918		{
919		for(v = 0; v < get~~Port().~~size(); ++v)
	917	if((getMFServers()->size() > groupId && usableServers <= groupId))
	918	{
	919	for(v = 0; v < getMFPort()->size(); ++v)
920	920	{
921	921	root = getPort(v)->getRoot();
…	…
941	941	}
942	942
943		if(get~~Servers().~~size() == groupId)
	943	if(getMFServers()->size() == groupId)
944	944	groupId = usableServers;
945	945
946	946	// setup nodes
947		for(nI = 0,gnI = 0,gI = 0,group = 0 ; nI < get~~GroupNodes().~~size() ; ++nI)
	947	for(nI = 0,gnI = 0,gI = 0,group = 0 ; nI < getMFGroupNodes()->size() ; ++nI)
948	948	{
949	949	while(nI >= gnI)
950	950	{
951		gnI += getGroupLengths(~~)[group]~~;
	951	gnI += getGroupLengths(group);
952	952	gI++;
953	953	group = gI % groupCount;
…	…
955	955	if(group == groupId)
956	956	{
957		if(getGroupNodes(~~)[nI]~~->getTravMask() !=
	957	if(getGroupNodes(nI)->getTravMask() !=
958	958	TypeTraits<UInt32>::getMax())
959	959	{
960		getGroupNodes(~~)[nI]~~->setTravMask(TypeTraits<UInt32>::getMax());
961		getGroupNodes(~~)[nI]~~->invalidateVolume();
	960	getGroupNodes(nI)->setTravMask(TypeTraits<UInt32>::getMax());
	961	getGroupNodes(nI)->invalidateVolume();
962	962	}
963	963	}
964	964	else
965	965	{
966		if(getGroupNodes(~~)[nI]~~->getTravMask())
	966	if(getGroupNodes(nI)->getTravMask())
967	967	{
968		getGroupNodes(~~)[nI]~~->setTravMask(0);
969		getGroupNodes(~~)[nI]~~->invalidateVolume();
	968	getGroupNodes(nI)->setTravMask(0);
	969	getGroupNodes(nI)->invalidateVolume();
970	970	}
971	971	}
972	972
973		getGroupNodes(~~)[nI]~~->updateVolume();
	973	getGroupNodes(nI)->updateVolume();
974	974	}
975	975

Navigation

Changeset 1194 for trunk/Source/System/Cluster/Window/SortLast/OSGSortLastWindow.cpp

Legend:

trunk/Source/System/Cluster/Window/SortLast/OSGSortLastWindow.cpp

Download in other formats: