diff --git a/include/d3drmobj.h b/include/d3drmobj.h index bd22e89786b..57e84082a14 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -389,7 +389,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown) #define IDirect3DRMDevice_InitFromClipper(p,a,b,c,d) (p)->lpVtbl->InitFromClipper(p,a,b,c,d) #define IDirect3DRMDevice_Update(p) (p)->lpVtbl->Update(p) #define IDirect3DRMDevice_AddUpdateCallback(p,a,b) (p)->lpVtbl->AddUpdateCallback(p,a,b) -#define IDirect3DRMDevice_DeleteUpdateCallback(p,a,b) (p)->lpVtbl->DeleteUpdateCallback(p,a,b,c) +#define IDirect3DRMDevice_DeleteUpdateCallback(p,a,b) (p)->lpVtbl->DeleteUpdateCallback(p,a,b) #define IDirect3DRMDevice_SetBufferCount(p,a) (p)->lpVtbl->SetBufferCount(p,a) #define IDirect3DRMDevice_GetBufferCount(p) (p)->lpVtbl->GetBufferCount(p) #define IDirect3DRMDevice_SetDither(p,a) (p)->lpVtbl->SetDither(p,a) @@ -422,29 +422,29 @@ DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown) #define IDirect3DRMDevice_GetName(p,a,b) (p)->GetName(a,b) #define IDirect3DRMDevice_GetClassName(p,a,b) (p)->GetClassName(a,b) /*** IDirect3DRMDevice methods ***/ -#define IDirect3DRMDevice_Init(p,a,b) (p)->Init(p,a,b) -#define IDirect3DRMDevice_InitFromD3D(p,a,b) (p)->InitFromD3D(p,a,b) -#define IDirect3DRMDevice_InitFromClipper(p,a,b,c,d) (p)->InitFromClipper(p,a,b,c,d) -#define IDirect3DRMDevice_Update(p) (p)->Update(p) -#define IDirect3DRMDevice_AddUpdateCallback(p,a,b) (p)->AddUpdateCallback(p,a,b) -#define IDirect3DRMDevice_DeleteUpdateCallback(p,a,b) (p)->DeleteUpdateCallback(p,a,b,c) -#define IDirect3DRMDevice_SetBufferCount(p,a) (p)->SetBufferCount(p,a) -#define IDirect3DRMDevice_GetBufferCount(p) (p)->GetBufferCount(p) -#define IDirect3DRMDevice_SetDither(p,a) (p)->SetDither(p,a) -#define IDirect3DRMDevice_SetShades(p,a) (p)->SetShades(p,a) -#define IDirect3DRMDevice_SetQuality(p,a) (p)->SetQuality(p,a) -#define IDirect3DRMDevice_SetTextureQuality(p,a) (p)->SetTextureQuality(p,a) -#define IDirect3DRMDevice_GetViewports(p,a) (p)->GetViewports(p,a) -#define IDirect3DRMDevice_GetDither(p) (p)->GetDither(p) -#define IDirect3DRMDevice_GetShades(p) (p)->GetShades(p) -#define IDirect3DRMDevice_GetHeight(p) (p)->GetHeight(p) -#define IDirect3DRMDevice_GetWidth(p) (p)->GetWidth(p) -#define IDirect3DRMDevice_GetTrianglesDrawn(p) (p)->GetTrianglesDrawn(p) -#define IDirect3DRMDevice_GetWireframeOptions(p) (p)->GetWireframeOptions(p) -#define IDirect3DRMDevice_GetQuality(p) (p)->GetQuality(p) -#define IDirect3DRMDevice_GetColorModel(p) (p)->GetColorModel(p) -#define IDirect3DRMDevice_GetTextureQuality(p) (p)->GetTextureQuality(p) -#define IDirect3DRMDevice_GetDirect3DDevice(p,a) (p)->GetDirect3DDevice(p,a) +#define IDirect3DRMDevice_Init(p,a,b) (p)->Init(a,b) +#define IDirect3DRMDevice_InitFromD3D(p,a,b) (p)->InitFromD3D(a,b) +#define IDirect3DRMDevice_InitFromClipper(p,a,b,c,d) (p)->InitFromClipper(a,b,c,d) +#define IDirect3DRMDevice_Update(p) (p)->Update() +#define IDirect3DRMDevice_AddUpdateCallback(p,a,b) (p)->AddUpdateCallback(a,b) +#define IDirect3DRMDevice_DeleteUpdateCallback(p,a,b) (p)->DeleteUpdateCallback(a,b) +#define IDirect3DRMDevice_SetBufferCount(p,a) (p)->SetBufferCount(a) +#define IDirect3DRMDevice_GetBufferCount(p) (p)->GetBufferCount() +#define IDirect3DRMDevice_SetDither(p,a) (p)->SetDither(a) +#define IDirect3DRMDevice_SetShades(p,a) (p)->SetShades(a) +#define IDirect3DRMDevice_SetQuality(p,a) (p)->SetQuality(a) +#define IDirect3DRMDevice_SetTextureQuality(p,a) (p)->SetTextureQuality(a) +#define IDirect3DRMDevice_GetViewports(p,a) (p)->GetViewports(a) +#define IDirect3DRMDevice_GetDither(p) (p)->GetDither() +#define IDirect3DRMDevice_GetShades(p) (p)->GetShades() +#define IDirect3DRMDevice_GetHeight(p) (p)->GetHeight() +#define IDirect3DRMDevice_GetWidth(p) (p)->GetWidth() +#define IDirect3DRMDevice_GetTrianglesDrawn(p) (p)->GetTrianglesDrawn() +#define IDirect3DRMDevice_GetWireframeOptions(p) (p)->GetWireframeOptions() +#define IDirect3DRMDevice_GetQuality(p) (p)->GetQuality() +#define IDirect3DRMDevice_GetColorModel(p) (p)->GetColorModel() +#define IDirect3DRMDevice_GetTextureQuality(p) (p)->GetTextureQuality() +#define IDirect3DRMDevice_GetDirect3DDevice(p,a) (p)->GetDirect3DDevice(a) #endif /***************************************************************************** @@ -522,7 +522,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) #define IDirect3DRMDevice2_InitFromClipper(p,a,b,c,d) (p)->lpVtbl->InitFromClipper(p,a,b,c,d) #define IDirect3DRMDevice2_Update(p) (p)->lpVtbl->Update(p) #define IDirect3DRMDevice2_AddUpdateCallback(p,a,b) (p)->lpVtbl->AddUpdateCallback(p,a,b) -#define IDirect3DRMDevice2_DeleteUpdateCallback(p,a,b) (p)->lpVtbl->DeleteUpdateCallback(p,a,b,c) +#define IDirect3DRMDevice2_DeleteUpdateCallback(p,a,b) (p)->lpVtbl->DeleteUpdateCallback(p,a,b) #define IDirect3DRMDevice2_SetBufferCount(p,a) (p)->lpVtbl->SetBufferCount(p,a) #define IDirect3DRMDevice2_GetBufferCount(p) (p)->lpVtbl->GetBufferCount(p) #define IDirect3DRMDevice2_SetDither(p,a) (p)->lpVtbl->SetDither(p,a) @@ -561,29 +561,29 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) #define IDirect3DRMDevice2_GetName(p,a,b) (p)->GetName(a,b) #define IDirect3DRMDevice2_GetClassName(p,a,b) (p)->GetClassName(a,b) /*** IDirect3DRMDevice methods ***/ -#define IDirect3DRMDevice2_Init(p,a,b) (p)->Init(p,a,b) -#define IDirect3DRMDevice2_InitFromD3D(p,a,b) (p)->InitFromD3D(p,a,b) -#define IDirect3DRMDevice2_InitFromClipper(p,a,b,c,d) (p)->InitFromClipper(p,a,b,c,d) -#define IDirect3DRMDevice2_Update(p) (p)->Update(p) -#define IDirect3DRMDevice2_AddUpdateCallback(p,a,b) (p)->AddUpdateCallback(p,a,b) -#define IDirect3DRMDevice2_DeleteUpdateCallback(p,a,b) (p)->DeleteUpdateCallback(p,a,b,c) -#define IDirect3DRMDevice2_SetBufferCount(p,a) (p)->SetBufferCount(p,a) -#define IDirect3DRMDevice2_GetBufferCount(p) (p)->GetBufferCount(p) -#define IDirect3DRMDevice2_SetDither(p,a) (p)->SetDither(p,a) -#define IDirect3DRMDevice2_SetShades(p,a) (p)->SetShades(p,a) -#define IDirect3DRMDevice2_SetQuality(p,a) (p)->SetQuality(p,a) -#define IDirect3DRMDevice2_SetTextureQuality(p,a) (p)->SetTextureQuality(p,a) -#define IDirect3DRMDevice2_GetViewports(p,a) (p)->GetViewports(p,a) -#define IDirect3DRMDevice2_GetDither(p) (p)->GetDither(p) -#define IDirect3DRMDevice2_GetShades(p) (p)->GetShades(p) -#define IDirect3DRMDevice2_GetHeight(p) (p)->GetHeight(p) -#define IDirect3DRMDevice2_GetWidth(p) (p)->GetWidth(p) -#define IDirect3DRMDevice2_GetTrianglesDrawn(p) (p)->GetTrianglesDrawn(p) -#define IDirect3DRMDevice2_GetWireframeOptions(p) (p)->GetWireframeOptions(p) -#define IDirect3DRMDevice2_GetQuality(p) (p)->GetQuality(p) -#define IDirect3DRMDevice2_GetColorModel(p) (p)->GetColorModel(p) -#define IDirect3DRMDevice2_GetTextureQuality(p) (p)->GetTextureQuality(p) -#define IDirect3DRMDevice2_GetDirect3DDevice(p,a) (p)->GetDirect3DDevice(p,a) +#define IDirect3DRMDevice2_Init(p,a,b) (p)->Init(a,b) +#define IDirect3DRMDevice2_InitFromD3D(p,a,b) (p)->InitFromD3D(a,b) +#define IDirect3DRMDevice2_InitFromClipper(p,a,b,c,d) (p)->InitFromClipper(a,b,c,d) +#define IDirect3DRMDevice2_Update(p) (p)->Update() +#define IDirect3DRMDevice2_AddUpdateCallback(p,a,b) (p)->AddUpdateCallback(a,b) +#define IDirect3DRMDevice2_DeleteUpdateCallback(p,a,b) (p)->DeleteUpdateCallback(a,b) +#define IDirect3DRMDevice2_SetBufferCount(p,a) (p)->SetBufferCount(a) +#define IDirect3DRMDevice2_GetBufferCount(p) (p)->GetBufferCount() +#define IDirect3DRMDevice2_SetDither(p,a) (p)->SetDither(a) +#define IDirect3DRMDevice2_SetShades(p,a) (p)->SetShades(a) +#define IDirect3DRMDevice2_SetQuality(p,a) (p)->SetQuality(a) +#define IDirect3DRMDevice2_SetTextureQuality(p,a) (p)->SetTextureQuality(a) +#define IDirect3DRMDevice2_GetViewports(p,a) (p)->GetViewports(a) +#define IDirect3DRMDevice2_GetDither(p) (p)->GetDither() +#define IDirect3DRMDevice2_GetShades(p) (p)->GetShades() +#define IDirect3DRMDevice2_GetHeight(p) (p)->GetHeight() +#define IDirect3DRMDevice2_GetWidth(p) (p)->GetWidth() +#define IDirect3DRMDevice2_GetTrianglesDrawn(p) (p)->GetTrianglesDrawn() +#define IDirect3DRMDevice2_GetWireframeOptions(p) (p)->GetWireframeOptions() +#define IDirect3DRMDevice2_GetQuality(p) (p)->GetQuality() +#define IDirect3DRMDevice2_GetColorModel(p) (p)->GetColorModel() +#define IDirect3DRMDevice2_GetTextureQuality(p) (p)->GetTextureQuality() +#define IDirect3DRMDevice2_GetDirect3DDevice(p,a) (p)->GetDirect3DDevice(a) /*** IDirect3DRMDevice2 methods ***/ #define IDirect3DRMDevice2_InitFromD3D2(p,a,b) (p)->InitFromD3D2(a,b) #define IDirect3DRMDevice2_InitFromSurface(p,a,b,c) (p)->InitFromSurface(a,b,c) @@ -673,7 +673,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) #define IDirect3DRMDevice3_InitFromClipper(p,a,b,c,d) (p)->lpVtbl->InitFromClipper(p,a,b,c,d) #define IDirect3DRMDevice3_Update(p) (p)->lpVtbl->Update(p) #define IDirect3DRMDevice3_AddUpdateCallback(p,a,b) (p)->lpVtbl->AddUpdateCallback(p,a,b) -#define IDirect3DRMDevice3_DeleteUpdateCallback(p,a,b) (p)->lpVtbl->DeleteUpdateCallback(p,a,b,c) +#define IDirect3DRMDevice3_DeleteUpdateCallback(p,a,b) (p)->lpVtbl->DeleteUpdateCallback(p,a,b) #define IDirect3DRMDevice3_SetBufferCount(p,a) (p)->lpVtbl->SetBufferCount(p,a) #define IDirect3DRMDevice3_GetBufferCount(p) (p)->lpVtbl->GetBufferCount(p) #define IDirect3DRMDevice3_SetDither(p,a) (p)->lpVtbl->SetDither(p,a) @@ -698,11 +698,11 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) #define IDirect3DRMDevice3_GetRenderMode(p) (p)->lpVtbl->GetRenderMode(p) #define IDirect3DRMDevice3_GetDirect3DDevice2(p,a) (p)->lpVtbl->GetDirect3DDevice2(p,a) /*** IDirect3DRMDevice3 methods ***/ -#define IDirect3DRMDevice3_FindPreferredTextureFormat(p,a,b,c) (p)->lpVtbl->FindPreferredTextureFormat(p,a,b) -#define IDirect3DRMDevice3_RenderStateChange(p,a,b,c) (p)->lpVtbl->RenderStateChange(p,a,b) -#define IDirect3DRMDevice3_LightStateChange(p,a,b,c) (p)->lpVtbl->LightStateChange(p,a,b) -#define IDirect3DRMDevice3_GetStateChangeOptions(p,a,b,c) (p)->lpVtbl->GetStateChangeOptions(p,a,b) -#define IDirect3DRMDevice3_SetStateChangeOptions(p,a,b,c) (p)->lpVtbl->SetStateChangeOptions(p,a,b) +#define IDirect3DRMDevice3_FindPreferredTextureFormat(p,a,b,c) (p)->lpVtbl->FindPreferredTextureFormat(p,a,b,c) +#define IDirect3DRMDevice3_RenderStateChange(p,a,b,c) (p)->lpVtbl->RenderStateChange(p,a,b,c) +#define IDirect3DRMDevice3_LightStateChange(p,a,b,c) (p)->lpVtbl->LightStateChange(p,a,b,c) +#define IDirect3DRMDevice3_GetStateChangeOptions(p,a,b,c) (p)->lpVtbl->GetStateChangeOptions(p,a,b,c) +#define IDirect3DRMDevice3_SetStateChangeOptions(p,a,b,c) (p)->lpVtbl->SetStateChangeOptions(p,a,b,c) #else /*** IUnknown methods ***/ #define IDirect3DRMDevice3_QueryInterface(p,a,b) (p)->QueryInterface(a,b) @@ -718,29 +718,29 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) #define IDirect3DRMDevice3_GetName(p,a,b) (p)->GetName(a,b) #define IDirect3DRMDevice3_GetClassName(p,a,b) (p)->GetClassName(a,b) /*** IDirect3DRMDevice methods ***/ -#define IDirect3DRMDevice3_Init(p,a,b) (p)->Init(p,a,b) -#define IDirect3DRMDevice3_InitFromD3D(p,a,b) (p)->InitFromD3D(p,a,b) -#define IDirect3DRMDevice3_InitFromClipper(p,a,b,c,d) (p)->InitFromClipper(p,a,b,c,d) -#define IDirect3DRMDevice3_Update(p) (p)->Update(p) -#define IDirect3DRMDevice3_AddUpdateCallback(p,a,b) (p)->AddUpdateCallback(p,a,b) -#define IDirect3DRMDevice3_DeleteUpdateCallback(p,a,b) (p)->DeleteUpdateCallback(p,a,b,c) -#define IDirect3DRMDevice3_SetBufferCount(p,a) (p)->SetBufferCount(p,a) -#define IDirect3DRMDevice3_GetBufferCount(p) (p)->GetBufferCount(p) -#define IDirect3DRMDevice3_SetDither(p,a) (p)->SetDither(p,a) -#define IDirect3DRMDevice3_SetShades(p,a) (p)->SetShades(p,a) -#define IDirect3DRMDevice3_SetQuality(p,a) (p)->SetQuality(p,a) -#define IDirect3DRMDevice3_SetTextureQuality(p,a) (p)->SetTextureQuality(p,a) -#define IDirect3DRMDevice3_GetViewports(p,a) (p)->GetViewports(p,a) -#define IDirect3DRMDevice3_GetDither(p) (p)->GetDither(p) -#define IDirect3DRMDevice3_GetShades(p) (p)->GetShades(p) -#define IDirect3DRMDevice3_GetHeight(p) (p)->GetHeight(p) -#define IDirect3DRMDevice3_GetWidth(p) (p)->GetWidth(p) -#define IDirect3DRMDevice3_GetTrianglesDrawn(p) (p)->GetTrianglesDrawn(p) -#define IDirect3DRMDevice3_GetWireframeOptions(p) (p)->GetWireframeOptions(p) -#define IDirect3DRMDevice3_GetQuality(p) (p)->GetQuality(p) -#define IDirect3DRMDevice3_GetColorModel(p) (p)->GetColorModel(p) -#define IDirect3DRMDevice3_GetTextureQuality(p) (p)->GetTextureQuality(p) -#define IDirect3DRMDevice3_GetDirect3DDevice(p,a) (p)->GetDirect3DDevice(p,a) +#define IDirect3DRMDevice3_Init(p,a,b) (p)->Init(a,b) +#define IDirect3DRMDevice3_InitFromD3D(p,a,b) (p)->InitFromD3D(a,b) +#define IDirect3DRMDevice3_InitFromClipper(p,a,b,c,d) (p)->InitFromClipper(a,b,c,d) +#define IDirect3DRMDevice3_Update(p) (p)->Update() +#define IDirect3DRMDevice3_AddUpdateCallback(p,a,b) (p)->AddUpdateCallback(a,b) +#define IDirect3DRMDevice3_DeleteUpdateCallback(p,a,b) (p)->DeleteUpdateCallback(a,b) +#define IDirect3DRMDevice3_SetBufferCount(p,a) (p)->SetBufferCount(a) +#define IDirect3DRMDevice3_GetBufferCount(p) (p)->GetBufferCount() +#define IDirect3DRMDevice3_SetDither(p,a) (p)->SetDither(a) +#define IDirect3DRMDevice3_SetShades(p,a) (p)->SetShades(a) +#define IDirect3DRMDevice3_SetQuality(p,a) (p)->SetQuality(a) +#define IDirect3DRMDevice3_SetTextureQuality(p,a) (p)->SetTextureQuality(a) +#define IDirect3DRMDevice3_GetViewports(p,a) (p)->GetViewports(a) +#define IDirect3DRMDevice3_GetDither(p) (p)->GetDither() +#define IDirect3DRMDevice3_GetShades(p) (p)->GetShades() +#define IDirect3DRMDevice3_GetHeight(p) (p)->GetHeight() +#define IDirect3DRMDevice3_GetWidth(p) (p)->GetWidth() +#define IDirect3DRMDevice3_GetTrianglesDrawn(p) (p)->GetTrianglesDrawn() +#define IDirect3DRMDevice3_GetWireframeOptions(p) (p)->GetWireframeOptions() +#define IDirect3DRMDevice3_GetQuality(p) (p)->GetQuality() +#define IDirect3DRMDevice3_GetColorModel(p) (p)->GetColorModel() +#define IDirect3DRMDevice3_GetTextureQuality(p) (p)->GetTextureQuality() +#define IDirect3DRMDevice3_GetDirect3DDevice(p,a) (p)->GetDirect3DDevice(a) /*** IDirect3DRMDevice2 methods ***/ #define IDirect3DRMDevice3_InitFromD3D2(p,a,b) (p)->InitFromD3D2(a,b) #define IDirect3DRMDevice3_InitFromSurface(p,a,b,c) (p)->InitFromSurface(a,b,c) @@ -826,17 +826,17 @@ DECLARE_INTERFACE_(IDirect3DRMViewport,IDirect3DRMObject) #define IDirect3DRMViewport_Clear(p) (p)->lpVtbl->Clear(p) #define IDirect3DRMViewport_Render(p,a) (p)->lpVtbl->Render(p,a) #define IDirect3DRMViewport_SetFront(p,a) (p)->lpVtbl->SetFront(p,a) -#define IDirect3DRMViewport_SetBack(p,a) (p)->lpVtbl->(p,a) -#define IDirect3DRMViewport_SetField(p,a) (p)->lpVtbl->(p,a) +#define IDirect3DRMViewport_SetBack(p,a) (p)->lpVtbl->SetBack(p,a) +#define IDirect3DRMViewport_SetField(p,a) (p)->lpVtbl->SetField(p,a) #define IDirect3DRMViewport_SetUniformScaling(p,a) (p)->lpVtbl->SetUniformScaling(p,a) #define IDirect3DRMViewport_SetCamera(p,a) (p)->lpVtbl->SetCamera(p,a) #define IDirect3DRMViewport_SetProjection(p,a) (p)->lpVtbl->SetProjection(p,a) #define IDirect3DRMViewport_Transform(p,a,b) (p)->lpVtbl->Transform(p,a,b) -#define IDirect3DRMViewport_InverseTransform(p,a,b) (p)->lpVtbl->(p,a,b) +#define IDirect3DRMViewport_InverseTransform(p,a,b) (p)->lpVtbl->InverseTransform(p,a,b) #define IDirect3DRMViewport_Configure(p,a,b,c,d) (p)->lpVtbl->Configure(p,a,b,c,d) #define IDirect3DRMViewport_ForceUpdate(p,a,b,c,d) (p)->lpVtbl->ForceUpdate(p,a,b,c,d) #define IDirect3DRMViewport_SetPlane(p,a,b,c,d) (p)->lpVtbl->SetPlane(p,a,b,c,d) -#define IDirect3DRMViewport_GetCamera(p,a) (p)->lpVtbl->(p,a) +#define IDirect3DRMViewport_GetCamera(p,a) (p)->lpVtbl->GetCamera(p,a) #define IDirect3DRMViewport_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) #define IDirect3DRMViewport_GetPlane(p,a,b,c,d) (p)->lpVtbl->GetPlane(p,a,b,c,d) #define IDirect3DRMViewport_Pick(p,a,b,c) (p)->lpVtbl->Pick(p,a,b,c) @@ -865,34 +865,34 @@ DECLARE_INTERFACE_(IDirect3DRMViewport,IDirect3DRMObject) #define IDirect3DRMViewport_GetName(p,a,b) (p)->GetName(a,b) #define IDirect3DRMViewport_GetClassName(p,a,b) (p)->GetClassName(a,b) /*** IDirect3DRMViewport methods ***/ -#define IDirect3DRMViewport_Init(p,a,b,c,d) (p)->Init(p,a,b,c,d) -#define IDirect3DRMViewport_Clear(p) (p)->Clear(p) -#define IDirect3DRMViewport_Render(p,a) (p)->Render(p,a) -#define IDirect3DRMViewport_SetFront(p,a) (p)->SetFront(p,a) -#define IDirect3DRMViewport_SetBack(p,a) (p)->(p,a) -#define IDirect3DRMViewport_SetField(p,a) (p)->(p,a) -#define IDirect3DRMViewport_SetUniformScaling(p,a) (p)->SetUniformScaling(p,a) -#define IDirect3DRMViewport_SetCamera(p,a) (p)->SetCamera(p,a) -#define IDirect3DRMViewport_SetProjection(p,a) (p)->SetProjection(p,a) -#define IDirect3DRMViewport_Transform(p,a,b) (p)->Transform(p,a,b) -#define IDirect3DRMViewport_InverseTransform(p,a,b) (p)->(p,a,b) -#define IDirect3DRMViewport_Configure(p,a,b,c,d) (p)->Configure(p,a,b,c,d) -#define IDirect3DRMViewport_ForceUpdate(p,a,b,c,d) (p)->ForceUpdate(p,a,b,c,d) -#define IDirect3DRMViewport_SetPlane(p,a,b,c,d) (p)->SetPlane(p,a,b,c,d) -#define IDirect3DRMViewport_GetCamera(p,a) (p)->GetCamera(p,a) -#define IDirect3DRMViewport_GetDevice(p,a) (p)->GetDevice(p,a) -#define IDirect3DRMViewport_GetPlane(p,a,b,c,d) (p)->GetPlane(p,a,b,c,d) -#define IDirect3DRMViewport_Pick(p,a,b,c) (p)->Pick(p,a,b,c) -#define IDirect3DRMViewport_GetUniformScaling(p) (p)->GetUniformScaling(p) -#define IDirect3DRMViewport_GetX(p) (p)->GetX(p) -#define IDirect3DRMViewport_GetY(p) (p)->GetY(p) -#define IDirect3DRMViewport_GetWidth(p) (p)->GetWidth(p) -#define IDirect3DRMViewport_GetHeight(p) (p)->GetHeight(p) -#define IDirect3DRMViewport_GetField(p) (p)->GetField(p) -#define IDirect3DRMViewport_GetBack(p) (p)->GetBack(p) -#define IDirect3DRMViewport_GetFront(p) (p)->GetFront(p) -#define IDirect3DRMViewport_GetProjection(p) (p)->GetProjection(p) -#define IDirect3DRMViewport_GetDirect3DViewport(p,a) (p)->GetDirect3DViewport(p,a) +#define IDirect3DRMViewport_Init(p,a,b,c,d) (p)->Init(a,b,c,d) +#define IDirect3DRMViewport_Clear(p) (p)->Clear() +#define IDirect3DRMViewport_Render(p,a) (p)->Render(a) +#define IDirect3DRMViewport_SetFront(p,a) (p)->SetFront(a) +#define IDirect3DRMViewport_SetBack(p,a) (p)->SetBack(a) +#define IDirect3DRMViewport_SetField(p,a) (p)->SetField(a) +#define IDirect3DRMViewport_SetUniformScaling(p,a) (p)->SetUniformScaling(a) +#define IDirect3DRMViewport_SetCamera(p,a) (p)->SetCamera(a) +#define IDirect3DRMViewport_SetProjection(p,a) (p)->SetProjection(a) +#define IDirect3DRMViewport_Transform(p,a,b) (p)->Transform(a,b) +#define IDirect3DRMViewport_InverseTransform(p,a,b) (p)->InverseTransform(a,b) +#define IDirect3DRMViewport_Configure(p,a,b,c,d) (p)->Configure(a,b,c,d) +#define IDirect3DRMViewport_ForceUpdate(p,a,b,c,d) (p)->ForceUpdate(a,b,c,d) +#define IDirect3DRMViewport_SetPlane(p,a,b,c,d) (p)->SetPlane(a,b,c,d) +#define IDirect3DRMViewport_GetCamera(p,a) (p)->GetCamera(a) +#define IDirect3DRMViewport_GetDevice(p,a) (p)->GetDevice(a) +#define IDirect3DRMViewport_GetPlane(p,a,b,c,d) (p)->GetPlane(a,b,c,d) +#define IDirect3DRMViewport_Pick(p,a,b,c) (p)->Pick(a,b,c) +#define IDirect3DRMViewport_GetUniformScaling(p) (p)->GetUniformScaling() +#define IDirect3DRMViewport_GetX(p) (p)->GetX() +#define IDirect3DRMViewport_GetY(p) (p)->GetY() +#define IDirect3DRMViewport_GetWidth(p) (p)->GetWidth() +#define IDirect3DRMViewport_GetHeight(p) (p)->GetHeight() +#define IDirect3DRMViewport_GetField(p) (p)->GetField() +#define IDirect3DRMViewport_GetBack(p) (p)->GetBack() +#define IDirect3DRMViewport_GetFront(p) (p)->GetFront() +#define IDirect3DRMViewport_GetProjection(p) (p)->GetProjection() +#define IDirect3DRMViewport_GetDirect3DViewport(p,a) (p)->GetDirect3DViewport(a) #endif /***************************************************************************** @@ -970,17 +970,17 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject) #define IDirect3DRMViewport2_Clear(p,a) (p)->lpVtbl->Clear(p,a) #define IDirect3DRMViewport2_Render(p,a) (p)->lpVtbl->Render(p,a) #define IDirect3DRMViewport2_SetFront(p,a) (p)->lpVtbl->SetFront(p,a) -#define IDirect3DRMViewport2_SetBack(p,a) (p)->lpVtbl->(p,a) -#define IDirect3DRMViewport2_SetField(p,a) (p)->lpVtbl->(p,a) +#define IDirect3DRMViewport2_SetBack(p,a) (p)->lpVtbl->SetBack(p,a) +#define IDirect3DRMViewport2_SetField(p,a) (p)->lpVtbl->SetField(p,a) #define IDirect3DRMViewport2_SetUniformScaling(p,a) (p)->lpVtbl->SetUniformScaling(p,a) #define IDirect3DRMViewport2_SetCamera(p,a) (p)->lpVtbl->SetCamera(p,a) #define IDirect3DRMViewport2_SetProjection(p,a) (p)->lpVtbl->SetProjection(p,a) #define IDirect3DRMViewport2_Transform(p,a,b) (p)->lpVtbl->Transform(p,a,b) -#define IDirect3DRMViewport2_InverseTransform(p,a,b) (p)->lpVtbl->(p,a,b) +#define IDirect3DRMViewport2_InverseTransform(p,a,b) (p)->lpVtbl->InverseTransform(p,a,b) #define IDirect3DRMViewport2_Configure(p,a,b,c,d) (p)->lpVtbl->Configure(p,a,b,c,d) #define IDirect3DRMViewport2_ForceUpdate(p,a,b,c,d) (p)->lpVtbl->ForceUpdate(p,a,b,c,d) #define IDirect3DRMViewport2_SetPlane(p,a,b,c,d) (p)->lpVtbl->SetPlane(p,a,b,c,d) -#define IDirect3DRMViewport2_GetCamera(p,a) (p)->lpVtbl->(p,a) +#define IDirect3DRMViewport2_GetCamera(p,a) (p)->lpVtbl->GetCamera(p,a) #define IDirect3DRMViewport2_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) #define IDirect3DRMViewport2_GetPlane(p,a,b,c,d) (p)->lpVtbl->GetPlane(p,a,b,c,d) #define IDirect3DRMViewport2_Pick(p,a,b,c) (p)->lpVtbl->Pick(p,a,b,c) @@ -995,7 +995,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject) #define IDirect3DRMViewport2_GetProjection(p) (p)->lpVtbl->GetProjection(p) #define IDirect3DRMViewport2_GetDirect3DViewport(p,a) (p)->lpVtbl->GetDirect3DViewport(p,a) #define IDirect3DRMViewport2_TransformVectors(p,a,b,c) (p)->lpVtbl->TransformVectors(p,a,b,c) -#define IDirect3DRMViewport2_InverseTransformVectors(p,a,b,c) (p)->lpVtbl->InverseTransformVectors(p,ab,c) +#define IDirect3DRMViewport2_InverseTransformVectors(p,a,b,c) (p)->lpVtbl->InverseTransformVectors(p,a,b,c) #else /*** IUnknown methods ***/ #define IDirect3DRMViewport2_QueryInterface(p,a,b) (p)->QueryInterface(a,b) @@ -1011,36 +1011,36 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject) #define IDirect3DRMViewport2_GetName(p,a,b) (p)->GetName(a,b) #define IDirect3DRMViewport2_GetClassName(p,a,b) (p)->GetClassName(a,b) /*** IDirect3DRMViewport2 methods ***/ -#define IDirect3DRMViewport2_Init(p,a,b,c,d) (p)->Init(p,a,b,c,d) -#define IDirect3DRMViewport2_Clear(p) (p)->Clear(p) -#define IDirect3DRMViewport2_Render(p,a) (p)->Render(p,a) -#define IDirect3DRMViewport2_SetFront(p,a) (p)->SetFront(p,a) -#define IDirect3DRMViewport2_SetBack(p,a) (p)->(p,a) -#define IDirect3DRMViewport2_SetField(p,a) (p)->(p,a) -#define IDirect3DRMViewport2_SetUniformScaling(p,a) (p)->SetUniformScaling(p,a) -#define IDirect3DRMViewport2_SetCamera(p,a) (p)->SetCamera(p,a) -#define IDirect3DRMViewport2_SetProjection(p,a) (p)->SetProjection(p,a) -#define IDirect3DRMViewport2_Transform(p,a,b) (p)->Transform(p,a,b) -#define IDirect3DRMViewport2_InverseTransform(p,a,b) (p)->(p,a,b) -#define IDirect3DRMViewport2_Configure(p,a,b,c,d) (p)->Configure(p,a,b,c,d) -#define IDirect3DRMViewport2_ForceUpdate(p,a,b,c,d) (p)->ForceUpdate(p,a,b,c,d) -#define IDirect3DRMViewport2_SetPlane(p,a,b,c,d) (p)->SetPlane(p,a,b,c,d) -#define IDirect3DRMViewport2_GetCamera(p,a) (p)->GetCamera(p,a) -#define IDirect3DRMViewport2_GetDevice(p,a) (p)->GetDevice(p,a) -#define IDirect3DRMViewport2_GetPlane(p,a,b,c,d) (p)->GetPlane(p,a,b,c,d) -#define IDirect3DRMViewport2_Pick(p,a,b,c) (p)->Pick(p,a,b,c) -#define IDirect3DRMViewport2_GetUniformScaling(p) (p)->GetUniformScaling(p) -#define IDirect3DRMViewport2_GetX(p) (p)->GetX(p) -#define IDirect3DRMViewport2_GetY(p) (p)->GetY(p) -#define IDirect3DRMViewport2_GetWidth(p) (p)->GetWidth(p) -#define IDirect3DRMViewport2_GetHeight(p) (p)->GetHeight(p) -#define IDirect3DRMViewport2_GetField(p) (p)->GetField(p) -#define IDirect3DRMViewport2_GetBack(p) (p)->GetBack(p) -#define IDirect3DRMViewport2_GetFront(p) (p)->GetFront(p) -#define IDirect3DRMViewport2_GetProjection(p) (p)->GetProjection(p) -#define IDirect3DRMViewport2_GetDirect3DViewport(p,a) (p)->GetDirect3DViewport(p,a) +#define IDirect3DRMViewport2_Init(p,a,b,c,d) (p)->Init(a,b,c,d) +#define IDirect3DRMViewport2_Clear(p) (p)->Clear() +#define IDirect3DRMViewport2_Render(p,a) (p)->Render(a) +#define IDirect3DRMViewport2_SetFront(p,a) (p)->SetFront(a) +#define IDirect3DRMViewport2_SetBack(p,a) (p)->SetBack(a) +#define IDirect3DRMViewport2_SetField(p,a) (p)->SetField(a) +#define IDirect3DRMViewport2_SetUniformScaling(p,a) (p)->SetUniformScaling(a) +#define IDirect3DRMViewport2_SetCamera(p,a) (p)->SetCamera(a) +#define IDirect3DRMViewport2_SetProjection(p,a) (p)->SetProjection(a) +#define IDirect3DRMViewport2_Transform(p,a,b) (p)->Transform(a,b) +#define IDirect3DRMViewport2_InverseTransform(p,a,b) (p)->InverseTransform(a,b) +#define IDirect3DRMViewport2_Configure(p,a,b,c,d) (p)->Configure(a,b,c,d) +#define IDirect3DRMViewport2_ForceUpdate(p,a,b,c,d) (p)->ForceUpdate(a,b,c,d) +#define IDirect3DRMViewport2_SetPlane(p,a,b,c,d) (p)->SetPlane(a,b,c,d) +#define IDirect3DRMViewport2_GetCamera(p,a) (p)->GetCamera(a) +#define IDirect3DRMViewport2_GetDevice(p,a) (p)->GetDevice(a) +#define IDirect3DRMViewport2_GetPlane(p,a,b,c,d) (p)->GetPlane(a,b,c,d) +#define IDirect3DRMViewport2_Pick(p,a,b,c) (p)->Pick(a,b,c) +#define IDirect3DRMViewport2_GetUniformScaling(p) (p)->GetUniformScaling() +#define IDirect3DRMViewport2_GetX(p) (p)->GetX() +#define IDirect3DRMViewport2_GetY(p) (p)->GetY() +#define IDirect3DRMViewport2_GetWidth(p) (p)->GetWidth() +#define IDirect3DRMViewport2_GetHeight(p) (p)->GetHeight() +#define IDirect3DRMViewport2_GetField(p) (p)->GetField() +#define IDirect3DRMViewport2_GetBack(p) (p)->GetBack() +#define IDirect3DRMViewport2_GetFront(p) (p)->GetFront() +#define IDirect3DRMViewport2_GetProjection(p) (p)->GetProjection() +#define IDirect3DRMViewport2_GetDirect3DViewport(p,a) (p)->GetDirect3DViewport(a) #define IDirect3DRMViewport2_TransformVectors(p,a,b,c) (p)->TransformVectors(a,b,c) -#define IDirect3DRMViewport2_InverseTransformVectors(p,a,b,c) (p)->InverseTransformVectors(ab,c) +#define IDirect3DRMViewport2_InverseTransformVectors(p,a,b,c) (p)->InverseTransformVectors(a,b,c) #endif /***************************************************************************** @@ -1962,8 +1962,8 @@ DECLARE_INTERFACE_(IDirect3DRMMesh,IDirect3DRMVisual) #define IDirect3DRMMesh_GetGroupColor(p,a) (p)->GetGroupColor(a) #define IDirect3DRMMesh_GetGroupMapping(p,a) (p)->GetGroupMapping(a) #define IDirect3DRMMesh_GetGroupQuality(p,a) (p)->GetGroupQuality(a) -#define IDirect3DRMMesh_GetGroupMaterial(p,a,b) (p)->lpVtbl->GetGroupMaterial(a,b) -#define IDirect3DRMMesh_GetGroupTexture(p,a,b) (p)->lpVtbl->GetGroupTexture(a,b) +#define IDirect3DRMMesh_GetGroupMaterial(p,a,b) (p)->GetGroupMaterial(a,b) +#define IDirect3DRMMesh_GetGroupTexture(p,a,b) (p)->GetGroupTexture(a,b) #endif /***************************************************************************** @@ -2220,7 +2220,7 @@ DECLARE_INTERFACE_(IDirect3DRMShadow2,IDirect3DRMVisual) #define IDirect3DRMShadow2_GetPlane(p,a,b,c,d,e,f) (p)->GetPlane(a,b,c,d,e,f) #define IDirect3DRMShadow2_SetPlane(p,a,b,c,d,e,f) (p)->SetPlane(a,b,c,d,e,f) #define IDirect3DRMShadow2_GetOptions(p,a) (p)->GetOptions(a) -#define IDirect3DRMShadow2_SetOptions(p,a) (p)->lpVtbl->SetOptions(p,a) +#define IDirect3DRMShadow2_SetOptions(p,a) (p)->SetOptions(a) #endif /***************************************************************************** @@ -2950,7 +2950,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) #define IDirect3DRMMeshBuilder3_GetVertices(p,a,b,c) (p)->lpVtbl->GetVertices(p,a,b,c) #define IDirect3DRMMeshBuilder3_SetNormals(p,a,b,c) (p)->lpVtbl->SetNormals(p,a,b,c) #define IDirect3DRMMeshBuilder3_GetNormals(p,a,b,c) (p)->lpVtbl->GetNormals(p,a,b,c) -#define IDirect3DRMMeshBuilder3_GetNormalCount(p) (p)->lpVtbl->GetNormalCount(p,a) +#define IDirect3DRMMeshBuilder3_GetNormalCount(p) (p)->lpVtbl->GetNormalCount(p) #else /*** IUnknown methods ***/ #define IDirect3DRMMeshBuilder3_QueryInterface(p,a,b) (p)->QueryInterface(a,b) @@ -3004,26 +3004,26 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) #define IDirect3DRMMeshBuilder3_GetVertexCount(p) (p)->GetVertexCount() #define IDirect3DRMMeshBuilder3_GetVertexColor(p,a) (p)->GetVertexColor(a) #define IDirect3DRMMeshBuilder3_CreateMesh(p,a) (p)->CreateMesh(a) -#define IDirect3DRMMeshBuilder3_GetFace(p,a,b) (p)->GetFace(p,a,b) -#define IDirect3DRMMeshBuilder3_GetVertex(p,a,b) (p)->GetVertex(p,a,b) -#define IDirect3DRMMeshBuilder3_GetNormal(p,a,b) (p)->GetNormal(p,a,b) -#define IDirect3DRMMeshBuilder3_DeleteVertices(p,a,b) (p)->DeleteVertices(p,a,b) -#define IDirect3DRMMeshBuilder3_DeleteNormals(p,a,b) (p)->DeleteNormals(p,a,b) -#define IDirect3DRMMeshBuilder3_DeleteFace(p,a) (p)->DeleteFace(p,a) -#define IDirect3DRMMeshBuilder3_Empty(p,a) (p)->Empty(p,a) -#define IDirect3DRMMeshBuilder3_Optimize(p,a) (p)->Optimize(p,a) -#define IDirect3DRMMeshBuilder3_AddFacesIndexed(p,a,b,c,d) (p)->AddFacesIndexed(p,a,b,c,d) -#define IDirect3DRMMeshBuilder3_CreateSubMesh(p,a) (p)->CreateSubMesh(p,a) -#define IDirect3DRMMeshBuilder3_GetParentMesh(p,a,b) (p)->GetParentMesh(p,a,b) -#define IDirect3DRMMeshBuilder3_GetSubMeshes(p,a,b) (p)->GetSubMeshes(p,a,b) -#define IDirect3DRMMeshBuilder3_DeleteSubMesh(p,a) (p)->DeleteSubMesh(p,a) -#define IDirect3DRMMeshBuilder3_Enable(p,a) (p)->Enable(p,a) -#define IDirect3DRMMeshBuilder3_AddTriangles(p,a,b,c,d) (p)->AddTriangles(p,a,b,c,d) -#define IDirect3DRMMeshBuilder3_SetVertices(p,a,b,c) (p)->SetVertices(p,a,b,c) -#define IDirect3DRMMeshBuilder3_GetVertices(p,a,b,c) (p)->GetVertices(p,a,b,c) -#define IDirect3DRMMeshBuilder3_SetNormals(p,a,b,c) (p)->SetNormals(p,a,b,c) -#define IDirect3DRMMeshBuilder3_GetNormals(p,a,b,c) (p)->GetNormals(p,a,b,c) -#define IDirect3DRMMeshBuilder3_GetNormalCount(p) (p)->GetNormalCount(p,a) +#define IDirect3DRMMeshBuilder3_GetFace(p,a,b) (p)->GetFace(a,b) +#define IDirect3DRMMeshBuilder3_GetVertex(p,a,b) (p)->GetVertex(a,b) +#define IDirect3DRMMeshBuilder3_GetNormal(p,a,b) (p)->GetNormal(a,b) +#define IDirect3DRMMeshBuilder3_DeleteVertices(p,a,b) (p)->DeleteVertices(a,b) +#define IDirect3DRMMeshBuilder3_DeleteNormals(p,a,b) (p)->DeleteNormals(a,b) +#define IDirect3DRMMeshBuilder3_DeleteFace(p,a) (p)->DeleteFace(a) +#define IDirect3DRMMeshBuilder3_Empty(p,a) (p)->Empty(a) +#define IDirect3DRMMeshBuilder3_Optimize(p,a) (p)->Optimize(a) +#define IDirect3DRMMeshBuilder3_AddFacesIndexed(p,a,b,c,d) (p)->AddFacesIndexed(a,b,c,d) +#define IDirect3DRMMeshBuilder3_CreateSubMesh(p,a) (p)->CreateSubMesh(a) +#define IDirect3DRMMeshBuilder3_GetParentMesh(p,a,b) (p)->GetParentMesh(a,b) +#define IDirect3DRMMeshBuilder3_GetSubMeshes(p,a,b) (p)->GetSubMeshes(a,b) +#define IDirect3DRMMeshBuilder3_DeleteSubMesh(p,a) (p)->DeleteSubMesh(a) +#define IDirect3DRMMeshBuilder3_Enable(p,a) (p)->Enable(a) +#define IDirect3DRMMeshBuilder3_AddTriangles(p,a,b,c,d) (p)->AddTriangles(a,b,c,d) +#define IDirect3DRMMeshBuilder3_SetVertices(p,a,b,c) (p)->SetVertices(a,b,c) +#define IDirect3DRMMeshBuilder3_GetVertices(p,a,b,c) (p)->GetVertices(a,b,c) +#define IDirect3DRMMeshBuilder3_SetNormals(p,a,b,c) (p)->SetNormals(a,b,c) +#define IDirect3DRMMeshBuilder3_GetNormals(p,a,b,c) (p)->GetNormals(a,b,c) +#define IDirect3DRMMeshBuilder3_GetNormalCount(p) (p)->GetNormalCount() #endif #ifdef __cplusplus