mirror of
				https://github.com/SoftFever/OrcaSlicer.git
				synced 2025-10-30 12:11:15 -06:00 
			
		
		
		
	Removed some obsolete Perl bindings.
Removed libslic3r from the default include paths for all modules but
libslic3r. Now headers from libslic3r need to be included with an
explicit path (libslic3r/libslic3r.h etc)
Split the localization macros into I18N.{cpp,h}
			
			
This commit is contained in:
		
							parent
							
								
									63faa917a9
								
							
						
					
					
						commit
						a378bb7bed
					
				
					 59 changed files with 197 additions and 404 deletions
				
			
		|  | @ -1,175 +0,0 @@ | |||
| #include "callback.hpp" | ||||
| 
 | ||||
| #include <xsinit.h> | ||||
| 
 | ||||
| void PerlCallback::register_callback(void *sv) | ||||
| {  | ||||
|     if (! SvROK((SV*)sv) || SvTYPE(SvRV((SV*)sv)) != SVt_PVCV) | ||||
|         croak("Not a Callback %_ for PerlFunction", (SV*)sv); | ||||
|     if (m_callback) | ||||
|         SvSetSV((SV*)m_callback, (SV*)sv); | ||||
|     else | ||||
|         m_callback = newSVsv((SV*)sv); | ||||
| } | ||||
| 
 | ||||
