Navigation

← Previous Changeset
Next Changeset →

Changeset 19642

Timestamp:

12/12/06 17:54:17 (2 years ago)

Author:

patrick

Message:

MFT [rev 19637]: Avoid an ugly bug where virtual function overrides could be

ignored due to explicit implementation invocation.

Files:

PyJuggler/branches/1.0/src/opensgapp/_OpenSGApp.cpp (modified) (23 diffs)
PyJuggler/branches/1.0/src/osgapp/_OsgApp.cpp (modified) (24 diffs)
PyJuggler/branches/1.0/src/vrj/_GlApp.cpp (modified) (23 diffs)

Legend:

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

PyJuggler/branches/1.0/src/opensgapp/_OpenSGApp.cpp

r19621	r19642
271	271	void default_apiInit()
272	272	{
273		vrj::App::apiInit();
	273	vrj::OpenSGApp::apiInit();
274	274	}
275	275
…	…
293	293	void default_exit()
294	294	{
295		vrj::App::exit();
	295	vrj::OpenSGApp::exit();
296	296	}
297	297
…	…
315	315	void default_preFrame()
316	316	{
317		vrj::App::preFrame();
	317	vrj::OpenSGApp::preFrame();
318	318	}
319	319
…	…
339	339	void default_latePreFrame()
340	340	{
341		vrj::App::latePreFrame();
	341	vrj::OpenSGApp::latePreFrame();
342	342	}
343	343
…	…
361	361	void default_intraFrame()
362	362	{
363		vrj::App::intraFrame();
	363	vrj::OpenSGApp::intraFrame();
364	364	}
365	365
…	…
383	383	void default_postFrame()
384	384	{
385		vrj::App::postFrame();
	385	vrj::OpenSGApp::postFrame();
386	386	}
387	387
…	…
405	405	void default_reset()
406	406	{
407		vrj::App::reset();
	407	vrj::OpenSGApp::reset();
408	408	}
409	409
…	…
429	429	void default_focusChanged()
430	430	{
431		vrj::App::focusChanged();
	431	vrj::OpenSGApp::focusChanged();
432	432	}
433	433
…	…
450	450	}
451	451
452		return vrj::App::getDrawScaleFactor();
	452	return vrj::OpenSGApp::getDrawScaleFactor();
