Merge remote-tracking branch 'upstream/master'
This commit is contained in:
@@ -3,6 +3,13 @@
|
||||
#ifndef COMMON_EXAMPLE_INTERFACE_H
|
||||
#define COMMON_EXAMPLE_INTERFACE_H
|
||||
|
||||
struct CommandProcessorCreationInterface
|
||||
{
|
||||
virtual class CommandProcessorInterface* createCommandProcessor()=0;
|
||||
virtual void deleteCommandProcessor(CommandProcessorInterface*)=0;
|
||||
};
|
||||
|
||||
|
||||
struct CommonExampleOptions
|
||||
{
|
||||
struct GUIHelperInterface* m_guiHelper;
|
||||
@@ -11,13 +18,14 @@ struct CommonExampleOptions
|
||||
int m_option;
|
||||
const char* m_fileName;
|
||||
class SharedMemoryInterface* m_sharedMem;
|
||||
|
||||
CommandProcessorCreationInterface* m_commandProcessorCreation;
|
||||
|
||||
CommonExampleOptions(struct GUIHelperInterface* helper, int option=0)
|
||||
:m_guiHelper(helper),
|
||||
m_option(option),
|
||||
m_fileName(0),
|
||||
m_sharedMem(0)
|
||||
m_sharedMem(0),
|
||||
m_commandProcessorCreation(0)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -39,6 +39,8 @@ struct GUIHelperInterface
|
||||
virtual void removeAllGraphicsInstances()=0;
|
||||
virtual void removeGraphicsInstance(int graphicsUid) {}
|
||||
virtual void changeRGBAColor(int instanceUid, const double rgbaColor[4]) {}
|
||||
virtual void changeSpecularColor(int instanceUid, const double specularColor[3]) {}
|
||||
|
||||
|
||||
virtual Common2dCanvasInterface* get2dCanvasInterface()=0;
|
||||
|
||||
|
||||
@@ -79,6 +79,9 @@ struct CommonRenderInterface
|
||||
virtual void writeSingleInstanceColorToCPU(const double* color, int srcIndex)=0;
|
||||
virtual void writeSingleInstanceScaleToCPU(const float* scale, int srcIndex)=0;
|
||||
virtual void writeSingleInstanceScaleToCPU(const double* scale, int srcIndex)=0;
|
||||
virtual void writeSingleInstanceSpecularColorToCPU(const double* specular, int srcIndex)=0;
|
||||
virtual void writeSingleInstanceSpecularColorToCPU(const float* specular, int srcIndex)=0;
|
||||
|
||||
|
||||
virtual int getTotalNumInstances() const = 0;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user