| void PerlCallback::deregister_callback() | ||||
| { | ||||
| 	if (m_callback) { | ||||
| 		sv_2mortal((SV*)m_callback); | ||||
| 		m_callback = nullptr; | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
| void PerlCallback::call() const | ||||
| { | ||||
|     if (! m_callback) | ||||
|         return; | ||||
|     dSP; | ||||
|     ENTER; | ||||
|     SAVETMPS; | ||||
|     PUSHMARK(SP); | ||||
|     PUTBACK;  | ||||
|     perl_call_sv(SvRV((SV*)m_callback), G_DISCARD); | ||||
|     FREETMPS; | ||||
|     LEAVE; | ||||
| } | ||||
| 
 | ||||
| void PerlCallback::call(int i) const | ||||
| { | ||||
|     if (! m_callback) | ||||
|         return; | ||||
|     dSP; | ||||
|     ENTER; | ||||
|     SAVETMPS; | ||||
|     PUSHMARK(SP); | ||||
|     XPUSHs(sv_2mortal(newSViv(i))); | ||||
|     PUTBACK;  | ||||
|     perl_call_sv(SvRV((SV*)m_callback), G_DISCARD); | ||||
|     FREETMPS; | ||||
|     LEAVE; | ||||
| } | ||||
| 
 | ||||
| void PerlCallback::call(int i, int j) const | ||||
| { | ||||
|     if (! m_callback) | ||||
|         return; | ||||
|     dSP; | ||||
|     ENTER; | ||||
|     SAVETMPS; | ||||
|     PUSHMARK(SP); | ||||
|     XPUSHs(sv_2mortal(newSViv(i))); | ||||
|     XPUSHs(sv_2mortal(newSViv(j))); | ||||
|     PUTBACK;  | ||||
|     perl_call_sv(SvRV((SV*)m_callback), G_DISCARD); | ||||
|     FREETMPS; | ||||
|     LEAVE; | ||||
| } | ||||
| 
 | ||||
| void PerlCallback::call(const std::vector<int>& ints) const | ||||
| { | ||||
|     if (! m_callback) | ||||
|         return; | ||||
|     dSP; | ||||
|     ENTER; | ||||
|     SAVETMPS; | ||||
|     PUSHMARK(SP); | ||||
|     for (int i : ints) | ||||
|     { | ||||
|         XPUSHs(sv_2mortal(newSViv(i))); | ||||
|     } | ||||
|     PUTBACK; | ||||
|     perl_call_sv(SvRV((SV*)m_callback), G_DISCARD); | ||||
|     FREETMPS; | ||||
|     LEAVE; | ||||
| } | ||||
| 
 | ||||
| void PerlCallback::call(double a) const | ||||
| { | ||||
|     if (!m_callback) | ||||
|         return; | ||||
|     dSP; | ||||
|     ENTER; | ||||
|     SAVETMPS; | ||||
|     PUSHMARK(SP); | ||||
|     XPUSHs(sv_2mortal(newSVnv(a))); | ||||
|     PUTBACK; | ||||
|     perl_call_sv(SvRV((SV*)m_callback), G_DISCARD); | ||||
|     FREETMPS; | ||||
|     LEAVE; | ||||
| } | ||||
| 
 | ||||
| void PerlCallback::call(double a, double b) const | ||||
| { | ||||
|     if (!m_callback) | ||||
|         return; | ||||
|     dSP; | ||||
|     ENTER; | ||||
|     SAVETMPS; | ||||
|     PUSHMARK(SP); | ||||
|     XPUSHs(sv_2mortal(newSVnv(a))); | ||||
|     XPUSHs(sv_2mortal(newSVnv(b))); | ||||
|     PUTBACK; | ||||
|     perl_call_sv(SvRV((SV*)m_callback), G_DISCARD); | ||||
|     FREETMPS; | ||||
|     LEAVE; | ||||
| } | ||||
| 
 | ||||
| void PerlCallback::call(double a, double b, double c) const | ||||
| { | ||||
|     if (!m_callback) | ||||
|         return; | ||||
|     dSP; | ||||
|     ENTER; | ||||
|     SAVETMPS; | ||||
|     PUSHMARK(SP); | ||||
|     XPUSHs(sv_2mortal(newSVnv(a))); | ||||
|     XPUSHs(sv_2mortal(newSVnv(b))); | ||||
|     XPUSHs(sv_2mortal(newSVnv(c))); | ||||
|     PUTBACK; | ||||
|     perl_call_sv(SvRV((SV*)m_callback), G_DISCARD); | ||||
|     FREETMPS; | ||||
|     LEAVE; | ||||
| } | ||||
| 
 | ||||
| void PerlCallback::call(double a, double b, double c, double d) const | ||||
| { | ||||
|     if (!m_callback) | ||||
|         return; | ||||
|     dSP; | ||||
|     ENTER; | ||||
|     SAVETMPS; | ||||
|     PUSHMARK(SP); | ||||
|     XPUSHs(sv_2mortal(newSVnv(a))); | ||||
|     XPUSHs(sv_2mortal(newSVnv(b))); | ||||
|     XPUSHs(sv_2mortal(newSVnv(c))); | ||||
|     XPUSHs(sv_2mortal(newSVnv(d))); | ||||
|     PUTBACK; | ||||
|     perl_call_sv(SvRV((SV*)m_callback), G_DISCARD); | ||||
|     FREETMPS; | ||||
|     LEAVE; | ||||
| } | ||||
| 
 | ||||
| void PerlCallback::call(double a, double b, double c, double d, double e, double f) const | ||||
| { | ||||
|     if (!m_callback) | ||||
|         return; | ||||
|     dSP; | ||||
|     ENTER; | ||||
|     SAVETMPS; | ||||
|     PUSHMARK(SP); | ||||
|     XPUSHs(sv_2mortal(newSVnv(a))); | ||||
|     XPUSHs(sv_2mortal(newSVnv(b))); | ||||
|     XPUSHs(sv_2mortal(newSVnv(c))); | ||||
|     XPUSHs(sv_2mortal(newSVnv(d))); | ||||
|     XPUSHs(sv_2mortal(newSVnv(e))); | ||||
|     XPUSHs(sv_2mortal(newSVnv(f))); | ||||
|     PUTBACK; | ||||
|     perl_call_sv(SvRV((SV*)m_callback), G_DISCARD); | ||||
|     FREETMPS; | ||||
|     LEAVE; | ||||
| } | ||||
| 
 | ||||
| void PerlCallback::call(bool b) const | ||||
| { | ||||
|     call(b ? 1 : 0); | ||||
| } | ||||
|  | @ -1,33 +0,0 @@ | |||
| #ifndef slic3r_PerlCallback_hpp_ | ||||
| #define slic3r_PerlCallback_hpp_ | ||||
| 
 | ||||
| #include <locale> | ||||
| 
 | ||||
| #include "libslic3r.h" | ||||
| 
 | ||||
| namespace Slic3r { | ||||
| 
 | ||||
| class PerlCallback { | ||||
| public: | ||||
|     PerlCallback(void *sv) : m_callback(nullptr) { this->register_callback(sv); } | ||||
|     PerlCallback() : m_callback(nullptr) {} | ||||
|     ~PerlCallback() { this->deregister_callback(); } | ||||
|     void register_callback(void *sv); | ||||
|     void deregister_callback(); | ||||
|     void call() const; | ||||
|     void call(int i) const; | ||||
|     void call(int i, int j) const; | ||||
|     void call(const std::vector<int>& ints) const; | ||||
|     void call(double a) const; | ||||
|     void call(double a, double b) const; | ||||
|     void call(double a, double b, double c) const; | ||||
|     void call(double a, double b, double c, double d) const; | ||||
|     void call(double a, double b, double c, double d, double e, double f) const; | ||||
|     void call(bool b) const; | ||||
| private: | ||||
|     void *m_callback; | ||||
| }; | ||||
| 
 | ||||
| } // namespace Slic3r
 | ||||
| 
 | ||||
| #endif /* slic3r_PerlCallback_hpp_ */ | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 bubnikv
						bubnikv