453	453	}
454	454
455	455	float default_getDrawScaleFactor()
456	456	{
457		return vrj::App::getDrawScaleFactor();
	457	return vrj::OpenSGApp::getDrawScaleFactor();
458	458	}
459	459
…	…
481	481	bool default_configCanHandle(jccl::ConfigElementPtr p0)
482	482	{
483		return vrj::App::configCanHandle(p0);
	483	return vrj::OpenSGApp::configCanHandle(p0);
484	484	}
485	485
…	…
507	507	bool default_depSatisfied()
508	508	{
509		return vrj::App::depSatisfied();
	509	return vrj::OpenSGApp::depSatisfied();
510	510	}
511	511
…	…
531	531	bool default_configAdd(jccl::ConfigElementPtr p0)
532	532	{
533		return vrj::App::configAdd(p0);
	533	return vrj::OpenSGApp::configAdd(p0);
534	534	}
535	535
…	…
557	557	bool default_configRemove(jccl::ConfigElementPtr p0)
558	558	{
559		return vrj::App::configRemove(p0);
	559	return vrj::OpenSGApp::configRemove(p0);
560	560	}
561	561
…	…
583	583	int default_configProcessPending()
584	584	{
585		return vrj::App::configProcessPending();
	585	return vrj::OpenSGApp::configProcessPending();
586	586	}
587	587
…	…
764	764	"exiting."
765	765	)
766		.def("preFrame", &vrj::App::preFrame,
	766	.def("preFrame", &vrj::OpenSGApp::preFrame,
767	767	&pyj::vrj_OpenSGApp_Wrapper::default_preFrame,
768	768	"preFrame()\n"
…	…
771	771	"new frame."
772	772	)
773		.def("latePreFrame", &vrj::App::latePreFrame,
	773	.def("latePreFrame", &vrj::OpenSGApp::latePreFrame,
774	774	&pyj::vrj_OpenSGApp_Wrapper::default_latePreFrame,
775	775	"latePreFrame()\n"
…	…
781	781	"rendering process since it might be using multiple threads."
782	782	)
783		.def("intraFrame", &vrj::App::intraFrame,
	783	.def("intraFrame", &vrj::OpenSGApp::intraFrame,
784	784	&pyj::vrj_OpenSGApp_Wrapper::default_intraFrame,
785	785	"intraFrame()\n"
786	786	"Function called during the application's drawing time."
787	787	)
788		.def("postFrame", &vrj::App::postFrame,
	788	.def("postFrame", &vrj::OpenSGApp::postFrame,
789	789	&pyj::vrj_OpenSGApp_Wrapper::default_postFrame,
790	790	"postFrame()\n"
…	…
792	792	"frame is complete."
793	793	)
794		.def("reset", &vrj::App::reset,
	794	.def("reset", &vrj::OpenSGApp::reset,
795	795	&pyj::vrj_OpenSGApp_Wrapper::default_reset,
796	796	"reset()\n"
…	…
799	799	"initial state."
800	800	)
801		.def("focusChanged", &vrj::App::focusChanged,
	801	.def("focusChanged", &vrj::OpenSGApp::focusChanged,
802	802	&pyj::vrj_OpenSGApp_Wrapper::default_focusChanged,
803	803	"focusChanged()\n"
804	804	"Called when the focus state changes."
805	805	)
806		.def("getDrawScaleFactor", &vrj::App::getDrawScaleFactor,
	806	.def("getDrawScaleFactor", &vrj::OpenSGApp::getDrawScaleFactor,
807	807	&pyj::vrj_OpenSGApp_Wrapper::default_getDrawScaleFactor,
808	808	"getDrawScaleFactor() -> float\n"
…	…
815	815	"return 3.28 (gadget.PositionUnitConversion.ConvertToFeet)."
816	816	)
817		.def("configCanHandle", &vrj::App::configCanHandle,
	817	.def("configCanHandle", &vrj::OpenSGApp::configCanHandle,
818	818	&pyj::vrj_OpenSGApp_Wrapper::default_configCanHandle,
819	819	"configCanHandle(element) -> Boolean\n"
…	…
822	822	"element -- An instance of jccl.ConfigElement."
823	823	)
824		.def("depSatisfied", &vrj::App::depSatisfied,
	824	.def("depSatisfied", &vrj::OpenSGApp::depSatisfied,
825	825	&pyj::vrj_OpenSGApp_Wrapper::default_depSatisfied,
826	826	"depSatisfied() -> Boolean\n"
…	…
838	838	"Inherited from jccl.ConfigElementHandler and not overridden."
839	839	)
840		.def("haveFocus", &vrj::App::haveFocus,
	840	.def("haveFocus", &vrj::OpenSGApp::haveFocus,
841	841	"haveFocus() -> Boolean\n"
842	842	"Does this application currently have focus? If an application\n"
…	…
848	848	"interact with a GUI window that has focus."
849	849	)
850		.def("setFocus", &vrj::App::setFocus,
	850	.def("setFocus", &vrj::OpenSGApp::setFocus,
851	851	"setFocus(newState)\n"
852	852	"Sets the focus state.\n\n"

PyJuggler/branches/1.0/src/osgapp/_OsgApp.cpp

r19617	r19642
265	265	void default_contextPostDraw()
266	266	{
267		vrj::GlApp::contextPostDraw();
	267	vrj::OsgApp::contextPostDraw();
268	268	}
269	269
…	…
287	287	void default_apiInit()
288	288	{
289		vrj::App::apiInit();
	289	vrj::OsgApp::apiInit();
290	290	}
291	291
…	…
309	309	void default_exit()
310	310	{
311		vrj::App::exit();
	311	vrj::OsgApp::exit();
312	312	}
313	313
…	…
331	331	void default_preFrame()
332	332	{
333		vrj::App::preFrame();
	333	vrj::OsgApp::preFrame();
334	334	}
335	335
…	…
375	375	void default_intraFrame()
376	376	{
377		vrj::App::intraFrame();
	377	vrj::OsgApp::intraFrame();
378	378	}
379	379
…	…
397	397	void default_postFrame()
398	398	{
399		vrj::App::postFrame();
	399	vrj::OsgApp::postFrame();
400	400	}
401	401
…	…
419	419	void default_reset()
420	420	{
421		vrj::App::reset();
	421	vrj::OsgApp::reset();
422	422	}
423	423
…	…
441	441	void default_focusChanged()
442	442	{
443		vrj::App::focusChanged();
	443	vrj::OsgApp::focusChanged();
444	444	}
445	445
…	…
460	460	}
461	461
462		return vrj::App::getDrawScaleFactor();
	462	return vrj::OsgApp::getDrawScaleFactor();
463	463	}
464	464
465	465	float default_getDrawScaleFactor()
466	466	{
467		return vrj::App::getDrawScaleFactor();
	467	return vrj::OsgApp::getDrawScaleFactor();
468	468	}
469	469
…	…
489	489	bool default_configCanHandle(jccl::ConfigElementPtr p0)
490	490	{
491		return vrj::App::configCanHandle(p0);
	491	return vrj::OsgApp::configCanHandle(p0);
492	492	}
493	493
…	…
513	513	bool default_depSatisfied()
514	514	{
515		return vrj::App::depSatisfied();
	515	return vrj::OsgApp::depSatisfied();
516	516	}
517	517
…	…
537	537	bool default_configAdd(jccl::ConfigElementPtr p0)
538	538	{
539		return vrj::App::configAdd(p0);
	539	return vrj::OsgApp::configAdd(p0);
540	540	}
541	541
…	…
561	561	bool default_configRemove(jccl::ConfigElementPtr p0)
562	562	{
563		return vrj::App::configRemove(p0);
	563	return vrj::OsgApp::configRemove(p0);
564	564	}
565	565
…	…
585	585	int default_configProcessPending()
586	586	{
587		return vrj::App::configProcessPending();
	587	return vrj::OsgApp::configProcessPending();
588	588	}
589	589
…	…
730	730	"called. This is a TEST function. USE AT YOUR OWN RISK!"
731	731	)
732		.def("contextPostDraw", &vrj::GlApp::contextPostDraw,
	732	.def("contextPostDraw", &vrj::OsgApp::contextPostDraw,
733	733	&pyj::vrj_OsgApp_Wrapper::default_contextPostDraw,
734	734	"contextPostDraw()\n"
…	…
738	738	"The OpenGL context has been set to the context for drawing."
739	739	)
740		.def("apiInit", &vrj::App::apiInit,
	740	.def("apiInit", &vrj::OsgApp::apiInit,
741	741	&pyj::vrj_OsgApp_Wrapper::default_apiInit,
742	742	"apiInit()\n"
…	…
745	745	"before the Draw Manager starts the rendering loop(s)."
746	746	)
747		.def("exit", &vrj::App::exit, &pyj::vrj_OsgApp_Wrapper::default_exit,
	747	.def("exit", &vrj::OsgApp::exit, &pyj::vrj_OsgApp_Wrapper::default_exit,
748	748	"exit()\n"
749	749	"Executes any final clean-up needed for the application before\n"
750	750	"exiting."
751	751	)
752		.def("preFrame", &vrj::App::preFrame,
	752	.def("preFrame", &vrj::OsgApp::preFrame,
753	753	&pyj::vrj_OsgApp_Wrapper::default_preFrame,
754	754	"preFrame()\n"
…	…
767	767	"rendering process since it might be using multiple threads."
768	768	)
769		.def("intraFrame", &vrj::App::intraFrame,
	769	.def("intraFrame", &vrj::OsgApp::intraFrame,
770	770	&pyj::vrj_OsgApp_Wrapper::default_intraFrame,
771	771	"intraFrame()\n"
772	772	"Function called during the application's drawing time."
773	773	)
774		.def("postFrame", &vrj::App::postFrame,
	774	.def("postFrame", &vrj::OsgApp::postFrame,
775	775	&pyj::vrj_OsgApp_Wrapper::default_postFrame,
776	776	"postFrame()\n"
…	…
778	778	"frame is complete."
779	779	)
780		.def("reset", &vrj::App::reset,
	780	.def("reset", &vrj::OsgApp::reset,
781	781	&pyj::vrj_OsgApp_Wrapper::default_reset,
782	782	"reset()\n"
…	…
785	785	"initial state."
786	786	)
787		.def("focusChanged", &vrj::App::focusChanged,
	787	.def("focusChanged", &vrj::OsgApp::focusChanged,
788	788	&pyj::vrj_OsgApp_Wrapper::default_focusChanged,
789	789	"focusChanged()\n"
790	790	"Called when the focus state changes."
791	791	)
792		.def("getDrawScaleFactor", &vrj::App::getDrawScaleFactor,
	792	.def("getDrawScaleFactor", &vrj::OsgApp::getDrawScaleFactor,
793	793	&pyj::vrj_OsgApp_Wrapper::default_getDrawScaleFactor,
794	794	"getDrawScaleFactor() -> float\n"
…	…
801	801	"return 3.28 (gadget.PositionUnitConversion.ConvertToFeet)."
802	802	)
803		.def("configCanHandle", &vrj::App::configCanHandle,
	803	.def("configCanHandle", &vrj::OsgApp::configCanHandle,
804	804	&pyj::vrj_OsgApp_Wrapper::default_configCanHandle,
805	805	"configCanHandle(element) -> Boolean\n"
…	…
808	808	"element -- An instance of jccl.ConfigElement."
809	809	)
810		.def("depSatisfied", &vrj::App::depSatisfied,
	810	.def("depSatisfied", &vrj::OsgApp::depSatisfied,
811	811	&pyj::vrj_OsgApp_Wrapper::default_depSatisfied,
812	812	"depSatisfied() -> Boolean\n"
…	…
824	824	"Inherited from jccl.ConfigElementHandler and not overridden."
825	825	)
826		.def("haveFocus", &vrj::App::haveFocus,
	826	.def("haveFocus", &vrj::OsgApp::haveFocus,
827	827	"haveFocus() -> Boolean\n"
828	828	"Does this application currently have focus? If an application\n"
…	…
834	834	"interact with a GUI window that has focus."
835	835	)
836		.def("setFocus", &vrj::App::setFocus,
	836	.def("setFocus", &vrj::OsgApp::setFocus,
837	837	"setFocus(newState)\n"
838	838	"Sets the focus state.\n\n"

PyJuggler/branches/1.0/src/vrj/_GlApp.cpp

r18527	r19642
209	209	void default_init()
210	210	{
211		vrj::App::init();
	211	vrj::GlApp::init();
212	212	}
213	213
…	…
231	231	void default_apiInit()
232	232	{
233		vrj::App::apiInit();
	233	vrj::GlApp::apiInit();
234	234	}
235	235
…	…
253	253	void default_exit()
254	254	{
255		vrj::App::exit();
	255	vrj::GlApp::exit();
256	256	}
257	257
…	…
275	275	void default_preFrame()
276	276	{
277		vrj::App::preFrame();
	277	vrj::GlApp::preFrame();
278	278	}
279	279
…	…
297	297	void default_latePreFrame()
298	298	{
299		vrj::App::latePreFrame();
	299	vrj::GlApp::latePreFrame();
300	300	}
301	301
…	…
319	319	void default_intraFrame()
320	320	{
321		vrj::App::intraFrame();
	321	vrj::GlApp::intraFrame();
322	322	}
323	323
…	…
341	341	void default_postFrame()
342	342	{
343		vrj::App::postFrame();
	343	vrj::GlApp::postFrame();
344	344	}
345	345
…	…
363	363	void default_reset()
364	364	{
365		vrj::App::reset();
	365	vrj::GlApp::reset();
366	366	}
367	367
…	…
385	385	void default_focusChanged()
386	386	{
387		vrj::App::focusChanged();
	387	vrj::GlApp::focusChanged();
388	388	}
389	389
…	…
404	404	}
405	405
406		return vrj::App::getDrawScaleFactor();
	406	return vrj::GlApp::getDrawScaleFactor();
407	407	}
408	408
409	409	float default_getDrawScaleFactor()
410	410	{
411		return vrj::App::getDrawScaleFactor();
	411	return vrj::GlApp::getDrawScaleFactor();
412	412	}
413	413
…	…
433	433	bool default_configCanHandle(jccl::ConfigElementPtr p0)
434	434	{
435		return vrj::App::configCanHandle(p0);
	435	return vrj::GlApp::configCanHandle(p0);
436	436	}
437	437
…	…
457	457	bool default_depSatisfied()
458	458	{
459		return vrj::App::depSatisfied();
	459	return vrj::GlApp::depSatisfied();
460	460	}
461	461
…	…
481	481	bool default_configAdd(jccl::ConfigElementPtr p0)
482	482	{
483		return vrj::App::configAdd(p0);
	483	return vrj::GlApp::configAdd(p0);
484	484	}
485	485
…	…
505	505	bool default_configRemove(jccl::ConfigElementPtr p0)
506	506	{
507		return vrj::App::configRemove(p0);
	507	return vrj::GlApp::configRemove(p0);
508	508	}
509	509
…	…
658	658	"called. This is a TEST function. USE AT YOUR OWN RISK!"
659	659	)
660		.def("init", &vrj::App::init, &pyj::vrj_GlApp_Wrapper::default_init,
	660	.def("init", &vrj::GlApp::init, &pyj::vrj_GlApp_Wrapper::default_init,
661	661	"init()\n"
662	662	"Application initialization function. Execute any\n"
…	…
666	666	"method."
667	667	)
668		.def("apiInit", &vrj::App::apiInit,
	668	.def("apiInit", &vrj::GlApp::apiInit,
669	669	&pyj::vrj_GlApp_Wrapper::default_apiInit,
670	670	"apiInit()\n"
…	…
673	673	"before the Draw Manager starts the rendering loop(s)."
674	674	)
675		.def("exit", &vrj::App::exit, &pyj::vrj_GlApp_Wrapper::default_exit,
	675	.def("exit", &vrj::GlApp::exit, &pyj::vrj_GlApp_Wrapper::default_exit,
676	676	"exit()\n"
677	677	"Executes any final clean-up needed for the application before\n"
678	678	"exiting."
679	679	)
680		.def("preFrame", &vrj::App::preFrame,
	680	.def("preFrame", &vrj::GlApp::preFrame,
681	681	&pyj::vrj_GlApp_Wrapper::default_preFrame,
682	682	"preFrame()\n"
…	…
685	685	"new frame."
686	686	)
687		.def("latePreFrame", &vrj::App::latePreFrame,
	687	.def("latePreFrame", &vrj::GlApp::latePreFrame,
688	688	&pyj::vrj_GlApp_Wrapper::default_latePreFrame,
689	689	"latePreFrame()\n"
…	…
695	695	"rendering process since it might be using multiple threads."
696	696	)
697		.def("intraFrame", &vrj::App::intraFrame,
	697	.def("intraFrame", &vrj::GlApp::intraFrame,
698	698	&pyj::vrj_GlApp_Wrapper::default_intraFrame,
699	699	"intraFrame()\n"
700	700	"Function called during the application's drawing time."
701	701	)
702		.def("postFrame", &vrj::App::postFrame,
	702	.def("postFrame", &vrj::GlApp::postFrame,
703	703	&pyj::vrj_GlApp_Wrapper::default_postFrame,
704	704	"postFrame()\n"
…	…
706	706	"frame is complete."
707	707	)
708		.def("reset", &vrj::App::reset, &pyj::vrj_GlApp_Wrapper::default_reset,
	708	.def("reset", &vrj::GlApp::reset,
	709	&pyj::vrj_GlApp_Wrapper::default_reset,
709	710	"reset()\n"
710	711	"Resets the application. This is used when the kernel (or\n"
…	…
712	713	"initial state."
713	714	)
714		.def("focusChanged", &vrj::App::focusChanged,
	715	.def("focusChanged", &vrj::GlApp::focusChanged,
715	716	&pyj::vrj_GlApp_Wrapper::default_focusChanged,
716	717	"focusChanged()\n"
717	718	"Called when the focus state changes."
718	719	)
719		.def("getDrawScaleFactor", &vrj::App::getDrawScaleFactor,
	720	.def("getDrawScaleFactor", &vrj::GlApp::getDrawScaleFactor,
720	721	&pyj::vrj_GlApp_Wrapper::default_getDrawScaleFactor,
721	722	"getDrawScaleFactor() -> float\n"
…	…
728	729	"return 3.28 (gadget.PositionUnitConversion.ConvertToFeet)."
729	730	)
730		.def("configCanHandle", &vrj::App::configCanHandle,
	731	.def("configCanHandle", &vrj::GlApp::configCanHandle,
731	732	&pyj::vrj_GlApp_Wrapper::default_configCanHandle,
732	733	"configCanHandle(element) -> Boolean\n"
…	…
735	736	"element -- An instance of jccl.ConfigElement."
736	737	)
737		.def("depSatisfied", &vrj::App::depSatisfied,
	738	.def("depSatisfied", &vrj::GlApp::depSatisfied,
738	739	&pyj::vrj_GlApp_Wrapper::default_depSatisfied,
739	740	"depSatisfied() -> Boolean\n"

Download in other formats: